Commit Graph

533 Commits

Author SHA1 Message Date
Haining Henry Zhang
43b2bce6b1 update docs for 1.2 (#2974)
* update change log

* update documents

* update documents

* update AUTHORS

* update README

* update harbor.cfg

* remove unused files

* updated TOC of docs

* update REAME

* update README

* udpate docs for 1.2

* udpate authors

* updated installation guide

* updated migration guide

* updated migration guide
2017-08-07 14:38:10 +08:00
Daniel Jiang
a6dc3e549d Merge pull request #2941 from wy65701436/update-migration-guide
update migration guide
2017-08-04 19:18:13 +08:00
Yan
957bd1722a update installation guide (#2930)
* update installation guide

* add perf turning.

* update per comments

* update per comments
2017-08-04 18:04:14 +08:00
Daniel Jiang
ef909b4e0c Merge pull request #2318 from timchenxiaoyu/timchenxiaoyu-patch-1
docs error
2017-08-04 17:01:34 +08:00
sigsbee
4632926266 update userguide (#2933)
* update user guide

* update user guide

* update user guide

* update user guide

* update user guide

* fix refer

* update user guide gc

* update user guide

* update user guide

* update user guide

* update user guide

* update user guide

* update userguide

* update user guide

* update user guide
2017-08-03 15:26:44 +08:00
Daniel Jiang
8a92724198 Merge pull request #2931 from wy65701436/update-compile-guide
Update compile guide
2017-08-03 13:18:44 +08:00
Steven Zou
c05f843704 update document for Clair user guide 2017-08-02 18:47:32 +08:00
wangyan
7aff623997 update migration guide 2017-08-02 15:36:14 +08:00
wangyan
8331fe20d4 update compile guite 2017-08-01 14:42:56 +08:00
wangyan
6871a080b8 update compile guite 2017-08-01 14:35:08 +08:00
Daniel Jiang
9582637651 fixes #2539 (#2877) 2017-07-26 18:37:57 -07:00
yixingjia
69adddd866 Merge pull request #2786 from yixingjia/docs
Clair offline data update guide
2017-07-25 17:11:43 +08:00
Daniel Jiang
2a50559ff7 update swagger doc (#2822)
* update swagger doc

* remove unused definitions
2017-07-20 03:47:46 -07:00
yixingj
9b65a6ae75 Update the docs 2017-07-18 14:34:24 +08:00
yixingj
bfb0c0a32d Update Clair offiline date guide 2017-07-14 17:04:37 +08:00
yixingj
19a5591ef5 Update Clair offline data update doc 2017-07-14 16:57:43 +08:00
yixingj
008f386f7e refactor 2017-07-14 16:54:13 +08:00
yixingj
bfb1b7e75b refactor format 2017-07-14 16:50:04 +08:00
yixingj
dc8ec8921b refactor format 2017-07-14 16:48:00 +08:00
yixingj
a3ac9639f1 Clair offline data update guide 2017-07-14 16:43:03 +08:00
wemeya
ddee1ca7e8 Update swagger.yaml 2017-06-30 15:27:32 +08:00
Wenkai Yin
2ada2dbd16 Merge pull request #2631 from ywk253100/170626_statistic
Refactor statistics API to return private/public count of projects and repositories
2017-06-30 14:26:15 +08:00
Steven Zou
c90dacb0ba Merge pull request #2648 from steven-zou/master
Upgrade UI builder to 1.2.7
2017-06-27 19:26:57 +08:00
Steven Zou
22a4e91a79 Upgrade UI builder to 1.2.7 2017-06-27 18:33:53 +08:00
Steven Zou
30ece92360 Merge pull request #2614 from steven-zou/master
Update UI builder to 1.2.5
2017-06-26 14:24:55 +08:00
Wenkai Yin
6e9ec3f22c refactor statistics API 2017-06-26 14:15:01 +08:00
Steven Zou
7c68c1ca69 Enhance script in make/dev/nodeclarity/entrypoint.sh 2017-06-23 18:58:58 +08:00
Steven Zou
7c0e79d10a update ui builder to 1.2.6 2017-06-23 18:58:14 +08:00
Wenkai Yin
bdd49e51d5 call ui API to get project 2017-06-22 14:01:17 +08:00
Steven Zou
ed1263148f Merge pull request #2562 from steven-zou/master
Refactor harnor portal with sharable components in harbor-ui lib
2017-06-21 16:51:46 +08:00
Steven Zou
478b56e6a4 Modify travis config 2017-06-21 16:17:29 +08:00
Daniel Jiang
81c475eb93 Merge pull request #2584 from reasonerjt/clair-integration
update swagger YAML
2017-06-21 13:03:55 +08:00
Daniel Jiang
dc7d0a3d4f Merge pull request #2482 from wemeya/master
modify prepare-swagger.sh and configure_swagger.md
2017-06-21 11:08:06 +08:00
Tan Jiang
a8a00a425f update swagger YAML 2017-06-21 00:15:01 +08:00
Wenkai Yin
65f466d7da add get tag api 2017-06-20 16:56:40 +08:00
Tan Jiang
15384317e0 add with_clair flag in systeminfo 2017-06-15 16:15:46 +08:00
Wenkai Yin
7d595c10c5 Merge pull request #2485 from ywk253100/170608_project
Refactor GET /projects API
2017-06-14 21:03:28 +08:00
Wenkai Yin
802a2fbcce update 2017-06-14 20:23:29 +08:00
wemeya
a091f6f935 modify prepare-swagger.sh and configure_swagger.md 2017-06-14 17:30:53 +08:00
Wenkai Yin
539c0375a1 support pagination 2017-06-12 18:36:10 +08:00
Wenkai Yin
20cf8de0f7 Merge remote-tracking branch 'upstream/master' into 170608_project 2017-06-09 16:41:13 +08:00
Wenkai Yin
e97d7dab85 refactor GET /projects 2017-06-09 16:41:02 +08:00
Wenkai Yin
f700b1bfc6 Merge pull request #2461 from ywk253100/170607_log_api
Support query logs according to different conditions
2017-06-09 11:08:08 +08:00
Wenkai Yin
b2380818fd support query logs according to conditions 2017-06-08 14:44:08 +08:00
Daniel Jiang
2e5a4003a8 Merge pull request #2401 from wemeya/master
modify swagger.yaml
2017-06-08 11:16:52 +08:00
wemeya
1b995e1736 modify swagger.yaml 2017-06-01 15:21:40 +08:00
wemeya
4463540995 modify swagger.yaml 2017-06-01 14:22:19 +08:00
Wenkai Yin
1b83c0b076 support pagination in GET recent logs API 2017-05-26 17:51:20 +08:00
Wenkai Yin
30316a2b94 return signatures in GET tags API 2017-05-24 10:15:39 +08:00
Daniel Jiang
32102c1523 Merge pull request #2332 from vmware/release-1.1.0
merge 1.1.0 to master
2017-05-19 07:19:46 -07:00
Daniel Jiang
0b02231093 Update registry img (#2330)
* update the registry image

* update other yml files and docs to reflect image update
2017-05-19 00:19:27 -07:00
Steven Zou
a311d3d825 Change ui build image version to 1.1.2 2017-05-18 22:32:11 -07:00
timchenxiaoyu
86062d9592 docs error
fix #1347
2017-05-16 17:19:08 +08:00
root
299bf31337 Add the discription of notary in User Guide 2017-05-15 02:51:51 +00:00
Mizukoshi Masataka
39a0667fb2 modify the harbor-clarity-ui-builder's version in docs 2017-05-14 08:11:02 +00:00
Wenkai Yin
0cf2ef8a2b update 2017-05-11 17:34:08 +08:00
Wenkai Yin
06ba7e0de0 update 2017-05-11 12:34:14 +08:00
Wenkai Yin
6cf545f304 update swagger 2017-05-04 12:01:46 +08:00
Yan
4268d2a7fb Merge branch 'release-1.1.0' into release-1.1.0 2017-04-25 00:14:47 -07:00
wangyan
b061efdeb8 add 1.1.0.1 support
update 1.1.x

update 1.1.x
2017-04-24 23:49:27 -07:00
Henry Zhang
29236838c8 update installation guide 2017-04-24 15:01:19 +08:00
sigsbee
23506dc40f update user guide (#1983)
* update user guide

* update user guide

* update user guide

* update user guide

* update user guide

* fix refer

* update user guide gc

* update user guide

* update user guide

* update user guide

* update user guide
2017-04-18 17:09:45 +08:00
Steven Zou
0bec263df7 Merge pull request #2041 from steven-zou/master
update i18 development guide document
2017-04-18 15:50:13 +08:00
Steven Zou
f87e7475f4 update i18 development guide document 2017-04-18 15:26:12 +08:00
Haining Henry Zhang
d84218d7f0 Update TOC of docs (#2032)
* update change log

* update documents

* update documents

* update AUTHORS

* update README

* update harbor.cfg

* remove unused files

* updated TOC of docs

* update REAME

* update README
2017-04-18 14:16:52 +08:00
Yan
c06abe9b8a Merge pull request #2026 from wy65701436/1.1.0-document
update compile document
2017-04-17 22:16:15 -07:00
wangyan
c31ad85042 update version 2017-04-17 21:47:43 -07:00
Haining Henry Zhang
05378cbd85 Merge pull request #2031 from sigsbee/fixmarkdown
fix markdown
2017-04-17 20:33:48 +08:00
myufei
07f38025e0 fix markdown 2017-04-17 19:06:00 +08:00
wangyan
f41fcdeeb4 update compile document
update makefile

update per comments

update document
2017-04-17 04:05:33 -07:00
Tan Jiang
ce0b22633e fix port issue 2017-04-17 19:02:05 +08:00
Tan Jiang
33aca89a37 refer to lifecycle mgmt section 2017-04-17 18:23:49 +08:00
Tan Jiang
0b9008c131 update install guide to highlight the lifecycle management commands for Harbor in notary mode 2017-04-17 16:19:18 +08:00
Tan Jiang
84eed7fdaf update according to review comments 2017-04-17 12:56:49 +08:00
Tan Jiang
f8db6c6cf6 update installation guide 2017-04-14 18:10:07 +08:00
Wenkai Yin
ac77ee3bc4 modify ping targat and put target api 2017-04-10 13:45:24 +08:00
Daniel Jiang
7d6d641827 Merge branch 'master' into dev 2017-04-05 17:01:27 +08:00
wy65701436
3c44235efe move clarity to vmware namespace. 2017-04-04 20:12:00 -07:00
Tan Jiang
6e671e5cc2 minor fix to doc for setup env for using notary 2017-03-28 22:54:39 +08:00
Daniel Jiang
f749b84aff Merge pull request #1806 from wy65701436/dev
change version to gittag
2017-03-27 18:52:30 +08:00
wy65701436
4f8174a497 remove proxy from doc 2017-03-26 23:55:37 -07:00
Wenkai Yin
4cc2115a23 Merge pull request #1710 from ywk253100/170321_url
Refactor API URL.
2017-03-27 13:26:32 +08:00
Wenkai Yin
5c4808bf93 update frontend codes 2017-03-24 18:38:33 +08:00
Wenkai Yin
d83554013b Merge remote-tracking branch 'upstream/dev' into 170321_url 2017-03-24 14:56:55 +08:00
Tan Jiang
90bc280ea1 add a 4443 ssl server to nginx config 2017-03-24 13:16:48 +08:00
wy65701436
9d4b36a97c add doc for make 2017-03-23 00:20:18 -07:00
Tan Jiang
a588819ce0 add a simple guide for notary on harbor 2017-03-23 13:48:36 +08:00
Wenkai Yin
9e12274309 Merge remote-tracking branch 'upstream/dev' into 170321_url
Conflicts:
	src/ui/router.go
2017-03-23 11:19:34 +08:00
Wenkai Yin
b461ba54a8 refactor api. 2017-03-22 14:30:49 +08:00
wy65701436
8268cf66bd update swagger 2017-03-21 18:56:42 -07:00
Daniel Jiang
eda9aa189e Merge pull request #1634 from reasonerjt/more-systeminfo
return ca root cert status in systeminfo
2017-03-20 10:41:24 +08:00
Yan
92d9f8516f Merge pull request #1626 from ywk253100/170315_registry_upgrade
Upgrade registry to 2.6.0
2017-03-17 18:25:22 +08:00
Tan Jiang
5e229f7d96 systeminfo returns flag for ca root 2017-03-17 14:06:33 +08:00
Wenkai Yin
9d8366d89e Merge remote-tracking branch 'upstream/dev' into 170315_ping_email
Conflicts:
	src/ui/api/harborapi_test.go
2017-03-16 15:54:15 +08:00
Wenkai Yin
c5917eddf3 modify swagger 2017-03-16 15:19:47 +08:00
Wenkai Yin
108aa21499 upgrade registry to 2.6.0 2017-03-16 13:44:16 +08:00
Wenkai Yin
b25f5f9692 ping email server API enhancement 2017-03-16 11:52:12 +08:00
Wenkai Yin
c3626edd42 reset config 2017-03-16 11:27:45 +08:00
Daniel Jiang
58a05c0aaf Merge pull request #1563 from ywk253100/170310_top_repo
Refactor getting top repo API to return more info
2017-03-13 10:45:36 +08:00
Tan Jiang
ef906c96d0 provide systeminfo API for UI 2017-03-10 18:53:11 +08:00
Wenkai Yin
62963eb3a8 update swagger 2017-03-10 15:31:05 +08:00
Wenkai Yin
3cb53011eb refactor get tags API to return more info 2017-03-09 17:30:00 +08:00
Tan Jiang
42bc430cfd update swagger, fix minor issues in test 2017-03-08 13:57:34 +08:00
Wenkai Yin
f7fe063436 fix conflict 2017-03-08 10:57:17 +08:00
Wenkai Yin
b4f8fdf563 fix bug in swagger 2017-03-07 20:34:43 +08:00
Daniel Jiang
c1d9d68232 Merge pull request #1518 from ywk253100/170306_search
Refactor search API to return more info
2017-03-07 13:12:53 +08:00
Wenkai Yin
dfae869dce add test cases 2017-03-06 18:03:31 +08:00
Wenkai Yin
d6a6f67596 refactor search API to return more info 2017-03-06 17:47:05 +08:00
yhua
c48d908515 add new ldap auth and import user feature 2017-02-27 15:13:49 +08:00
Wenkai Yin
414e8a8bcf Merge remote-tracking branch 'upstream/dev' into 170224_merge_config
Conflicts:
	make/docker-compose.tpl
	src/ui/service/token/authutils.go
2017-02-24 13:52:19 +08:00
kun wang
09833b2fc4 Merge pull request #1261 from guiguan/patch-1
LGTM
2017-02-15 12:08:14 +08:00
Wenkai Yin
6dc6b4fa79 update Makefile 2017-02-10 17:03:21 +08:00
Wenkai Yin
1fbb28ad8c update 2017-02-09 15:25:52 +08:00
Tan Jiang
27802f7620 Merge branch 'master' into dev 2017-01-24 12:16:53 +08:00
Henry Zhang
63d2aa9321 update document README 2017-01-23 22:08:41 +08:00
Henry Zhang
67cf2df307 update migration guide 2017-01-23 21:24:25 +08:00
Henry Zhang
d0648efbb9 update migration guide 2017-01-23 21:17:06 +08:00
Haining Henry Zhang
e05a125b64 Merge pull request #1287 from vmware/yhua123-patch-1
Update migration_guide.md
2017-01-23 21:03:48 +08:00
yhua
c7a05e0571 fix typo 2017-01-20 16:25:03 +08:00
yhua
e21787e68a update swagger.yaml 2017-01-20 16:15:56 +08:00
Wenkai Yin
deab033c8b update downloading images part of doc (#1311)
LGTM
2017-01-20 15:24:17 +08:00
Kira
00259567a8 update kubernetes deployment 2017-01-16 12:06:35 +08:00
yhua
7fbe811394 add ldap ping feature 2017-01-11 15:08:41 +08:00
yhua123
789797f400 Update migration_guide.md 2017-01-04 18:45:26 +08:00
yhua
4c213a8717 remove openldap lib from Dockerfile and support build with offcial golang image(1.7.3) 2017-01-04 17:48:20 +08:00
Guan Gui
9ca7d3014f Added escape for angle brackets in email_from
This solved the "[ERROR] [password.go:83]: Send email failed: 555 5.5.2 Syntax error. b192sm9510409pga.30 - gsmtp" error.
2016-12-21 16:31:52 +11:00
Wenkai Yin
111638ae8e Merge pull request #1249 from yhua123/dev-update-registry
update registry from 2.5.0 to 2.5.1
2016-12-16 18:03:53 +08:00
Wenkai Yin
3717b37dca Merge pull request #1251 from yhua123/dev-update-golang
upgrade golang baseimage from 1.6.2 to 1.7.3
2016-12-16 17:27:24 +08:00
yhua
0249f2181a update registry from 2.5.0 to 2.5.1 2016-12-15 16:50:50 +08:00
yhua
10306e784b upgrade golang baseimage from 1.6.2 to 1.7.3 2016-12-15 13:16:14 +08:00
yhua123
0d09379fb7 Merge branch 'dev' into dev 2016-12-12 15:11:00 +08:00
Tan Jiang
ee4cfa68d8 Merge branch 'master' into dev 2016-12-12 14:39:45 +08:00
yhua
90be98bc5d add 'data_volume' in harbor.cfg 2016-12-12 14:35:28 +08:00
Wenkai Yin
62c1c2d50b update docs 2016-12-08 21:37:09 +08:00
yhua123
ead0985d20 Merge pull request #1146 from wknet123/dev-update-swagger
Updates Swagger YAML for new added API.
NMT
2016-12-08 15:44:39 +08:00
Henry Zhang
588cc375a5 update docs 2016-12-06 01:01:03 +08:00
Henry Zhang
8359c91e66 update docs 2016-12-06 00:41:05 +08:00
Daniel Jiang
8333e54d75 Merge pull request #1210 from ywk253100/161204_ova_install_guide
Move self-registrition option to authentication group in installation guide
2016-12-05 17:14:53 +08:00
Wenkai Yin
d808c402d2 move self-registrition option to authentication group in installation guide 2016-12-04 21:54:33 +08:00
Wenkai Yin
ad4560b50f user guide for ova 2016-12-02 17:47:41 +08:00
Wenkai Yin
871c18df46 Merge pull request #1177 from ywk253100/161118_lvm
lvm guide
2016-11-28 14:54:04 +08:00
Wenkai Yin
988ad4608b lvm guide 2016-11-28 14:36:03 +08:00
Wenkai Yin
e5b2995b1e log collection doc 2016-11-28 14:06:14 +08:00
Henry Zhang
f4017bdd5a update ova installation guide 2016-11-24 22:47:33 +08:00
Henry Zhang
814e89cadb update ova installation guide 2016-11-24 22:39:01 +08:00
Henry Zhang
0c62b50606 update installation guide 2016-11-23 23:35:57 +08:00
Henry Zhang
ee7ad59143 update installation guide 2016-11-23 23:33:33 +08:00
Henry Zhang
810db2415f update ova installation guide 2016-11-23 23:26:57 +08:00
Henry Zhang
d435a41006 install guide ova 2016-11-22 21:59:46 +08:00
Henry Zhang
01004a8427 update install guide ova 2016-11-22 21:48:16 +08:00
Henry Zhang
9fa6842f83 install guide ova 2016-11-22 21:15:06 +08:00
kunw
e3f5e9e501 Updates Swagger YAML for new added API. 2016-11-22 19:19:17 +08:00
Henry Zhang
093747cd2c udpate installation guide OVA 2016-11-22 18:12:11 +08:00
Daniel Jiang
2119034c5c Merge pull request #1123 from ywk253100/161118_ova_guide
Update ova guide
2016-11-21 16:44:30 +08:00
kun wang
4671f4a02f Merge pull request #1124 from yhua123/dev
LGTM
2016-11-21 15:18:11 +08:00
yhua
a0fc5a132e add api/users/current to swagger.yaml 2016-11-18 17:10:53 +08:00
Wenkai Yin
3c99b366b5 update ova guide 2016-11-18 17:07:23 +08:00
Tan Jiang
00c41c5860 Merge branch 'master' into dev 2016-11-16 22:01:59 +08:00
yhua123
48ef9bed30 Update configure_https.md
remove update openssl.cnf part
2016-11-15 15:11:07 +08:00
yhua123
34d5884647 Update configure_https.md
remove serial part in demoCA directory(1)
2016-11-15 14:08:08 +08:00
yhua123
374f817924 Update configure_https.md
remove serial part in demoCA directory
2016-11-15 14:05:42 +08:00
yhua123
284219efc0 Merge pull request #1029 from xuxinkun/master
fix responses for /repositories/tags.
LGTM
2016-11-14 11:38:25 +08:00
Daniel Jiang
3008dc0749 Merge pull request #1057 from hainingzhang/master
update install and user guide
2016-11-14 11:34:57 +08:00
yhua
e55aa47641 modify openssl ca to openssl x509 for certificate format 2016-11-11 18:43:47 +08:00
Tan Jiang
977c5a80a0 Merge branch 'master' into dev 2016-11-11 15:21:02 +08:00
Henry Zhang
2b0cf6a5e0 update install and user guide 2016-11-10 17:19:35 +08:00
Henry Zhang
b9b4274e9e build guide 2016-11-10 16:22:08 +08:00
Henry Zhang
321c850d48 build guide 2016-11-10 16:16:36 +08:00
Henry Zhang
c22e78c54f build guide 2016-11-10 16:10:39 +08:00
Daniel Jiang
2d348cca6a Merge pull request #1050 from senk/fix-docs
Fix filepath to app.conf
2016-11-10 16:07:12 +08:00
Daniel Jiang
812f5f8cf0 Merge pull request #1032 from reasonerjt/update-https-doc
update configure https guide
2016-11-10 15:16:33 +08:00
Tan Jiang
fcf292d948 update the doc 2016-11-10 14:49:08 +08:00
Robin Naundorf
c9601ef169
Fix filepath to app.conf 2016-11-09 13:34:01 +01:00
Henry Zhang
acd48d7211 update typos 2016-11-09 17:24:54 +08:00
Haining Henry Zhang
e37389a75a Merge pull request #1035 from hainingzhang/master
update docs and test cases
2016-11-07 22:34:11 +08:00
Henry Zhang
876712a5ca user guide 2016-11-07 21:58:17 +08:00
Henry Zhang
6d237bf69d user guide 2016-11-07 21:53:46 +08:00
Brian Christner
bb12288776
fixed some spelling/grammer in the README and install guide 2016-11-07 14:10:49 +01:00
Tan Jiang
da3862aa1f update db migration guide to use image on docker hub 2016-11-07 20:13:20 +08:00
Tan Jiang
bb7ed3db7c update configure https guide 2016-11-07 18:38:19 +08:00
xuxinkun
758d063514 fix responses for /repositories/tags.
Signed-off-by: xuxinkun <xuxinkun@gmail.com>
2016-11-07 17:29:01 +08:00
Daniel Jiang
eb44e889c3 Merge pull request #1008 from yhua123/dev
Dev
2016-11-07 11:33:21 +08:00
yhua
158550a02a change some describe in docs/compile_guide.md and fix one makefile issue 2016-11-04 15:25:06 +08:00
yhua
102bb888be update docs/compile_guide.md 2016-11-03 17:50:40 +08:00
Henry Zhang
a011c84e19 install ova 2016-11-03 17:44:14 +08:00
yhua
07b9e5e326 modify the directory of dev docker-compose.yml 2016-11-03 15:21:58 +08:00
Henry Zhang
c18b276d07 installation guide for ova 2016-11-02 21:18:29 +08:00
Henry Zhang
a811a53d3a installation guide 2016-11-02 20:58:48 +08:00
yhua
88b122a777 add document for make process and build local golang image into Makefile 2016-11-02 17:29:12 +08:00
Daniel Jiang
bc63c46b2d Merge pull request #996 from ywk253100/161102_nginx_upgrade
Upgrade nginx to 1.11.5
2016-11-02 17:14:22 +08:00
Wenkai Yin
4fcfffeb47 upgrade nginx to 1.11.5 2016-11-02 15:49:28 +08:00
Henry Zhang
1cb7b1a54b update docs 2016-11-01 23:50:59 +08:00
Henry Zhang
e366c31d83 update docs 2016-11-01 23:45:47 +08:00
Henry Zhang
3ed8225935 update docs 2016-11-01 23:09:25 +08:00
Henry Zhang
67f27fae00 update docs 2016-11-01 23:03:39 +08:00
Henry Zhang
136e0bbda3 update docs 2016-11-01 22:52:34 +08:00
Wenkai Yin
52edcd8f23 1.add self_registration attr 2.update docs 2016-10-31 13:46:00 +08:00
Haining Henry Zhang
7a66c2cf6e Merge pull request #917 from ywk253100/161021_ova_md
OVA installation guide
2016-10-31 00:17:26 +08:00
Daniel Jiang
ee9f09bd17 Merge pull request #957 from ywk253100/161027_fix_826
Fix #826
2016-10-28 12:44:48 +08:00
Daniel Jiang
45b32934fc Merge pull request #967 from ywk253100/161028_fix_964
Fix #964
2016-10-28 12:44:34 +08:00