Wenkai Yin
|
385d76e6f2
|
Merge remote-tracking branch 'upstream/configuration' into 170214_encryption
Conflicts:
src/common/utils/registry/auth/tokenauthorizer.go
src/common/utils/test/adminserver.go
src/jobservice/replication/transfer.go
src/ui/api/config.go
|
2017-02-20 12:21:56 +08:00 |
|
Wenkai Yin
|
390f89ee0a
|
encrypt passwords and secret
|
2017-02-17 18:23:21 +08:00 |
|
Daniel Jiang
|
4bc69f294f
|
Merge pull request #1390 from wknet123/configuration
Add configuration of UI.
|
2017-02-17 14:39:09 +08:00 |
|
Daniel Jiang
|
f88bc4a27a
|
Merge pull request #1349 from ywk253100/161228_config
Update Makefile and swagger
|
2017-02-17 14:38:42 +08:00 |
|
Wenkai Yin
|
2e3174f404
|
update
|
2017-02-15 15:28:50 +08:00 |
|
kunw
|
09dc6909ae
|
Update for some changes about configuration settings of UI.
|
2017-02-14 12:34:47 +08:00 |
|
Wenkai Yin
|
06519bb3f2
|
update
|
2017-02-13 17:17:46 +08:00 |
|
kunw
|
421288046e
|
Add configuration features to UI.
|
2017-02-13 13:13:49 +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 |
|
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 |
|
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
|
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 |
|