Commit Graph

2694 Commits

Author SHA1 Message Date
Daniel Jiang
45f2fd6839 Merge pull request #1828 from reasonerjt/dev
minor fix to environment variable DOCKER_CONTENT_TRUST_SERVER
2017-03-29 09:33:54 +08:00
Daniel Jiang
3fc21f7d81 Merge pull request #1847 from wy65701436/dev
fix git tag bug
2017-03-29 09:33:41 +08:00
wy65701436
626123b66f fix git tag bug 2017-03-28 17:40:33 -07:00
Steven Zou
136697af23 Merge pull request #8 from steven-zou/fix/issue_1823
fix issue 1823
2017-03-28 23:51:18 +08:00
Steven Zou
86c8cbf0cd fix issue 1823 2017-03-28 23:50:02 +08:00
Steven Zou
f4ebb2c5ca Merge pull request #7 from steven-zou/fix/issues
fix related issues
2017-03-28 23:17:50 +08:00
Steven Zou
ffd3b73232 fix related issues 2017-03-28 23:16:31 +08:00
Tan Jiang
6e671e5cc2 minor fix to doc for setup env for using notary 2017-03-28 22:54:39 +08:00
Steven Zou
79263a8ba7 Merge pull request #1827 from wknet123/dev-revised
Updates for showing image ID and router tags.
2017-03-28 19:11:43 +08:00
kunw
fb79b4d730 Merge latest update. 2017-03-28 19:02:15 +08:00
kun wang
b6c15ec673 Merge pull request #1845 from steven-zou/dev
Fix issue 1795
2017-03-28 18:58:44 +08:00
kunw
ec3ddd82fd Updates for showing image ID and router tags. 2017-03-28 18:55:31 +08:00
Steven Zou
1bd3a790e7 Merge pull request #6 from steven-zou/fix/issue_1795
fix issue 1795
2017-03-28 18:38:33 +08:00
Steven Zou
cd33432264 fix issue 1795 2017-03-28 18:37:03 +08:00
Steven Zou
0d3d3a0fb3 Merge pull request #5 from steven-zou/fix/issue_1812
control the button status based on app config
2017-03-28 15:20:12 +08:00
Steven Zou
b3ef639caf control the button status based on app config 2017-03-28 15:18:51 +08:00
Steven Zou
f62b890f0d Merge pull request #1825 from steven-zou/dev
Fixed issue #1694, #1761, #1707
2017-03-28 15:00:07 +08:00
Steven Zou
4eda383bf3 Merge pull request #4 from steven-zou/fix/issue_1694
applied unique message handler and fix signin issue when code is 401
2017-03-28 14:50:09 +08:00
Steven Zou
41bb91f279 applied unique message handler and fix signin issue when code is 401 2017-03-28 14:47:21 +08:00
Steven Zou
6a61d8bd41 Merge pull request #1820 from wknet123/dev-revised
Updates for message handlers and i18n messages.
2017-03-28 12:41:01 +08:00
Daniel Jiang
924a4cdfa6 Merge pull request #1821 from reasonerjt/fix-prepare
fixes #1818
2017-03-28 12:16:44 +08:00
Tan Jiang
715d87dc80 fixes #1818 2017-03-28 10:11:13 +08:00
kunw
52d679e16d Updates for message handlers and i18n messages for replication and endpoints. 2017-03-28 01:22:12 +08:00
Daniel Jiang
411b43bf0c Merge pull request #1817 from wy65701436/dev
add ova upgrade script
2017-03-27 19:10:42 +08:00
kun wang
b433b2d54f Merge pull request #1816 from steven-zou/dev
Add general message handler to handle the error messages as described in #1694
2017-03-27 18:57:43 +08:00
wy65701436
b7340ebbce add ove upgrade script 2017-03-27 03:57:01 -07:00
Daniel Jiang
f142778826 Merge pull request #1815 from reasonerjt/fix-1811
fixes 1811
2017-03-27 18:53:41 +08:00
Daniel Jiang
f749b84aff Merge pull request #1806 from wy65701436/dev
change version to gittag
2017-03-27 18:52:30 +08:00
Steven Zou
327df11258 Merge pull request #3 from steven-zou/fix/issue_1694
fix issue #1694: add general message handler to handler the error and…
2017-03-27 18:41:36 +08:00
Steven Zou
3c05a35303 fix issue #1694: add general message handler to handler the error and error messages 2017-03-27 18:39:53 +08:00
Steven Zou
3a3b1c5ad5 Merge pull request #2 from steven-zou/fix/issue_1766
fix self deletion issue of #1766
2017-03-27 16:36:09 +08:00
Steven Zou
df6e3c5d0a fix self deletion issue of #1766 2017-03-27 16:35:26 +08:00
Tan Jiang
9e0b16c492 fixes 1811 2017-03-27 16:34:24 +08:00
Daniel Jiang
8cfdd1f5cc Merge pull request #1780 from ywk253100/170322_refactor_adminserver_test
Refactor uts of adminserver
2017-03-27 16:23:03 +08:00
Steven Zou
58527c2226 Merge remote-tracking branch 'upstream/dev' into dev 2017-03-27 16:19:03 +08:00
Steven Zou
18fca30d81 Merge pull request #1 from steven-zou/fix/issue_1744
support 'remember me' and root cert downloading
2017-03-27 16:08:58 +08:00
Steven Zou
54ea32c2e3 Merge pull request #1813 from steven-zou/fix/issue_1744
support 'remember me' and root cert downloading
2017-03-27 16:05:58 +08:00
Steven Zou
5fb2605a45 support 'remember me' and root cert downloading 2017-03-27 15:58:00 +08:00
wy65701436
4f8174a497 remove proxy from doc 2017-03-26 23:55:37 -07:00
wy65701436
104116ff59 update versiontag 2017-03-26 23:33:10 -07:00
Steven Zou
5c4e17638f Merge pull request #1808 from vmware/fix/merge_latest_ui_code_to_dev
merge latest ui code to dev
2017-03-27 13:47:16 +08:00
Wenkai Yin
4cc2115a23 Merge pull request #1710 from ywk253100/170321_url
Refactor API URL.
2017-03-27 13:26:32 +08:00
Steven Zou
88783af851 merge latest ui code to dev 2017-03-27 12:51:23 +08:00
Yan
3ce9188e1d Merge pull request #1793 from reasonerjt/dev
Do not generate new alias each time prepare runs
2017-03-27 10:54:54 +08:00
wy65701436
ebbdc7d747 change version to gittag 2017-03-26 19:41:25 -07:00
Tan Jiang
5e2598028f remove root.json after getting the targets 2017-03-25 17:00:26 +08:00
Daniel Jiang
6450b4eb34 Merge pull request #1790 from wy65701436/dev
update login test
2017-03-24 20:08:46 +08:00
Tan Jiang
851f61032a Do not generate new alias each time prepare runs 2017-03-24 20:05:13 +08:00
wy65701436
8848cb8e92 update travis 2017-03-24 03:50:11 -07:00
Steven Zou
28a513f900 Merge pull request #1791 from wknet123/dev-revised
Merge latest updates of UI.
2017-03-24 18:42:38 +08:00