Commit Graph

4258 Commits

Author SHA1 Message Date
Wenkai Yin
785fc57147
Merge pull request #4097 from ywk253100/180122_config_api
Convert struct to json string when storing it to database as a configuration item
2018-01-23 11:03:44 +08:00
Daniel Jiang
e2d7150413
Merge pull request #4092 from wy65701436/change-build-num
[Upload Build]Change harbor build number to drone number plus git commit
2018-01-23 00:21:45 +08:00
Jesse Hu
8fe8c2b4ac Add a space after ':' when generating registry storage yaml config
yaml requires 1 or more spaces between the key and value. This patch
is useful in case the user inputs 'key:value' instead of 'key: value'.
2018-01-22 20:14:33 +08:00
Wenkai Yin
0165fcc82b Convert struct to json string when storing it to database as a configuration item 2018-01-22 20:01:28 +08:00
wangyan
bb10e018a5 Change harbor build number to drone number plus git commit 2018-01-22 02:13:42 -08:00
Qian Deng
bdb9d13590
Merge pull request #4072 from ninjadq/bugx_fix
Bugs fix
2018-01-22 17:56:02 +08:00
Daniel Jiang
d18517c910
Merge pull request #4042 from stonezdj/ldap_doc_3962
Document update for LDAP/OVA
2018-01-22 15:45:37 +08:00
Daniel Jiang
dd546a222d
Merge pull request #4078 from reasonerjt/lock-testify
[WIP]Update testify in vendor folder to v1.2.0
2018-01-22 10:58:30 +08:00
Daniel Jiang
de144d7974
Merge pull request #4079 from reasonerjt/fix-license
Revise license file
2018-01-22 10:43:01 +08:00
Tan Jiang
89ecabd156 Revise license file
Fixes #4026
2018-01-21 22:45:45 +08:00
Tan Jiang
7ab1a2367a Update testify in vendor folder to v1.2.0 2018-01-21 21:52:46 +08:00
Fuhui Peng (c)
7d7620593d Modify create multiple replication rules with same name 2018-01-19 17:44:21 +08:00
Deng, Qian
e240290bc7 Merge branch 'master' into bugx_fix 2018-01-19 15:43:14 +08:00
Wenkai Yin
eb7c0d19ad Update replication part in user guide 2018-01-19 15:41:59 +08:00
Qian Deng
71baf937ea
Merge pull request #4057 from ninjadq/enhance_uaa_config
Fix UAA edit password bug
2018-01-19 15:34:43 +08:00
Wenkai Yin
515cac010a
Merge pull request #4071 from ywk253100/180117_policy_pagination
Add pagination support in listing replication policy API
2018-01-19 15:19:45 +08:00
Daniel Jiang
b83df87b79
Merge pull request #4074 from stonezdj/ldap_4073
Fix bug 4073
2018-01-19 13:52:19 +08:00
stonezdj
b99a13cfa8 Fix bug 4073 2018-01-19 11:46:24 +08:00
Deng, Qian
86454d3e88 Fix project Name length issue
Extend the length of project name to 255
2018-01-18 18:51:16 +08:00
Wenkai Yin
69fa18c881
Merge pull request #4059 from ywk253100/180117_job_status
Support multiple status in query string of replication job listing API
2018-01-18 18:05:08 +08:00
Deng, Qian
873d537b17 Fix bug pull command not display regisrty ip or hostname 2018-01-18 17:58:17 +08:00
Deng, Qian
ea6fcd2aa1 Fix UAA edit password bug
Fix UAA edit password bug
Fix password edit bug
Remove unused code
Fix some tslint issue
2018-01-18 16:23:49 +08:00
pengpengshui
db8511bd0b
Merge pull request #4045 from pengpengshui/batchDelection
Add add endpoint button in replication rule
2018-01-18 16:18:54 +08:00
Wenkai Yin
611709a7be Add pagination support in listing replication policy API 2018-01-18 15:54:12 +08:00
Fuhui Peng (c)
5b921d59aa Modify package.json 2018-01-18 15:08:45 +08:00
Fuhui Peng (c)
29e53817b9 Merge remote-tracking branch 'upstream/master' into batchDelection 2018-01-18 14:59:32 +08:00
Qian Deng
8f855ffc4e
Merge pull request #4037 from ninjadq/admin_rename_ui
add admin rename ui
2018-01-18 14:53:17 +08:00
Daniel Jiang
440f5e6364
Merge pull request #4039 from stonezdj/ldap_migrate_scope
Add update ldapScope for migrate
2018-01-18 14:12:06 +08:00
stone
c815dc01dd
Merge pull request #4043 from reasonerjt/uaa-bugfix
Read Email from UAA while onboarding user.
2018-01-18 14:04:35 +08:00
Deng, Qian
b884be3e72 Add admin rename ui Add UI Element for rename admin 2018-01-18 13:49:13 +08:00
Qian Deng
b61e0ec867
Merge pull request #3953 from ninjadq/fix_text_bugs
Fix bugs about i18n & text
2018-01-18 13:19:02 +08:00
Qian Deng
a34512f072
Merge pull request #4022 from ninjadq/update_package_js
Update package.js file
2018-01-18 13:17:10 +08:00
pfh
757a99bc6e Add add endpoint button in replication rule
Modify stop job button privilege

