Commit Graph

278 Commits

Author SHA1 Message Date
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
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
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