Commit Graph

2144 Commits

Author SHA1 Message Date
yhua123
6565a3da54 Merge pull request #1189 from wknet123/master-fix-save-comment
Fix save comment issue.
NMT
2016-12-08 14:59:45 +08:00
yhua123
fde7b87665 Merge pull request #1223 from wknet123/dev-fix-popup
Fixed popup and inline help toggle issues.
NMT
2016-12-08 14:49:22 +08:00
kunw
b0da7b6d89 Merge remote-tracking branch 'upstream/dev' into dev-fix-popup 2016-12-08 13:54:04 +08:00
kunw
3d9d106acb Fixed popup and inline help toggle issues. 2016-12-08 13:23:02 +08:00
Daniel Jiang
9e4c90e406 Merge pull request #1216 from ywk253100/161206_collect_log
Fix exposure issue when collecting logs
2016-12-06 16:03:20 +08:00
yhua123
bd862a4165 Merge pull request #1215 from wknet123/master-fix-pagination
Update pagination of UI.
2016-12-06 15:14:53 +08:00
Wenkai Yin
bad8835c79 fix exposure issue when collecting logs 2016-12-06 14:54:49 +08:00
Haining Henry Zhang
97d4df67a3 Merge pull request #1211 from hainingzhang/master
update docs of virtual appliance
2016-12-06 12:49:15 +08:00
kunw
47ddd97182 Update pagination of UI. 2016-12-06 12:16:59 +08:00
Daniel Jiang
9ab756e2b7 Merge pull request #1209 from ywk253100/161202_sed_escape
Remove the workaround for DNS issue and escape special characters used in sed
2016-12-06 10:03:27 +08:00
Henry Zhang
588cc375a5 update docs 2016-12-06 01:01:03 +08:00
Henry Zhang
8359c91e66 update docs 2016-12-06 00:41:05 +08:00
Daniel Jiang
8333e54d75 Merge pull request #1210 from ywk253100/161204_ova_install_guide
Move self-registrition option to authentication group in installation guide
2016-12-05 17:14:53 +08:00
Wenkai Yin
65a2c87a7c fixes: root password contains special characters 2016-12-05 12:16:27 +08:00
Daniel Jiang
8974003547 Merge pull request #1208 from reasonerjt/master
fix build issue
2016-12-05 01:12:08 +08:00
Tan Jiang
5bb053acbb fix build issue 2016-12-05 01:05:50 +08:00
Wenkai Yin
d808c402d2 move self-registrition option to authentication group in installation guide 2016-12-04 21:54:33 +08:00
Wenkai Yin
01dc77b606 escape special characters used in sed 2016-12-04 16:35:47 +08:00
Haining Henry Zhang
fac0bd9a30 Merge pull request #1196 from ywk253100/161130_ova_doc
user guide for ova
2016-12-02 21:51:44 +08:00
Wenkai Yin
ad4560b50f user guide for ova 2016-12-02 17:47:41 +08:00
Daniel Jiang
68ab0e5efc Merge pull request #1201 from reasonerjt/build-fix
fix build error
2016-12-02 17:07:28 +08:00
Tan Jiang
645543a2d2 fix build error 2016-12-02 16:41:53 +08:00
Wenkai Yin
f4e0d3c774 remove the workaround of DNS issue 2016-12-02 14:29:52 +08:00
Daniel Jiang
b8169f251e Merge pull request #1197 from dejwsz/patch-1
remove rsyslogd.pid before start to allow container restarts
2016-12-02 13:15:54 +08:00
dejwsz
719072e0ba remove rsyslogd.pid before start to allow container restarts
This change mitigate problems with container restarts (stop, start) or automatic restart after host machine restart. Rsyslogd strictly checks existence of its pid file and won't start if such one exists.
2016-12-01 15:31:14 +01:00
Wenkai Yin
43f427cfe9 Merge pull request #1193 from reasonerjt/replication-timeout
remove timeout for replicating large image
2016-11-30 18:02:57 +08:00
Tan Jiang
3f6301b587 remove timeout for replicating large image 2016-11-30 17:43:04 +08:00
Daniel Jiang
c214d37250 Merge pull request #1184 from ywk253100/161129_push_photon
Push photon to project library
2016-11-29 17:34:29 +08:00
Daniel Jiang
f237d33439 Merge pull request #1182 from ywk253100/161128_ova_dns
ova dns
2016-11-29 17:28:44 +08:00
Wenkai Yin
3e35597dd0 push photon to project library 2016-11-29 17:17:01 +08:00
kunw
da85b8f3cb Fix save comment issue. 2016-11-29 16:55:52 +08:00
Wenkai Yin
feb7f866d9 Merge pull request #1183 from yhua123/dev
package the photon 1.0 image in offline.tgz
2016-11-29 14:19:35 +08:00
Wenkai Yin
4149e74b00 ova dns 2016-11-29 13:17:56 +08:00
yhua
73200193d1 package the photon 1.0 image in offline.tgz 2016-11-29 12:44:54 +08:00
Wenkai Yin
871c18df46 Merge pull request #1177 from ywk253100/161118_lvm
lvm guide
2016-11-28 14:54:04 +08:00
Wenkai Yin
8748c470c1 Merge pull request #1176 from reasonerjt/update-license
update license for 0.5.0
2016-11-28 14:44:32 +08:00
Wenkai Yin
bb75c70ced Merge pull request #1167 from ywk253100/161125_collect_log_doc
Log collection doc
2016-11-28 14:40:46 +08:00
Wenkai Yin
988ad4608b lvm guide 2016-11-28 14:36:03 +08:00
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