Modify dispay issue about replication rule
2018-01-17 19:46:07 +08:00
yixingjia
208cb02d5c
Merge pull request #4054 from yixingjia/HA_Monitor
Keepalived real server check script
2018-01-17 19:03:14 +08:00
Deng, Qian
ac34c2c1da Fix bugs about i18n & text 2018-01-17 17:24:07 +08:00
Wenkai Yin
9ec8b4d634 Support multiple status in query string of replication job listing API 2018-01-17 17:07:10 +08:00
yixingj
ffa69bb256 Enhance monitor script for HA
Add keepalived real server check script
2018-01-17 14:23:26 +08:00
stonezdj
01ba4e1ea8 Add update ldapScope for migrate 2018-01-17 14:01:57 +08:00
Wenkai Yin
45894de89a
Merge pull request #4038 from ywk253100/180116_bug_fix
Fix bug: checking whether the status is null when listing replication jobs
2018-01-17 12:06:22 +08:00
stonezdj
72180e4d44 Document update for LDAP/OVA 2018-01-17 11:27:09 +08:00
Tan Jiang
d5d913f51d Read Email from UAA while onboarding user.
Will call the userinfo API of UAA to get user info and generage user
model based on the response.  Also this commit include a change that
whenever the UAA Client is to be used it will update the configuraiton,
this is needed as we enable user to update the configuration of UAA via
UI.
2018-01-17 10:28:49 +08:00
Daniel Jiang
7195865226
Merge pull request #4018 from wy65701436/refine-build-process
[Upload Build] Refine CI build process and storage structure
2018-01-17 10:21:14 +08:00
Deng, Qian
289946ccb4 Update package.js
Using fixed version number to reduce the npm log in travis
2018-01-16 19:40:31 +08:00
Wenkai Yin
7ebcc82516 Fix bug: checking whether the status is null when listing replication jobs 2018-01-16 19:25:18 +08:00
Wenkai Yin
8cda2d8d65
Merge pull request #4036 from ywk253100/180116_s3
Propagate registry storage driver name to adminserver and return it in /api/systeminfo
2018-01-16 18:41:08 +08:00
wangyan
c4a66bf3c0 Refine CI build process and storage structure 2018-01-16 02:20:55 -08:00
pengpengshui
7537d0ff10
Merge pull request #4010 from pengpengshui/batchDelection
Modify replication list to batch delection mode
2018-01-16 17:59:20 +08:00
Daniel Jiang
1595200d05
Merge pull request #4028 from jessehu/reload_config
[Issue 4015] Read reload_config option from harbor.cfg
2018-01-16 17:35:04 +08:00
Qian Deng
5017670d00
Merge pull request #4005 from ninjadq/db_migrate_from_1_3_to_1_4
Update migration tool for v1.4
2018-01-16 17:04:54 +08:00
Wenkai Yin
53d5a2256a Propagate registry storage driver name to adminserver and return it in /api/systeminfo 2018-01-16 16:57:28 +08:00