pfh
13308ce9d8
Merge remote-tracking branch 'upstream/master' into repEnhance
2018-01-05 14:09:03 +08:00
Qian Deng
f20103dc0c
Merge pull request #3906 from ninjadq/sidenav_to_verticalnav
...
Replace Navigation bar from Sidenav to Vertical Nav
2018-01-04 18:32:04 +08:00
Wenkai Yin
51297cdfd7
Merge pull request #3887 from ywk253100/171227_ssrf
...
Fix SSRF security issue #3755 in ping target, email server and LDAP server APIs
2018-01-04 18:11:47 +08:00
Deng, Qian
2122503599
Replace Navigation bar from Sidenav to Vertical Nav
...
1. Replace Sidenav to VerticalNav
2. Update related test case
3. Move Endpoint and Repliction to two different label
2018-01-04 17:24:38 +08:00
pengpengshui
a75f347fd4
Merge pull request #3910 from pengpengshui/skinable
...
Modify skinnable json file and modify images path about #3909 #3879
2018-01-04 16:12:59 +08:00
Fuhui Peng (c)
7845405862
Modify skinnable json file and modify image path about #3909 #3879
2018-01-04 14:26:41 +08:00
Fuhui Peng (c)
4932692b58
Modify test case about configuration for replication enhancment
2018-01-04 13:36:49 +08:00
Daniel Jiang
8e5115c832
Merge pull request #3870 from stonezdj/ldap_syncuser2
...
Sync user email in ldap #3663
2018-01-04 13:28:51 +08:00
Wenkai Yin
3448fd9a2d
Fix SSRF security issue #3755 in ping target, email server and LDAP server APIs
2018-01-04 12:26:17 +08:00
Wenkai Yin
7639834c96
Merge pull request #3907 from ywk253100/180103_ut
...
Add unit test cases for replication codes
2018-01-04 10:34:10 +08:00
Daniel Jiang
4bf82ab88c
Merge pull request #3908 from jessehu/aws-s3
...
Fix indentation in registry yaml files
2018-01-03 20:01:33 +08:00
Wenkai Yin
8e4e5e8b54
Add unit test cases for replication codes
2018-01-03 18:39:30 +08:00
Jesse Hu
4fb947a155
Fix indentation in registry yaml files
2018-01-03 18:28:22 +08:00
Fuhui Peng (c)
bdd0664134
Merge master and modify package version
2018-01-03 17:52:22 +08:00
Daniel Jiang
1a7f6f36e2
Merge pull request #3903 from reasonerjt/uaa-ca-config
...
Enable configuring the CA Certificate for UAA
2018-01-03 17:28:39 +08:00
Qian Deng
e2d5545f48
Merge pull request #3878 from ninjadq/metadata_description_enhancement
...
Enhancement of Metadata Descrition
2018-01-03 17:11:15 +08:00
Tan Jiang
e02de2068a
Enable configuring the CA Certificate for UAA
...
Enable configuring the path of root cert of UAA in harbor.cfg. It only
takes effects if the verify_cert is set to "true" If the file does not
exist, the configuration is skipped.
The intention for this commit is to support integration with nested UAA
in PAS or PKS, we don't expect user to manually configure this value,
though he can do it if he wants.
2018-01-03 16:21:29 +08:00
Deng, Qian
a89678466e
Enhancement of Metadata Descrition
2018-01-03 16:12:17 +08:00
Fuhui Peng (c)
31c3063783
Merge remote-tracking branch 'upstream/replication_enhancement' into repEnhance
2018-01-03 13:41:31 +08:00
Wenkai Yin
ce8a102af1
Merge pull request #3898 from ywk253100/180103_merge
...
Sync with master branch
2018-01-03 11:55:45 +08:00
yixingjia
5340fed110
Merge pull request #3848 from yixingjia/ClairHA
...
Enable Clair in HA
2018-01-03 11:45:44 +08:00
Wenkai Yin
96a63c56b1
Merge remote-tracking branch 'upstream/master' into 180103_merge
2018-01-03 10:32:03 +08:00
pengpengshui
c5e434bd14
Merge pull request #3859 from pengpengshui/batch-delection
...
Add batch-delete operation in project module, replication module and user module
2018-01-03 10:27:55 +08:00
Fuhui Peng (c)
d7c0bc5168
Add batch delection operation in project module, replication module and user module
...
Modify privilege about project module
Modify package version about harbor-ui
Fix case failed in new batch delection UI
2018-01-02 19:42:44 +08:00
Daniel Jiang
cb468bce46
Merge pull request #3863 from stonezdj/ldap_add_member_test
...
Add ldap user to project member test
2018-01-02 14:38:48 +08:00
Daniel Jiang
5289ff8d5a
Merge pull request #3888 from stonezdj/ldap_security2
...
Do not display internal error message to user
2017-12-29 16:49:53 +08:00
Qian Deng
7a0dbafad6
Merge pull request #3890 from ninjadq/uaa_ui
...
Add UI Component for UAA Auth
2017-12-29 15:25:47 +08:00
Deng, Qian
ef045bb720
Add UI Component for UAA Auth
2017-12-29 12:02:13 +08:00
Daniel Jiang
3199668443
Merge pull request #3889 from reasonerjt/uaa-config-api
...
return UAA settings in configuration API
2017-12-28 12:35:57 +08:00
Tan Jiang
cae581979b
Return UAA settings in configuration API
...
All the UAA settings will be read only as we expect user to modify it
via opsman instead of Harbor UI.
2017-12-28 11:30:18 +08:00
stonezdj
fba68ed000
Do not display internal error message to user
2017-12-27 19:22:17 +08:00
stonezdj
b7670a39b3
Add ldap user to project member test
2017-12-27 16:44:40 +08:00
Wenkai Yin
4616153667
Merge pull request #3885 from ywk253100/171227_fix_update
...
Update project ID property if needed when updating replication policy
2017-12-27 15:45:53 +08:00
Wenkai Yin
da65d46e76
Merge pull request #3882 from ywk253100/171226_fix
...
Using the string trimmed the project name at the begining as the input of repository filter
2017-12-27 15:45:21 +08:00
stone
944fd1d97a
Merge pull request #3884 from stonezdj/ldapverifycert_config
...
Add configure parameter ldap_verify_cert to harbor.cfg
2017-12-27 15:42:20 +08:00
Wenkai Yin
a9d7403bee
Update project ID property if needed when updating replication policy
2017-12-27 15:04:26 +08:00
stonezdj
b065f19f51
Add configure parameter ldap_verify_cert to harbor.cfg
2017-12-27 10:21:58 +08:00
Wenkai Yin
d36811ce52
Using the string trimmed the project name at the begining as the input of repository filter
2017-12-26 19:31:53 +08:00
stonezdj
35716dedd3
Sync user email in ldap #3663
2017-12-26 18:53:32 +08:00
Daniel Jiang
923a1457e5
Merge pull request #3872 from stonezdj/ldap_security
...
Call EscapeFilter for filter to avoid security issue
2017-12-26 17:04:20 +08:00
Wenkai Yin
95339d5488
Merge pull request #3871 from ywk253100/171225_policy_rbac
...
Assign read-only privilege of replication policy to project admin and add stopping replication jobs API.
2017-12-26 15:54:42 +08:00
stonezdj
9f99d0400c
Call EscapeFilter for filter to avoid security issue
2017-12-26 15:34:14 +08:00
Fuhui Peng (c)
fb83f2433f
Modify replication list datagrid
2017-12-26 14:54:59 +08:00
Fuhui Peng (c)
601c94d976
Merge remote-tracking branch 'upstream/replication_enhancement' into repEnhance
...
Update ui code to the latest
2017-12-26 14:06:55 +08:00
stone
027fa72df7
Merge pull request #3681 from stonezdj/ova_install_doc
...
Add harbor ova install guide
2017-12-26 13:47:58 +08:00
stonezdj
110ff691ca
Add harbor ova install guide
2017-12-26 12:49:37 +08:00
Daniel Jiang
94c78b3bee
Merge pull request #3858 from xuri/master
...
Simple code and typo fixed.
2017-12-26 12:06:27 +08:00
Daniel Jiang
1c2d5e8036
Merge pull request #3638 from CMUH/k8s/bump-to-newer-resource
...
Bump many resources type to newer ones of Kubernetes
2017-12-26 11:44:29 +08:00
Daniel Jiang
8e53ca07c4
Merge pull request #3850 from reasonerjt/uaa-search
...
Search UAA when adding member to a project.
2017-12-26 09:51:50 +08:00
Tan Jiang
da20e4f11c
Search UAA when adding member to a project.
...
1)Enable UAA client to search UAA by calling '/Users' API.
2)Implement 'SearchUser' in UAA auth helper, register it to auth
package.
2017-12-26 00:25:32 +08:00