Commit Graph

2422 Commits

Author SHA1 Message Date
kunw
cef202cb54 Merge latest codes. 2017-03-21 12:09:27 +08:00
kunw
5c3fd9fc43 Merge latest updates. 2017-03-21 11:51:12 +08:00
kun wang
c33df95c6f Merge pull request #1679 from wy65701436/dev
LGTM, thanks.
2017-03-21 10:53:34 +08:00
wy65701436
769ca125f9 rm js and mp files 2017-03-20 07:59:35 -07:00
Yan
038d7dd90c Dev new ui (#1)
* Updates for verfied tags deletion.

* Remove old UI.

* Move i18n folder.

* Updates for latest UI codes.

* make travis with latest dev code.

* update test code

* add cat log

* cat nginx

* cat nginx

* fix template error

* remove --with-notary

* remove controller test

* fix controller test bug

* modify controller test

* debug controller test

* update controller test

* update index title to harbor, discussed with Kun.

* Update package.json

* Merge latest UI changes.

* remove git
2017-03-20 18:51:20 +08:00
Steven Zou
800b9e34c3 Merge pull request #1674 from vmware/feature/merge_new_ui_code_to_fix_issues
update ui code for fixing bugs and upgrade Clarity version to 0.8.7
2017-03-20 16:44:22 +08:00
Steven Zou
a311ade53d update ui code for fixing bugs and upgrade Clarity version to 0.8.7 2017-03-20 16:33:14 +08:00
Daniel Jiang
29f3e609e7 Merge pull request #1667 from ywk253100/170317_mount_data
Mount directory data to adminserver phase 1
2017-03-20 14:45:52 +08:00
Wenkai Yin
a40994852f remove duplicate codes 2017-03-20 14:01:43 +08:00
Wenkai Yin
3a167ddfce mount data directory to adminserver 2017-03-20 13:41:02 +08:00
Daniel Jiang
eda9aa189e Merge pull request #1634 from reasonerjt/more-systeminfo
return ca root cert status in systeminfo
2017-03-20 10:41:24 +08:00
Yan
43578a2a6f Merge pull request #1656 from reasonerjt/dev
fix issue in location.conf
2017-03-17 20:03:47 +08:00
Tan Jiang
098d7d5765 fix issue in location.conf 2017-03-17 19:44:54 +08:00
Yan
92d9f8516f Merge pull request #1626 from ywk253100/170315_registry_upgrade
Upgrade registry to 2.6.0
2017-03-17 18:25:22 +08:00
Tan Jiang
5e229f7d96 systeminfo returns flag for ca root 2017-03-17 14:06:33 +08:00
Wenkai Yin
b5513d6281 create a variable to define the version of registry 2017-03-17 14:01:36 +08:00
Daniel Jiang
37ea4273e1 Merge pull request #1629 from reasonerjt/dev
fix #1570, #1628
2017-03-16 19:12:12 +08:00
Daniel Jiang
695c7041b8 Merge pull request #1630 from ywk253100/170316_fix_search_bug
Fix search bug
2017-03-16 16:58:35 +08:00
Yan
46f9d7b660 Merge pull request #1589 from sigsbee/dev
update test case
2017-03-16 16:53:48 +08:00
Wenkai Yin
20e764636b fix search bug 2017-03-16 16:26:04 +08:00
Wenkai Yin
bd0d935bca Merge pull request #1627 from ywk253100/170315_ping_email
Ping email server API enhancement
2017-03-16 16:13:43 +08:00
Tan Jiang
9d87279152 fix #1570, #1628 2017-03-16 16:09:05 +08:00
myufei
63e61f388b update test cases 2017-03-16 16:06:38 +08:00
Wenkai Yin
9d8366d89e Merge remote-tracking branch 'upstream/dev' into 170315_ping_email
Conflicts:
	src/ui/api/harborapi_test.go
2017-03-16 15:54:15 +08:00
Wenkai Yin
2333313205 Merge pull request #1623 from ywk253100/170313_reset_config
Support resetting config
2017-03-16 15:33:24 +08:00
Wenkai Yin
c5917eddf3 modify swagger 2017-03-16 15:19:47 +08:00
Wenkai Yin
ca15c0e093 update ut cases 2017-03-16 15:17:21 +08:00
myufei
c7b1198070 update test cases 2017-03-16 15:14:19 +08:00
Wenkai Yin
108aa21499 upgrade registry to 2.6.0 2017-03-16 13:44:16 +08:00
Wenkai Yin
b25f5f9692 ping email server API enhancement 2017-03-16 11:52:12 +08:00
Wenkai Yin
c3626edd42 reset config 2017-03-16 11:27:45 +08:00
Wenkai Yin
3b53b354d3 Merge pull request #1609 from reasonerjt/fix-notary-test-error
fix notary test error
2017-03-16 09:10:47 +08:00
Tan Jiang
e8af73aff6 fix notary test error 2017-03-15 19:50:37 +08:00
myufei
11146a628f add test cases 2017-03-15 18:23:10 +08:00
myufei
a2ee316a30 add test cases 2017-03-15 18:20:47 +08:00
kunw
a80008d0f9 Remove old UI. 2017-03-15 17:27:10 +08:00
myufei
878a888e0d update testcase 2017-03-15 17:25:28 +08:00
kun wang
d7327a70d2 Merge pull request #1594 from vmware/feature/merge_ui_code_to_fix_issues
fix dashboard route issue
2017-03-14 18:40:07 +08:00
Steven Zou
f6b9427de5 fix dashboard route issue 2017-03-14 18:37:05 +08:00
kun wang
e17a919e5f Merge pull request #1592 from vmware/feature/merge_latest_ui_code
merge latest ui code to fix block issues
2017-03-14 18:07:09 +08:00
Steven Zou
079cca5f91 merge latest ui code to fix block issues 2017-03-14 18:01:18 +08:00
myufei
8ee42c6f4a update test case 2017-03-14 16:28:52 +08:00
root
fab4c710af add test case
Committer: myufei <myufei@vmware.com>
2017-03-14 16:14:47 +08:00
kunw
959af275d8 Updates for verfied tags deletion. 2017-03-13 19:34:30 +08:00
Steven Zou
4d5b6d8190 Merge pull request #1578 from wknet123/dev-revised
Merge latest UI codes to dev.
2017-03-13 18:33:45 +08:00
kunw
e80840c2d3 Merge remote-tracking branch 'upstream/dev' into dev-revised 2017-03-13 18:23:09 +08:00
kunw
d700786878 Merge latest UI codes. 2017-03-13 18:20:45 +08:00
Daniel Jiang
f9e8394be9 Merge pull request #1541 from wy65701436/dev
to support nortary
2017-03-13 10:45:53 +08:00
Daniel Jiang
58a05c0aaf Merge pull request #1563 from ywk253100/170310_top_repo
Refactor getting top repo API to return more info
2017-03-13 10:45:36 +08:00
Daniel Jiang
f30defa5df Merge pull request #1562 from reasonerjt/notary-integration
provide systeminfo API for UI
2017-03-10 19:10:41 +08:00