Commit Graph

2323 Commits

Author SHA1 Message Date
Wenkai Yin
a4cb261df9 read some configs from env 2017-03-02 13:24:41 +08:00
Steven Zou
ac6c26d6db Merge pull request #1483 from vmware/feature/merge_ui_ng_code
merge code for building
2017-02-28 12:51:44 +08:00
Steven Zou
dcc88cbea2 merge code for building 2017-02-28 12:46:15 +08:00
Daniel Jiang
660fd4a80a Merge pull request #1477 from reasonerjt/dev
fix the 'v2' URL conflict issue, and remove the workaround
2017-02-28 12:43:22 +08:00
Tan Jiang
71c9fcf849 remove confusing comment 2017-02-28 11:37:09 +08:00
Tan Jiang
6454ccfc3a fix the 'v2' URL conflict issue, and remove the work around in token service code 2017-02-27 21:01:26 +08:00
Wenkai Yin
5b885a7ad6 Merge pull request #1469 from yhua123/dev
fix #1332
2017-02-27 19:21:25 +08:00
kun wang
cf009d2a74 Merge pull request #1471 from wknet123/dev-revised
Updates for configuration ldap scope.
2017-02-27 19:15:09 +08:00
kunw
44ea387f02 Updates for configuration ldap scope. 2017-02-27 19:12:19 +08:00
yhua
9f18c8458b fix #1332 2017-02-27 18:52:22 +08:00
Steven Zou
2e20a65121 Merge pull request #1458 from wknet123/harbor-clarity-integration
Merge Harbor clarity integration to into Dev branch.
2017-02-27 16:20:22 +08:00
Wenkai Yin
c4606d0383 Merge pull request #1467 from yhua123/dev
add new ldap auth and import user feature
2017-02-27 16:17:14 +08:00
Daniel Jiang
1405661f5f Merge pull request #1462 from reasonerjt/token-service-refactory
Token service refactory
2017-02-27 15:59:03 +08:00
yhua
c48d908515 add new ldap auth and import user feature 2017-02-27 15:13:49 +08:00
Tan Jiang
81502e1e59 refinement per review 2017-02-27 12:52:14 +08:00
kunw
46cef020eb Rename directory name. 2017-02-27 11:41:46 +08:00
Tan Jiang
776c34a0ae fix go vet and golint errors 2017-02-26 22:05:13 +08:00
Tan Jiang
7620cd3b86 refactor token service 2017-02-26 19:53:13 +08:00
kunw
d357083621 Change some files. 2017-02-24 18:22:31 +08:00
kunw
9b8fd07557 Remove unused files 2017-02-24 18:14:10 +08:00
kunw
5619e4e7e3 Added lastest UI codes. 2017-02-24 18:06:08 +08:00
kunw
23f0ff1ea5 Refactor Harbor Clarity integration code structure. 2017-02-24 17:54:50 +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
kunw
914255d6c2 Updates for docker-compose sources. 2017-02-24 14:12:45 +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
Steven Zou
c0180312ba Merge pull request #1438 from vmware/fix/namespace_duplicated
fix component namespace duplicated bug
2017-02-24 13:38:00 +08:00
Steven Zou
8173aaeac2 fix component namespace duplicated bug 2017-02-24 13:37:08 +08:00
Steven Zou
16df9fec5d Merge pull request #1437 from vmware/fix/user_profile_dropdown
Implement user list and fix some related issues
2017-02-24 00:02:22 +08:00
Steven Zou
23f0e3dda5 Implement user list and fix some related issues 2017-02-23 23:58:44 +08:00
kun wang
6c23d1ad28 Merge pull request #1436 from wknet123/harbor-clarity
Add audit log component and refine projects navigation flow.
2017-02-23 22:46:43 +08:00
kunw
c282653bec Add audit log component and refine projects navigation flow. 2017-02-23 18:47:00 +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
kun wang
c64ebc8b57 Merge pull request #1420 from wknet123/harbor-clarity
Refactored codes of project component.
2017-02-23 14:46:38 +08:00
kunw
dbda407916 Updates for abstracting list project component. 2017-02-23 14:43:51 +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
kun wang
abc2bcbf2a Merge pull request #1429 from wknet123/harbor-clarity-integration
Update path of dockerfile.
2017-02-22 19:16:01 +08:00
kunw
8e292da061 Update path of dockerfile. 2017-02-22 19:13:47 +08:00
kun wang
f4d35414d2 Merge pull request #1425 from wknet123/harbor-clarity-integration
Updates for building node-clarity image.
2017-02-22 18:31:42 +08:00
kunw
bb674ea977 Updates for building node-clarity image. 2017-02-22 18:30:37 +08:00
Steven Zou
8281194bca Merge pull request #1423 from vmware/fix/user_profile_dropdown
Refine the related menu
2017-02-22 17:53:18 +08:00
Steven Zou
495a3150d3 Refine the related menu 2017-02-22 17:50:46 +08:00
Wenkai Yin
40eb6bb7d3 encrypt passwords enhancement 2017-02-22 16:59:28 +08:00
kunw
b26ffdb8f7 Refactored codes of project component. 2017-02-22 13:16:05 +08:00
kunw
3a621faba3 Fixed some issues and merged latest codes. 2017-02-22 13:03:05 +08:00