Commit Graph

2196 Commits

Author SHA1 Message Date
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
Wenkai Yin
9ec11ac672 add test cases 2017-02-09 11:24:23 +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
e271d6ba8a Merge pull request #1310 from ywk253100/161228_config
configure Harbor
2017-01-22 18:22:20 +08: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
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
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
kun wang
f27f2cf84e Merge pull request #1286 from yhua123/dev
LGTM
2017-01-05 15:58:35 +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
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
kun wang
226ab5a5f7 Add debounce to input fields. (#1273)
LGTM
2016-12-29 13:23:59 +08:00
Wenkai Yin
ad4da5f043 fix cerrificate bundle issue. (#1266)
LGTM
2016-12-26 15:49:53 +08:00
kun wang
6088d45686 Fix clarifying color about message in modals. (#1258)
LGTM
2016-12-23 15:05:39 +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
kun wang
d50ec3808a Fixed error messages displaying in modals. (#1254)
LGTM
2016-12-16 17:27:40 +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
Daniel Jiang
99ce7c0edf Merge pull request #1237 from yhua123/dev
add 'secretkey_path' in harbor.cfg
2016-12-15 17:59:45 +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
Daniel Jiang
2585b5d4e7 Merge pull request #1240 from ScorpioCPH/remove-http-timeout-on-getting-catalog
Remove http timeout option on getting catalog
2016-12-14 14:36:32 +08:00
Penghao Cen
1e57166962 Remove http timeout option on getting catalog 2016-12-12 20:42:28 +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
Daniel Jiang
e1b2ba0e23 Merge pull request #1233 from ywk253100/161209_replic_dead_lock
Fix sync deadlock and filter notification
2016-12-12 14:36:15 +08:00
yhua
90be98bc5d add 'data_volume' in harbor.cfg 2016-12-12 14:35:28 +08:00
Wenkai Yin
d6d4711700 1.fix issue: deleting repo action will fall in deadlock between two Harbor if they are configured to sync to each other 2. Filter notification request in nginx 2016-12-09 18:10:20 +08:00
Daniel Jiang
64ae107fe5 Merge pull request #1224 from ywk253100/161205_rm_auth_header
Do not add the authentication header to requests which are not sent to registry
2016-12-09 00:48:09 +08:00
Haining Henry Zhang
000a8539fe Merge pull request #1226 from ywk253100/161208_doc
Update docs
2016-12-08 22:16:28 +08:00
Wenkai Yin
62c1c2d50b update docs 2016-12-08 21:37:09 +08:00
yhua123
c74703434f Merge pull request #1225 from wknet123/dev
Update about checking comment length with non-ASCII characters
NMT
2016-12-08 16:23:23 +08:00
kunw
9e73abf8f6 Update checking comment length. 2016-12-08 15:57:03 +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
Wenkai Yin
2e9b59a20a add test case 2016-12-08 15:18:51 +08:00