Commit Graph

6549 Commits

Author SHA1 Message Date
jwangyangls
a58fb7086d
Merge pull request #7651 from jwangyangls/updateLibPackage
Update lib/package.json
2019-05-07 10:46:42 +08:00
jwangyangls
42e3a506d9
Merge pull request #7653 from jwangyangls/fix_auth_mode_click_error
Modify auth mode icon to jump to a new page only in OIDC mode
2019-05-07 10:42:48 +08:00
stonezdj(Daojun Zhang)
86bfd7a733 fix issue7637: /api/systeminfo cannot return 500 when DB is down (#7650)
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-05-07 10:36:10 +08:00
Fangyuan Cheng
0988a38e84
Merge pull request #7641 from pureshine/cron-validator
Remove the frontend check of cron
2019-05-06 20:52:00 +08:00
Yogi_Wang
783b6e3aea Modify auth mode icon to jump to a new page only in OIDC mode
for 7622: click the icon of auth mode when value is database in configuration page will go to a wrong pagee

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-06 19:20:33 +08:00
Yogi_Wang
af24cbfa57 Update lib/package.json,update part of dependencies in app/package.json
1.from 6.xxx to 7.xxx
2.update part of dependencies in app/package.json that it eliminate warning when npm install
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-06 18:30:28 +08:00
Qian Deng
210081604c
Merge pull request #7648 from reasonerjt/rm-index-controller
Remove IndexController
2019-05-06 18:29:14 +08:00
danfengliu
9019864446
In API test, there is a dead loop in checking GC status, it's fixed in this PR and add log inmformation in the loop. (#7643)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-05-06 17:24:33 +08:00
FangyuanCheng
10d96f6a2b Remove validator
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-05-06 17:14:42 +08:00
Daniel Jiang
45210f7c40 Fix condition for OIDC security filter (#7645)
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-05-06 16:30:09 +08:00
Fangyuan Cheng
26799fc7f4
Merge pull request #7646 from pureshine/fix-replicate-bug
Fix failed to get filter data when switching replication mode
2019-05-06 16:18:46 +08:00
jwangyangls
c22e8008f0
Merge pull request #7618 from jwangyangls/fix_slide_failure_handling
Change request mode specified as API acquisition
2019-05-06 16:06:22 +08:00
Wenkai Yin
e48a148485
Merge pull request #7642 from reasonerjt/root-ca-flag
Disable CA download when hosted via HTTP
2019-05-06 14:55:13 +08:00
Yogi_Wang
a6e1ff33be Change request mode specified as API acquisition
change request mode specified as API acquisition.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-06 14:17:29 +08:00
Daniel Jiang
28871b78ae Remove IndexController
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-05-06 14:04:06 +08:00
FangyuanCheng
0653ab6216 Fix failed to get filter data when switching replication mode
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-05-06 13:22:43 +08:00
danfengliu
e08c2e757e This API test script was blocked by a swagger error, now this error was fixed, so robot account script can be finished now. In swagger.yaml, robot account can be updated in "disbled" status, it's added into script. (#7636)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-05-06 11:34:11 +08:00
Daniel Jiang
6c3df3c8ce Disable CA download when hosted via HTTP
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-05-06 11:14:39 +08:00
Steven Zou
24b1f81575
Append new core maintainer MM 2019-05-05 16:37:00 +08:00
Wang Yan
a1ad6374ae
add install cert for registry contoller (#7633)
Mount the ca bunlder into registry controller, and add them into os
trust store that resolves the problem of garabe collection on ca
enabled registry.

Signed-off-by: wang yan <wangyan@vmware.com>
2019-05-05 15:24:52 +08:00
Steven Zou
b0a287ee9a
Update maintainer list
Update maintainer list to reflect the latest changes
2019-05-05 10:18:17 +08:00
Mia ZHOU
f85870511d
Merge pull request #7599 from pureshine/hide-endtime
Display '-' if the end_time does not exist
2019-04-30 14:28:27 +08:00
FangyuanCheng
1b930ad149 Display - if the end_time does not exist
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-30 13:39:17 +08:00
Fangyuan Cheng
0979e56ae5
Merge pull request #7596 from pureshine/add-cron-tip
Add tooltip for cron string
2019-04-30 12:33:00 +08:00
jwangyangls
17b38e395a
Merge pull request #7606 from jwangyangls/fix_delete_repository_and_oidc_add_tooltip
Add OIDC Redirect url and fix delete repository bug and fix operation refresh bug
2019-04-30 12:19:15 +08:00
FangyuanCheng
73e6b8cf56 Add tooltip for cron string
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-30 11:42:55 +08:00
Wenkai Yin
12d58370ad
Merge pull request #7503 from ywk253100/190424_stop_execution
Check the task status of execution whose status is running when deleting the policy
2019-04-30 11:28:49 +08:00
Yogi_Wang
289f2230d7 Add OIDC Redirect url on configration and fix delete repository bug and fix operation refresh bug
1. add OIDC Redirect url on configration.
2. fix delete repository bug.
3. fix operation refresh bug when user Appears when the refresh button is clicked on replicate.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-30 11:06:31 +08:00
Qian Deng
fdd8ba7b83
Merge pull request #7600 from reasonerjt/fix-harbor-yml-typo
Fix typo in harbor.yml
2019-04-30 11:00:58 +08:00
Wenkai Yin
e64a71d809
Merge pull request #7594 from wy65701436/fix-gc-log
Fix get log issue of Periodic job
2019-04-30 10:19:17 +08:00
Daniel Jiang
b5f2f71394 Fix typo in harbor.yml
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-04-29 18:51:00 +08:00
Daniel Jiang
2ca5e04904
Merge pull request #7053 from JoeWrightss/patch-2
Fix some misspells in file
2019-04-29 18:40:00 +08:00
He Weiwei
37a4f1c982 Remove push+pull action (#7571)
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-04-29 15:37:10 +08:00
Qian Deng
c06c3fd08d Fix cannot load external configs of database (#7591)
Fix that when loading external db config wrong varible used

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-04-29 15:34:12 +08:00
wang yan
02c7cbeec2 Fix get log issue of Periodic job
Use the latest error or success execution as the periodic job log

Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-29 15:30:05 +08:00
Wenkai Yin
7e4c227318 Check the task status of execution whose status is running when deleting the policy
Check the task status of execution whose status is running when deleting the policy

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-29 15:04:41 +08:00
Steven Zou
e07e25eeef
Merge pull request #7522 from ywk253100/190426_start_replication
Return immediately after creating the execution record when starting the replication
2019-04-29 15:01:52 +08:00
Daniel Jiang
56c7d55c73
Merge pull request #7593 from reasonerjt/ext-url-systeminfo
Add Ext URL to response of systeminfo API
2019-04-29 14:51:40 +08:00
Wenkai Yin
c53d73775a
Merge pull request #7590 from reasonerjt/oidc-wrong-secret-err
Return more details for error in exchange token
2019-04-29 14:22:37 +08:00
Wenkai Yin
da338806fa
Merge pull request #7583 from ywk253100/190428_replication
Don't fail the process when one tag replication failed
2019-04-29 14:16:07 +08:00
Fangyuan Cheng
cceb624fc2
Merge pull request #7555 from pureshine/loading-filter
Add loading if the fileter is not loaded when creating the replication rule
2019-04-29 13:34:56 +08:00
Daniel Jiang
02cf75c142 Add Ext URL to response of systeminfo API
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-04-29 13:31:52 +08:00
FangyuanCheng
ab461abe64 Add loading if the fileter is not loaded when creating the replication rule\
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-29 12:44:31 +08:00
Fangyuan Cheng
6cc00a1178
Merge pull request #7546 from pureshine/fix-vulnerability
Fix vulnerability doesn't call systeminfo api by default
2019-04-29 12:03:50 +08:00
Fangyuan Cheng
41e0c5e31a
Merge branch 'master' into fix-vulnerability 2019-04-29 11:32:05 +08:00
Wenkai Yin
c9c2db7c13 Don't fail the process when one tag replication failed
Don't fail the process when one tag replication failed

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-29 10:24:03 +08:00
Mia ZHOU
87180000d2
Merge pull request #7559 from pureshine/add-loading
Add loading to the vulnerability page and the gc page
2019-04-29 09:32:01 +08:00
Fangyuan Cheng
12737bfa7b
Merge branch 'master' into add-loading 2019-04-28 22:23:38 +08:00
FangyuanCheng
1979f3b362 Add loading to the vulnerability page and the gc page
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-28 22:22:28 +08:00
Steven Zou
c9f2bf36eb
Merge pull request #7580 from wy65701436/remove-workaround-500
Remove the workaround for checking chart existence
2019-04-28 21:09:59 +08:00