Commit Graph

2249 Commits

Author SHA1 Message Date
Tan Jiang
7620cd3b86 refactor token service 2017-02-26 19:53:13 +08:00
Daniel Jiang
01e105090e Merge pull request #1449 from ywk253100/170224_merge_config
Merge configuration to dev
2017-02-24 15:44:36 +08:00
Wenkai Yin
9f3f48be59 add harbor network to adminserver 2017-02-24 14:35:11 +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
Daniel Jiang
f47a923a68 Merge pull request #1435 from ywk253100/170223_reset_config
Using different secret to mark himself when communicates with other components
2017-02-24 13:39:28 +08:00
Wenkai Yin
a1858098c5 using different secret to mark himself when communicates with other components 2017-02-23 18:24:32 +08:00
Wenkai Yin
2b5777b490 Merge pull request #1434 from ywk253100/170222_config_all
Support changing all configurations through API
2017-02-23 17:29:53 +08:00
Wenkai Yin
e2c7cfc0ad support changing all configurations through API 2017-02-23 16:27:19 +08:00
Daniel Jiang
41f5776df9 Merge pull request #1430 from reasonerjt/token-service-refactory
add basic unit test cases for token service
2017-02-23 14:23:26 +08:00
Daniel Jiang
ef34b96256 Merge pull request #1422 from ywk253100/170221_secretkey
Encrypt the passwords in configuration file
2017-02-23 10:25:39 +08:00
Tan Jiang
160d5636fb add basic unit test cases for token service 2017-02-22 20:44:29 +08:00
Wenkai Yin
40eb6bb7d3 encrypt passwords enhancement 2017-02-22 16:59:28 +08:00
Wenkai Yin
09ee2f5266 Merge pull request #1402 from reasonerjt/notary-integration
Notary integration
2017-02-21 16:29:37 +08:00
Wenkai Yin
bf39b3a956 modify Makefile of Harbor based on photon (#1404)
LGTM
2017-02-21 13:45:12 +08:00
Tan Jiang
8cbfffa9c8 deploy notary within Harbor 2017-02-20 19:31:28 +08:00
Daniel Jiang
245b54d10d Merge pull request #1400 from reasonerjt/dev
-conf -> --conf
2017-02-20 14:58:34 +08:00
Tan Jiang
c3c1b84ed1 preparae --conf instead of -conf 2017-02-20 13:21:29 +08:00
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
Daniel Jiang
a17cd5bcfe add a default network for containers in harbor (#1384)
LGTM
2017-02-16 14:51:21 +08:00
Wenkai Yin
2e3174f404 update 2017-02-15 15:28:50 +08:00
kun wang
8b8dcc6b17 Fix some missing semi-colons in JS. (#1357)
LGTM
2017-02-14 17:43:33 +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
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