Commit Graph

289 Commits

Author SHA1 Message Date
Fangyuan Cheng
a2051354c6
Merge pull request #7232 from pureshine/cron-validator
Add cron regular expression
2019-03-29 10:23:40 +08:00
FangyuanCheng
5dd200fa00 cron validator
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-03-28 13:25:25 +08:00
Fangyuan Cheng
2787306d47
Merge pull request #7076 from cd1989/update-api-basepath
Use baseURL from config
2019-03-28 09:40:23 +08:00
Wenkai Yin
c0faa9d4aa
Merge pull request #7227 from zhoumeina/replication_ng
add filter logic
2019-03-28 08:43:43 +08:00
Wenkai Yin
017bba8dc1 Merge remote-tracking branch 'upstream/master' into 190327_sync 2019-03-27 11:43:51 +08:00
Meina Zhou
d9bff2f269 add filter logic
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-03-26 17:09:23 +08:00
Mia ZHOU
542c460e3d
Merge pull request #7214 from jwangyangls/fixHelmChartIssue
moveHelmChartIssue
2019-03-26 10:25:37 +08:00
Meina Zhou
2df11a773e add trigger logic and remove project code
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-03-25 14:19:47 +08:00
Yogi_Wang
309696b575 movoHelmChartIssue
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-03-25 11:11:10 +08:00
Meina Zhou
b0ce3da8bd remove the project related code
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-03-25 10:20:55 +08:00
FangyuanCheng
dada47c07e Refactoring vulnerability ui support cron
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-03-23 20:58:45 +08:00
Mia ZHOU
05e0289f84
Merge pull request #7200 from jwangyangls/movoHelmChartAndOptimizationUserPermission
moveHelmChart
2019-03-22 16:48:21 +08:00
Wenkai Yin
49cf50adb1 Merge remote-tracking branch 'upstream/master' into 190324_sync
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-03-22 15:55:52 +08:00
Yogi_Wang
3f9fd7010a movoHelmChart
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-03-22 15:52:13 +08:00
FangyuanCheng
7b7cc5c0a3 fix bug
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-03-21 16:14:09 +08:00
Meina Zhou
80b8440564 fix unit test
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-03-21 14:58:47 +08:00
Meina Zhou
130e132f86 Merge branch 'master' into replication_ng
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-03-21 14:16:33 +08:00
Meina Zhou
90c28198eb add validation message
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-03-21 12:24:35 +08:00
Mia ZHOU
204c139dbd
Merge pull request #7166 from ninjadq/oracle_ldap_support
Add membership item in LDAP config
2019-03-21 08:35:42 +08:00
FangyuanCheng
03c9bf8ceb new endpoint
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-03-20 14:52:40 +08:00
Meina Zhou
242406ce47 modify create replication rule
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-03-20 13:51:47 +08:00
FangyuanCheng
839f68f5fc replication-ng
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-03-20 10:53:27 +08:00
Yogi_Wang
c84d55f1f8 fix 6951 user permission is project Admin the user list donot show when user input
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-03-19 13:42:36 +08:00
Qian Deng
ea6989847f Add membership item in LDAP config
Add a item ldap_membership to LDAP config

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-03-19 10:45:43 +08:00
jwangyangls
7ae7f9f23f
Merge pull request #7135 from jwangyangls/PromiseToObservable
change promise to observable
2019-03-18 13:11:04 +08:00
Yogi_Wang
b16711f4f7 change promise to observable
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-03-18 12:32:57 +08:00
wang yan
73d68903d6 update robot account return attribute
Signed-off-by: wang yan <wangyan@vmware.com>
2019-03-14 13:57:50 +08:00
FangyuanCheng
e32a34048a Fix returning internal error when setting cron for gc
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-03-11 15:43:46 +08:00
jwangyangls
fc0654f028
Merge pull request #7088 from jwangyangls/proxyAuthenticator
add http auth proxy selection in system configuration
2019-03-07 17:26:59 +08:00
Yogi_Wang
e281b6523e add http auth proxy selection in system configuration
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-03-07 16:52:17 +08:00
FangyuanCheng
0d242fc0ba Refactoring gc ui support cron
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-03-07 13:31:09 +08:00
Qian Deng
b68f09cf41 Fix: global search not work when chart enabled
Global search result data does not contain the chart info when chart is empty

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-03-06 10:37:41 +08:00
cd1989
b851c3476a Use baseURL from config
Signed-off-by: cd1989 <chende@caicloud.io>
2019-03-05 14:30:06 +08:00
Mia ZHOU
76a07eb5fe
Merge pull request #7059 from ninjadq/fix_global_search_issue
Fix global search issue
2019-03-05 08:41:30 +08:00
Mia ZHOU
ccf6280365
Merge pull request #7066 from ninjadq/fix_charts_count_displayed_when_disable
Fix: Should not display helm chart counts if it's not enabled
2019-03-05 08:40:23 +08:00
Qian Deng
4ba012ab8e Fix: global search not work issue
Both Frontend and Backend should not send chart data when chartmusuem not enabled

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-03-04 17:44:34 +08:00
Qian Deng
b6fea75099 Fix: Should not display helm chart counts if it's not enabled
Should not display the counts of chart if it's not enabled

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-03-04 17:36:27 +08:00
Mia ZHOU
685e590514
Merge pull request #7062 from jwangyangls/userListPermission
fix get users list about permission issue
2019-03-04 16:46:09 +08:00
Yogi_Wang
1e17036b04 fix get user list about permission issue
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-03-04 14:59:06 +08:00
Fangyuan Cheng
f79895b6d8
Merge pull request #7034 from pureshine/robot-expiration
Implement Robot account expiration
2019-03-01 10:04:26 +08:00
jwangyangls
b3c4d1688d
Merge pull request #7011 from jwangyangls/fix_6950
fix 6950 about the default option is not displayed When we click the add-member button, the default option is not displayed.
2019-02-28 14:07:07 +08:00
FangyuanCheng
a2cd2e50fc Implement Robot account expiration
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-02-27 14:16:07 +08:00
Yogi_Wang
11d7989ee3 fix_6950
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-02-25 12:36:03 +08:00
zhoulin xie
b2ed619e1e Fix some misspells in code
Signed-off-by: zhoulin xie <zhoulin.xie@daocloud.io>
2019-02-24 01:43:53 +08:00
Yogi_Wang
60aecf2a1a fix_skipped_tests
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-02-19 09:43:23 +08:00
Yogi_Wang
4ee5ebe442 skipped_tests_fix
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-02-15 16:52:34 +08:00
jwangyangls
d28b8355ef
Merge pull request #6930 from jwangyangls/issue-6923
fix issue 2923
2019-02-15 15:53:51 +08:00
jwangyangls
0891300d21
Merge pull request #6927 from jwangyangls/harbor_style_change
change_style and datagrid refresh interface change
2019-02-15 15:04:52 +08:00
Yogi_Wang
a9db2ab943 fix issue 2923
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-02-15 10:23:53 +08:00
Yogi_Wang
651a142429 change_style_unitTest
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-02-14 16:38:05 +08:00
Meina Zhou
0d239cb1cb move gc to lib and add in registry config
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-02-14 13:45:15 +08:00
Yogi_Wang
06eaa304da fixed_ciIssue
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-02-14 10:21:18 +08:00
Fangyuan Cheng
6d782e0fe4
Merge pull request #6902 from pureshine/cert-link
Download the certificate link by default on ui
2019-02-13 21:24:12 +08:00
Fangyuan Cheng
04c76d7f09 Modify the ui name and token that cannot be displayed due to backend api changes (#6914)
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-02-13 18:57:49 +08:00
FangyuanCheng
54f74ff91d Download the certificate link by default on ui
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-02-13 15:16:45 +08:00
Yogi_Wang
1b80e79ec4 fixPermissionIssue
Signed-off-by: Yogi_Wang <wang1084@126.com>
2019-02-01 20:48:38 +08:00
System Administrator
1a551690d3 promission reset
Signed-off-by: Yogi_Wang <wang1084@126.com>
2019-01-31 18:06:49 +08:00
FangyuanCheng
dacc0bd6bc Fixed display problems caused by formatting
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-01-30 10:29:49 +08:00
FangyuanCheng
404ee307f3 Support Robot account in Harbor
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-01-29 15:49:15 +08:00
Mia ZHOU
f202e5f738
Merge pull request #6827 from pureshine/tag-col
The tag column sets the Maximum  width
2019-01-29 11:09:56 +08:00
FangyuanCheng
fe5820efee The tag column sets the minimum width
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-01-27 23:47:41 +08:00
Yogi_Wang
ebda1cda22 style_change
Signed-off-by: Yogi_Wang <wang1084@126.com>
2019-01-25 13:36:48 +08:00
Qian Deng
276202cfa9 Fix issue data not reload when global serach going to a location that has the same url
Just add a reload option on router module. This feature is introduced in angular5, we can solve this issue easily.

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-01-18 13:34:32 +08:00
System Administrator
27c180bf20 fix_bug
Signed-off-by: Yogi_Wang <wang1084@126.com>
2019-01-11 11:00:46 +08:00
Mia ZHOU
45685b49d6
Merge pull request #6708 from zhoumeina/cherry_pick_disable_retag
disable retag function if with admiral
2019-01-08 15:04:10 +08:00
Meina Zhou
b7153798b5 disable retag function if with admiral
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-01-08 13:49:54 +08:00
Yogi_Wang
10d74eabd7 upgrade clarity components to 1.0 and fix issue
Signed-off-by: Yogi_Wang <Yogiwang@Yogi-WangdeMacBook-Pro.local>
2019-01-08 12:50:26 +08:00
Fangyuan Cheng
5967537daa
Merge pull request #6609 from pureshine/devcenter-btn
Modify the location to open the Developer Center
2019-01-04 11:24:02 +08:00
FangyuanCheng
7a22f895ab Modify the location to open the Developer Center
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-01-03 14:57:26 +08:00
Yogi_Wang
aee07fff96 upgrade clarity components to 1.0
Signed-off-by: Yogi_Wang <Yogiwang@Yogi-WangdeMacBook-Pro.local>
2019-01-03 10:32:52 +08:00
Mia ZHOU
4f291e34eb
Merge pull request #6630 from pureshine/refactor-config
Config component nav tabs to use clarity component
2018-12-26 12:18:54 +08:00
Fangyuan Cheng
1456d1d326
Merge pull request #6628 from zhoumeina/add_swagger_title
add harbor swagger title for api explorer
2018-12-26 10:37:57 +08:00
Meina Zhou
92539a4bec add harbor swagger title for api explorer
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-12-26 09:41:54 +08:00
FangyuanCheng
4ad66b6d9b Config component nav tabs to use clarity component
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-25 18:36:18 +08:00
FangyuanCheng
a4e17ec183 When harbor is deployed in http mode, the registry certificate download button is not displayed in the project page.
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-25 14:31:29 +08:00
FangyuanCheng
256289810d Fix download certificate link bug
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-24 00:06:04 +08:00
He Weiwei
f403e50234
Merge pull request #6577 from heww/master
Include os version in image tag detail page
2018-12-20 18:18:44 +08:00
Qian Deng
c4ecd4e0f6 Fix i18n switch issue (#6579)
This issue is caused by error formated json file

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-12-20 15:52:59 +08:00
He Weiwei
e7f09643bd Include os version in image tag detail page
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2018-12-20 15:12:19 +08:00
Qian Deng
1430a24b55 Update i18n files of project_detail
Add `helmchart` item in `project_detail` entry

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-12-20 10:09:26 +08:00
Meina Zhou
66c1beb467 fix retag project list can not select
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-12-19 14:39:49 +08:00
Mia ZHOU
ac47500eb6
Merge pull request #6552 from pureshine/inline-css
Move inline css style to scss
2018-12-19 13:40:16 +08:00
Meina Zhou
a3e357bb7f show retag tooltip use regex, reset the dialog form when retagged
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-12-19 13:07:46 +08:00
Fangyuan Cheng
bb15f67316
Merge branch 'master' into inline-css 2018-12-19 10:07:21 +08:00
FangyuanCheng
c36e9daea1 Move inline css style to scss
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-18 21:19:08 +08:00
Meina Zhou
d45ccbbb29 add developer center in swagger ui way
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-12-13 15:17:38 +08:00
Fangyuan Cheng
7f4dac2101
Merge pull request #6497 from pureshine/error-message
Modify the error message when deleting a signed images in harbor-helm
2018-12-11 11:29:47 +08:00
Mia ZHOU
e9a34224e4
Merge pull request #6499 from cd1989/retag-button-for-guest
Enable retag button to project guest
2018-12-11 10:55:50 +08:00
Mia ZHOU
53858fe2f1
Merge pull request #6482 from pureshine/default-version
Return unknow when about dialog cannot get harbor version
2018-12-11 10:30:40 +08:00
Mia ZHOU
4fc0716005
Merge pull request #6500 from pureshine/svg-format
Change the image in png format to the image in svg format
2018-12-11 10:24:04 +08:00
cd1989
fdddb37545 Enable retag button to project guest
Signed-off-by: cd1989 <chende@caicloud.io>
2018-12-10 15:46:48 +08:00
FangyuanCheng
892a76c27e Modify the error message when deleting a signed images in harbor-helm
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-10 14:39:04 +08:00
FangyuanCheng
cce22d569d Return unknow when about dialog cannot get harbor version
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-10 13:20:20 +08:00
FangyuanCheng
13686cbe83 Change the image in png format to the image in svg format
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-07 13:54:13 +08:00
Meina Zhou
073cacd9b3 fix helm chart did not get global label
The root cause is helm chart does not get glboal labels

Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-12-07 12:33:25 +08:00
FangyuanCheng
158fb92745 Remove the border of default label when filtering images by label
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-06 15:35:42 +08:00
Mia ZHOU
657ee8a150
Merge pull request #6469 from zhoumeina/fix_scan_log_viewer
fix #6432 modify scan log to use popup window
2018-12-06 15:11:03 +08:00
Meina Zhou
791646b8b0 fix #6432 modify scan log to use popup window
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-12-06 14:24:24 +08:00
Mia ZHOU
9100dfdb5f
Merge pull request #6468 from zhoumeina/fix_500_gc
#6440 fix gc will have 500 error when user try to put a new schedule
2018-12-06 14:22:43 +08:00
Mia ZHOU
eeb6d4a9b9
Merge pull request #6456 from pureshine/add-user
Modify the error message when adding members
2018-12-06 12:53:44 +08:00