Commit Graph

2807 Commits

Author SHA1 Message Date
Wenkai Yin
e5b2995b1e log collection doc 2016-11-28 14:06:14 +08:00
Daniel Jiang
454f041431 Merge pull request #1174 from wknet123/master
Update some i18n messages
2016-11-28 13:41:56 +08:00
Tan Jiang
6db72ceb36 update license for 0.5.0 2016-11-28 13:02:16 +08:00
kunw
92a37083d6 Merged master. 2016-11-28 12:16:37 +08:00
kunw
cb1fed8d0e Update i18 messages 2016-11-28 12:05:44 +08:00
kunw
32336f2d94 Merge branch 'wknet123-master-messages' 2016-11-28 11:48:56 +08:00
yhua123
a192ce90c6 Merge pull request #1172 from wknet123/master-handle-sign-in-error
Fixed handle other errors while signing in.
NMT
2016-11-28 10:57:01 +08:00
yhua123
e99d4b8466 Merge pull request #1160 from wknet123/master-handle-rep-err
Updates for handling 404 response text.
NMT
2016-11-28 10:55:59 +08:00
Daniel Jiang
32f9fb6a68 Merge pull request #1157 from wknet123/master-update-doc
Update for email_identity setting.
2016-11-28 00:05:45 +08:00
Daniel Jiang
fddb325e16 Merge pull request #1164 from ywk253100/161125_iptable
Fix iptable modification conflict
2016-11-28 00:05:14 +08:00
Daniel Jiang
5acf2c7195 Merge pull request #1171 from wknet123/master-handle-email-error
Fixed handle errors about sending email.
2016-11-28 00:05:03 +08:00
kunw
3d0bf35ef1 Fixed handle other errors while signning in. 2016-11-25 18:01:15 +08:00
kunw
499141c193 Fixed handle errors about sending email. 2016-11-25 17:32:44 +08:00
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
Wenkai Yin
1559d927a4 fix iptable modification conflict 2016-11-25 14:03:44 +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
kunw
dc6d3e552c Update comment. 2016-11-24 17:50:41 +08:00
kunw
50a057994e Updates for handling 404 response text. 2016-11-24 17:37:00 +08:00
kunw
4d916e7127 Update for email_identity setting. 2016-11-24 15:48:36 +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
kunw
e3f5e9e501 Updates Swagger YAML for new added API. 2016-11-22 19:19:17 +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