Commit Graph

2410 Commits

Author SHA1 Message Date
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
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
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
wy65701436
fd5a2824b6 update per review. 2017-03-10 02:57:10 -08:00
Tan Jiang
ef906c96d0 provide systeminfo API for UI 2017-03-10 18:53:11 +08:00
Wenkai Yin
62963eb3a8 update swagger 2017-03-10 15:31:05 +08:00
kunw
1c2fcc168f Merge remote-tracking branch 'upstream/dev' into dev-revised 2017-03-10 15:27:35 +08:00
Wenkai Yin
fea1ae4e26 refactor getting top repo API to return detail info 2017-03-10 15:23:22 +08:00
Wenkai Yin
39f786dbbc Merge pull request #1557 from ywk253100/170309_get_tag
Refactor getting tags API to return more info
2017-03-10 15:22:25 +08:00
Daniel Jiang
6eb2912aad Merge pull request #1554 from ywk253100/170309_bug_fix
bug fix in search API: do not return duplicate projects when user does not login
2017-03-09 20:20:19 +08:00
wy65701436
481ba06003 support notary 2017-03-09 03:02:44 -08:00
Daniel Jiang
28b367b1cf Merge pull request #1553 from reasonerjt/test-accelerate
Test accelerate
2017-03-09 17:52:19 +08:00
Wenkai Yin
d7b867ebcc bug fix in search API: do not return duplicate projects when user does not login 2017-03-09 17:34:34 +08:00
Wenkai Yin
3cb53011eb refactor get tags API to return more info 2017-03-09 17:30:00 +08:00
Wenkai Yin
c8802f05ad refactor get tag API 2017-03-09 14:48:25 +08:00