Commit Graph

2422 Commits

Author SHA1 Message Date
Wenkai Yin
6dc6b4fa79 update Makefile 2017-02-10 17:03:21 +08:00
Wenkai Yin
58d17cbd72 Merge pull request #1314 from laz2/fix-1306-admin-top-repos
Fix visibility of top repos for admin (#1306)
2017-02-10 15:45:37 +08:00
Tan Jiang
1d2970c3c5 Merge branch 'master' into dev 2017-02-10 10:51:20 +08:00
Wenkai Yin
1fbb28ad8c update 2017-02-09 15:25:52 +08:00
Wenkai Yin
aa22c2b521 Merge pull request #1338 from ywk253100/161228_config
Add test cases
2017-02-09 12:41:24 +08:00
Wenkai Yin
9ec11ac672 add test cases 2017-02-09 11:24:23 +08:00
kun wang
13eaedb84f Update for batch deletion of repos. (#1335)
NMT
2017-02-08 18:15:07 +08:00
Wenkai Yin
f88c801b4e Merge pull request #1334 from ywk253100/161228_config
configuration update
2017-02-08 15:39:34 +08:00
Wenkai Yin
480ac427cc Merge remote-tracking branch 'upstream/configuration' into 161228_config
Conflicts:
	src/adminserver/systemcfg/store/json/driver_json_test.go
	src/adminserver/systemcfg/systemcfg_test.go
2017-02-08 15:16:53 +08:00
Wenkai Yin
f113f4a54f update 2017-02-08 14:58:21 +08:00
Daniel Jiang
9533c13120 Merge pull request #1325 from ywk253100/170207_multinamespace
Support multiple namespaces in repo name
2017-02-08 13:42:55 +08:00
Wenkai Yin
dc432d5575 support multiple namespace fix #1217 2017-02-07 13:13:42 +08:00
Tan Jiang
27802f7620 Merge branch 'master' into dev 2017-01-24 12:16:53 +08:00
Daniel Jiang
88cca745c4 Merge pull request #1318 from hainingzhang/master
update readme of documentation
2017-01-24 12:15:48 +08:00
Henry Zhang
74d1f8dd88 Merge remote-tracking branch 'hupstream/master' 2017-01-23 22:11:06 +08:00
Henry Zhang
63d2aa9321 update document README 2017-01-23 22:08:41 +08:00
Haining Henry Zhang
d786f12f11 Merge pull request #1317 from hainingzhang/master
udpate migration guide
2017-01-23 21:59:06 +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
Daniel Jiang
e271d6ba8a Merge pull request #1310 from ywk253100/161228_config
configure Harbor
2017-01-22 18:22:20 +08:00
Dmitry Lazurkin
444b7f97bf fix visibility of top repos for admin (#1306) 2017-01-21 19:06:43 +03:00
kun wang
741ca20b6a Merge pull request #1312 from yhua123/configuration
LGTM
2017-01-20 03:57:54 -06:00
Wenkai Yin
bcc6a4bbf2 update 2017-01-20 16:52:03 +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
Wenkai Yin
4e84fabd41 Merge pull request #1270 from kdada/harbor-master
update kubernetes deployment
2017-01-19 18:24:37 +08:00
Wenkai Yin
b6e27f6ea2 Merge remote-tracking branch 'upstream/configuration' into 161228_config
Conflicts:
	tests/docker-compose.test.yml
2017-01-19 17:56:53 +08:00
Wenkai Yin
f1f78a5649 update 2017-01-19 17:56:08 +08:00
wemeya
7f949b1a95 add test for ldap.go (#1307)
LGTM
2017-01-19 10:09:56 +08:00
Kira
00259567a8 update kubernetes deployment 2017-01-16 12:06:35 +08:00
Wenkai Yin
24a935a25f Merge remote-tracking branch 'upstream/configuration' into 161228_config 2017-01-12 17:41:54 +08:00
Wenkai Yin
75f660fa77 Merge remote-tracking branch 'upstream/dev' into 161228_config
Conflicts:
	make/common/templates/ui/env
	src/ui/auth/ldap/ldap.go
	src/ui/config/config.go
2017-01-12 17:41:14 +08:00
Wenkai Yin
b62a958250 configure harbor 2017-01-12 17:15:32 +08:00
kun wang
84509fbb3e regulate some model attribute names. (#1303)
LGTM
2017-01-11 18:31:20 +08:00
kun wang
733a9fd628 Merge pull request #1302 from yhua123/dev
LGTM
2017-01-11 04:30:10 -06:00
kun wang
a6a4a1fc18 Merge pull request #1299 from yhua123/configuration
LGTM
2017-01-11 02:07:46 -06:00
yhua
7fbe811394 add ldap ping feature 2017-01-11 15:08:41 +08:00
yhua
c61016512f fix project name length and follow docker project name rule 2017-01-11 11:39:18 +08:00
Wenkai Yin
05436d7a73 Merge pull request #1301 from laz2/fix-783-filter-top-repos
Fix filtering top repositories (#783, #1281) (recreated for dev branch)
2017-01-10 10:42:52 +08:00
Dmitry Lazurkin
3c7a09a8c4 Fix filtering top repositories (#783, #1281) 2017-01-06 21:53:29 +03:00
wemeya
ce0a44010d add test file for systeminfo.go (#1288)
LGTM
2017-01-06 15:41:07 +08:00
Wenkai Yin
af1589b9c8 Merge pull request #1285 from feilengcui008/master
add registry python api and cli tool
2017-01-05 18:27:34 +08:00
kun wang
f27f2cf84e Merge pull request #1286 from yhua123/dev
LGTM
2017-01-05 15:58:35 +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
feilengcui008
233bbda16c remove v1 flag in getManifestWithConf 2017-01-04 15:11:16 +08:00
feilengcui008
5e258741d9 add registry python api and cli tool 2017-01-03 19:34:51 +08:00
Ricardo Katz
160e22f0fe Changes LDAP Library and other LDAP improvements (#1277)
* Changes LDAP library to go-ldap and creates new ldap timeout directive

* Add support for connection on LDAP using TLS
2016-12-30 16:03:30 +08:00