Commit Graph

2089 Commits

Author SHA1 Message Date
kunw
871d4e781b Merge remote-tracking branch 'upstream/master' into master-messages 2016-11-25 17:15:44 +08:00
kunw
277785febc Update some i18n messages. 2016-11-25 17:13:52 +08:00
Daniel Jiang
098f1905bf Merge pull request #1158 from ywk253100/161123_ova_dns
Workaround for dns and hostname issue
2016-11-25 17:06:32 +08:00
Haining Henry Zhang
fad7aa9c00 Merge pull request #1162 from hainingzhang/master
update ova installation guide
2016-11-25 14:25:21 +08:00
Henry Zhang
f4017bdd5a update ova installation guide 2016-11-24 22:47:33 +08:00
Henry Zhang
814e89cadb update ova installation guide 2016-11-24 22:39:01 +08:00
Haining Henry Zhang
0c9c258bad Merge pull request #1149 from hainingzhang/master
update ova installation guide
2016-11-24 00:18:13 +08:00
Henry Zhang
0c62b50606 update installation guide 2016-11-23 23:35:57 +08:00
Henry Zhang
ee7ad59143 update installation guide 2016-11-23 23:33:33 +08:00
Henry Zhang
810db2415f update ova installation guide 2016-11-23 23:26:57 +08:00
Wenkai Yin
0b3938b411 workaround for dns and hostname issue 2016-11-23 19:59:53 +08:00
Haining Henry Zhang
7e0305e37c Merge pull request #1147 from hainingzhang/master
update docs
2016-11-22 23:11:26 +08:00
Henry Zhang
8283d9a4e2 update README 2016-11-22 22:18:13 +08:00
Henry Zhang
5ccb434e6f update authors 2016-11-22 22:13:49 +08:00
Henry Zhang
d435a41006 install guide ova 2016-11-22 21:59:46 +08:00
Henry Zhang
01004a8427 update install guide ova 2016-11-22 21:48:16 +08:00
Henry Zhang
9fa6842f83 install guide ova 2016-11-22 21:15:06 +08:00
kun wang
2dee9c7b90 Merge pull request #1144 from vmware/revert-1143-master-update-swagger
Revert "Updates Swagger YAML for new added APIs."
2016-11-22 18:42:54 +08:00
yhua123
96cf5ef866 Revert "Updates Swagger YAML for new added APIs." 2016-11-22 18:36:34 +08:00
yhua123
44205610ec Merge pull request #1143 from wknet123/master-update-swagger
Updates Swagger YAML for new added APIs.

Need test cases for these 2 new API~
2016-11-22 18:35:45 +08:00
kun wang
211c0424ff Replace the style of select-all button. (#1140)
* Replace the style of select-all button.

* Remove the button as discussion.

LGTM, maybe others will give more comments, merge first
2016-11-22 18:34:02 +08:00
kunw
df85ff0125 Updates Swagger YAML for new added APIs. 2016-11-22 18:13:40 +08:00
Henry Zhang
093747cd2c udpate installation guide OVA 2016-11-22 18:12:11 +08:00
Daniel Jiang
99e1b5cd85 Merge pull request #1135 from vmware/dev
dev -> master for 0.5.0rc1
2016-11-21 17:06:37 +08:00
Daniel Jiang
2119034c5c Merge pull request #1123 from ywk253100/161118_ova_guide
Update ova guide
2016-11-21 16:44:30 +08:00
yhua123
afbcffb00a Merge pull request #1134 from reasonerjt/dev
update version of photon OS to 1.0 in Docker files
LGTM
2016-11-21 16:33:49 +08:00
Tan Jiang
b868634007 update version of photon OS to 1.0 in Docker files 2016-11-21 16:15:43 +08:00
yhua123
13c43fcaf5 Merge pull request #1131 from wknet123/dev-current-user
Fixed toggle admin button.
LGTM  need more testing
2016-11-21 16:09:30 +08:00
kun wang
4671f4a02f Merge pull request #1124 from yhua123/dev
LGTM
2016-11-21 15:18:11 +08:00
kunw
902af427af Fixed toggle admin button. 2016-11-21 15:10:24 +08:00
Daniel Jiang
57e01000c9 Merge pull request #1128 from reasonerjt/dev
fix GetIsInsecure
2016-11-21 02:15:49 +08:00
Tan Jiang
418d9bc2b6 handle the no session scenario in project controller 2016-11-18 20:00:15 +08:00
Tan Jiang
4a603f0913 add a test case 2016-11-18 19:32:35 +08:00
Tan Jiang
aab3dfee4e fix GetIsInsecure 2016-11-18 19:13:23 +08:00
Wenkai Yin
163e43a329 Merge pull request #1125 from wknet123/dev-change-dir
Change cert dir path.
2016-11-18 17:53:49 +08:00
kunw
b663b06b74 Change cert dir path. 2016-11-18 17:50:42 +08:00
yhua
a0fc5a132e add api/users/current to swagger.yaml 2016-11-18 17:10:53 +08:00
Wenkai Yin
3c99b366b5 update ova guide 2016-11-18 17:07:23 +08:00
Daniel Jiang
31a64159fc Merge pull request #1122 from reasonerjt/dev
update TOKEN_URL to TOKEN_ENDPOINT
2016-11-18 16:46:29 +08:00
Tan Jiang
35407d12db update TOKEN_URL to TOKEN_ENDPOINT 2016-11-18 16:37:46 +08:00
Daniel Jiang
3a23c38aaf Merge pull request #1121 from wknet123/dev-show-download-cert
Add download cert to UI.
2016-11-18 16:30:43 +08:00
kunw
d26e972fb6 Add dowload cert to UI. 2016-11-18 16:07:18 +08:00
kun wang
8332defb07 Merge pull request #1119 from reasonerjt/dev
LGTM.
2016-11-18 14:56:31 +08:00
Daniel Jiang
b188a405ac Merge pull request #1118 from ywk253100/161117_ova
OVA script update
2016-11-18 14:49:38 +08:00
Wenkai Yin
a02f8f5740 1. copy ca to download directory if nedded 2.add IP to san 3.ignore harbor admin password and database password in subsequent boot 2016-11-18 14:13:00 +08:00
Tan Jiang
0df31586bb hide the button if user doesn't have permission to create project 2016-11-18 14:11:58 +08:00
Daniel Jiang
64b3c7f261 Merge pull request #1100 from ywk253100/161116_sql_wildcard
Escapse % and _ in sql
2016-11-18 13:17:49 +08:00
Daniel Jiang
fcdb212cb0 Merge pull request #1113 from ywk253100/161117_ova_2
Modify msg of certificate
2016-11-18 13:04:28 +08:00
yhua123
fba88b79ac Merge pull request #1116 from wknet123/dev-precise-volume-size
Update for precising volume size.
LGTM
2016-11-18 11:11:02 +08:00
kunw
f6303672a0 Update for precising volume size. 2016-11-17 19:01:29 +08:00