Commit Graph

6151 Commits

Author SHA1 Message Date
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
Mia ZHOU
2850a869ab
Merge pull request #6574 from ninjadq/add_i18n_item_in_project_detail
Update i18n files of project_detail
2018-12-20 10:55:53 +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
Fangyuan Cheng
ebf12fc31b
Merge pull request #6567 from pureshine/modify-version
Modify the developer center version number to 1.7.0
2018-12-19 18:31:56 +08:00
FangyuanCheng
eb6e3504d8 Modify the developer center version number to 1.7.0
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-19 17:18:54 +08:00
Mia ZHOU
f21cce7cbf
Merge pull request #6564 from zhoumeina/fix_retag_ui
fix retag project list can not select
2018-12-19 15:24:27 +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
Mia ZHOU
2062c436d3
Merge pull request #6553 from zhoumeina/fix_retag_ui
show retag tooltip use regex, reset the dialog form when retagged
2018-12-19 13:32:07 +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
Steven Zou
007a37443e
Merge pull request #6495 from kofj/doc_for_build_history
update user_guide about the build history.
2018-12-19 10:58:07 +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
Frank Kung
aa1c1ce489 update user_guide about the build history.
Signed-off-by: Frank Kung <kfanjian@gmail.com>
2018-12-18 15:50:01 +08:00
Wenkai Yin
b28bca7af4
Merge pull request #6541 from salkin/proxy-transport
Add support for http proxy in transport
2018-12-18 15:46:29 +08:00
danfengliu
70016cc0eb
Change a small docker image to pull and make timeout value longer (#6543)
Signed-off-by: danfengliu <danfengl@vmware.com>
2018-12-18 10:21:03 +08:00
Niklas Wik
138bc69f0f Add support for http proxy in transport
Signed-off-by: Niklas Wik <niklas.wik@nokia.com>
2018-12-17 10:35:27 +02:00
Niklas Wik
86f4d11839 Update required docker as multi build with FROM as used which is introduced in Docker 17.05 (#6530)
Signed-off-by: Niklas Wik <niklas.wik@nokia.com>
2018-12-14 12:50:41 +08:00
Mia ZHOU
da0f1d2831
Merge pull request #6525 from zhoumeina/dev-center1
add developer center in swagger ui way
2018-12-13 16:27:55 +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
SDBrett
0e260d180c Added tests for failure conditions (#6501)
Added unit tests for registryctl auth to cover failure conditions to increase test coverage.
New tests cover no secret specified and incorrect harbor secret prefix

Signed-off-by: Brett Johnson <brett@sdbrett.com>
2018-12-13 11:35:17 +08:00
clouderati
3a38ff928e Updating CONTRIBUTING.md
Fixing merge conflict created in #6133.

Signed-off-by: clouderati <35942204+clouderati@users.noreply.github.com>
2018-12-12 17:02:37 +00:00
James Zabala
6ac0c4b882
Merge pull request #6416 from danfengliu/Modify-Test-Script-Project-Level-Policy-Content-Trust
Remove redundant functions
2018-12-12 11:19:35 -05:00
James Zabala
191d0b6c12
Merge pull request #6508 from cd1989/update-doc-for-dco
Add DCO description to CONTRIBUTING.md
2018-12-12 09:38:28 -05:00
Wenkai Yin
5ae7e60b73
Merge pull request #6519 from mweigel/master
Minor corrections to swagger spec
2018-12-12 17:27:31 +08:00
Mario Weigel
187fccae6f Minor corrections to swagger spec
Signed-off-by: Mario Weigel <mario.weigel@gmail.com>
2018-12-12 21:58:24 +13:00
stonezdj(Daojun Zhang)
13511d74ed Refactor config settings encrypt + metadata (#6387)
Signed-off-by: stonezdj <stonezdj@gmail.com>
2018-12-12 12:14:33 +08:00
Wenkai Yin
f7a28ee2a2 Remove the duplicate http error struct (#6516)
There are two different types to represent http error in the current code. This commit updates the codes to keep only one.

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2018-12-12 11:51:19 +08:00
Daniel Jiang
b954393109 Update OSL for 1.7.0 (#6509)
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2018-12-11 16:53:44 +08:00
cd1989
6d9fc4fec0 Add DCO description to CONTRIBUTING.md
Signed-off-by: cd1989 <chende@caicloud.io>
2018-12-11 14:29:17 +08:00
Wenkai Yin
5388eb4db6 Read ssl mode param from the adminserver to init the connection with database (#6504)
This commit adds the ssl mode as a param when establishing the connection with database

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2018-12-11 13:58:37 +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
Daniel Jiang
205e85b2b2
Merge pull request #6488 from wy65701436/fix-update-notary
Fix unable to use Notary after updating to v1.6.0
2018-12-09 02:26:18 -08:00
wang yan
7936d14abc fix per comments, add if not exists to create pqsql sequence
Signed-off-by: wang yan <wangyan@vmware.com>
2018-12-08 16:11:30 +08:00
wang yan
0517ecca7a Fix unable to use Notary after updating to v1.6.0
This commit is to fix the issue on notary migrations from mysql to pgsql.
1, alter sequence for the primary key of changeseed, this is missed in v1.6.0 migrator.
2, alter table owners from postgres to notarysigner and notaryserver.

Issue:
https://github.com/goharbor/harbor/issues/6465

Workaround:
https://github.com/goharbor/harbor/issues/6465#issuecomment-445162616

Impacted upgrade path:
1, Upgrade from version older then v1.6.0 with migrator:v1.6.0, and migrates the notarty DB.

No impacted upgrade path:
1, Upgrade from version older than v1.6.0 with migrator:v1.6.0, but without migrates the notarty DB.

Notes:
After merge this fix, we need to provide an new migrator with an new tag, like v1.6.1, and
deprecated the v1.6.0. For those who was impacted by migrator v1.6.0, will open an new PR to build
the workaround into the migrator and expose an specical command for hot-fix.

Signed-off-by: wang yan <wangyan@vmware.com>
2018-12-07 19:33:44 +08:00
Mia ZHOU
06eec7b3ed
Merge pull request #6479 from zhoumeina/fix_scan_log_nightly
quick fix for scan log
2018-12-07 14:39:29 +08:00
Mia ZHOU
0b476b859f
Merge pull request #6478 from zhoumeina/fix_chart_label
fix helm chart did not get global label
2018-12-07 14:37:16 +08:00
Steven Zou
60f0ec594d
Merge pull request #6437 from cd1989/update-retag-user-guide
Update user guide for retag function
2018-12-06 22:34:13 -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
Meina Zhou
7827f19671 quick fix for scan log
This is a quick fix

Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-12-07 12:29:15 +08:00
Wenkai Yin
c16a9d06f3
Merge pull request #6480 from wy65701436/fix-travis
Fix robot framework version to 3.0.4
2018-12-07 12:27:53 +08:00