zhuyj17
|
84b12317a1
|
remember proxy_server_ip as the usergateway
|
2017-04-18 00:52:59 +08:00 |
|
zhong yehong
|
aeeaa1593a
|
Merge pull request #220 from zhongyehong/master
add external login
|
2017-04-17 15:27:48 +08:00 |
|
zhongyh16
|
1a5de0fa8c
|
add external login
|
2017-04-17 15:26:46 +08:00 |
|
zhong yehong
|
a43e34f954
|
Merge pull request #219 from zhongyehong/master
add external_login url
|
2017-04-17 13:23:29 +08:00 |
|
zhongyh16
|
1bab7f93cd
|
add external_login url
|
2017-04-17 13:22:13 +08:00 |
|
zhong yehong
|
327f542526
|
Merge pull request #218 from ghostplant/master
prevent fork bomb
|
2017-04-14 13:30:06 +08:00 |
|
CUI Wei
|
1b9be197b4
|
prevent fork bomb
|
2017-04-12 12:24:04 +08:00 |
|
zhuyj17
|
94d2028986
|
add nginx proxy
|
2017-04-11 07:56:55 +08:00 |
|
zhong yehong
|
1cd74e1d34
|
Merge pull request #217 from zhongyehong/master
mutiple master
|
2017-04-10 16:15:22 +08:00 |
|
zhongyh16
|
fb78cdff48
|
fix a billing bug
|
2017-04-10 16:06:11 +08:00 |
|
zhongyh16
|
8458d41bd8
|
stop debug mode
|
2017-04-10 15:27:41 +08:00 |
|
zhongyh16
|
974cb13811
|
Merge remote-tracking branch 'upstream/master'
|
2017-04-10 15:27:00 +08:00 |
|
zhongyh16
|
97b09bf099
|
fix a bug
|
2017-04-10 15:24:37 +08:00 |
|
zhongyh16
|
669afabd1b
|
fix a bug in data table
|
2017-04-10 15:21:39 +08:00 |
|
zhongyh16
|
0bdc313258
|
monitor part of multiple master
|
2017-04-09 18:18:12 +08:00 |
|
zhongyh16
|
21cb80346d
|
multiple master
|
2017-04-07 16:25:57 +08:00 |
|
Yujian Zhu
|
cfaad56a4e
|
Merge pull request #216 from FirmlyReality/rpcbug
Fix a bug of rpc when worker is stopped
|
2017-03-25 17:51:31 +08:00 |
|
zhuyj17
|
58c9a5178b
|
Fix a bug of rpc when worker is stopped
|
2017-03-25 17:50:42 +08:00 |
|
zhongyehong
|
e714049d54
|
Merge remote-tracking branch 'upstream/multimaster'
|
2017-03-19 20:47:55 +08:00 |
|
zhuyj17
|
afaaf5e86f
|
Set proxy route by rpc.
|
2017-03-19 16:02:53 +08:00 |
|
zhuyj17
|
611b440131
|
Start proxy on worker
|
2017-03-19 15:00:18 +08:00 |
|
zhuyj17
|
46141091fb
|
Merge branch 'master' of https://github.com/unias/docklet into network
|
2017-03-16 16:52:11 +08:00 |
|
zhuyj17
|
76f87d669b
|
check_gw by rpc
|
2017-03-13 21:53:32 +08:00 |
|
zhong yehong
|
3cf595cfc0
|
Merge pull request #215 from zhongyehong/master
add a script to auto deploy docklet worker.
|
2017-03-13 20:14:37 +08:00 |
|
zhongyehong
|
44dd543422
|
add a script to auto deploy docklet worker.
|
2017-03-13 20:11:28 +08:00 |
|
zhuyj17
|
e52d124e65
|
Enable the Distributed_gw in conf.
|
2017-03-13 19:08:23 +08:00 |
|
zhong yehong
|
576bf50525
|
Merge pull request #214 from zhongyehong/master
update prepare.sh
|
2017-03-13 18:54:01 +08:00 |
|
zhongyehong
|
134aa84796
|
update prepare.sh
|
2017-03-13 16:48:38 +08:00 |
|
zhuyj17
|
8f083d442e
|
Enable user gateway to be set up on the worker.
|
2017-03-12 16:22:47 +08:00 |
|
zhong yehong
|
7cef8f567f
|
Merge pull request #213 from zhongyehong/master
add hyperlink to the project in github.
|
2017-03-09 15:28:48 +08:00 |
|
zhongyehong
|
239b4e6379
|
Merge remote-tracking branch 'upstream/master'
|
2017-03-09 15:24:46 +08:00 |
|
zhongyehong
|
5e734e81aa
|
add hyperlink to the project in github.
|
2017-03-09 15:23:55 +08:00 |
|
zhong yehong
|
2cf548cd49
|
Merge pull request #211 from zhongyehong/master
change the Dashboard to Workspace
|
2017-02-17 16:28:52 +08:00 |
|
zhongyehong
|
20c2f8986e
|
change the Dashboard to Workspace
|
2017-02-17 16:27:31 +08:00 |
|
zhong yehong
|
fab8ab4789
|
Merge pull request #209 from zhongyehong/master
don't compress when save image
|
2016-12-18 00:51:51 +08:00 |
|
zhongyehong
|
48689cb1ff
|
fix a bug
|
2016-12-18 00:49:11 +08:00 |
|
zhongyehong
|
ac8eea20f9
|
update upgrade.py
|
2016-12-17 17:55:39 +08:00 |
|
zhongyehong
|
d8629cb454
|
make admin email address config can be change in admin page
don't compress when save image
|
2016-12-17 17:52:10 +08:00 |
|
zhong yehong
|
5f5e506598
|
Merge pull request #208 from zhongyehong/master
fix an external login bug.
|
2016-12-04 17:53:59 +08:00 |
|
zhongyehong
|
01a06875bf
|
fix an external login bug.
|
2016-12-04 17:52:50 +08:00 |
|
zhong yehong
|
50d2d2edde
|
Merge pull request #207 from zhongyehong/master
save the image as an archived file
|
2016-12-04 17:49:58 +08:00 |
|
zhongyehong
|
0e4b206d29
|
Merge branch 'external_login'
|
2016-12-04 17:42:27 +08:00 |
|
zhongyehong
|
f09b2a1674
|
Merge remote-tracking branch 'upstream/master' into external_login
|
2016-12-04 17:37:04 +08:00 |
|
zhongyehong
|
a729034525
|
save the image as a archived file
all admins' email can receive remind mail
|
2016-12-04 17:35:10 +08:00 |
|
Yujian Zhu
|
71a41c5d3d
|
Merge pull request #205 from FirmlyReality/multimaster
Multimaster
|
2016-11-19 17:57:46 +08:00 |
|
zhuyj17
|
0ee773e3a4
|
fix some bugs.
|
2016-11-19 17:55:59 +08:00 |
|
zhuyj17
|
e01f9c1f1c
|
Seperate monitor from users' databases.
|
2016-11-19 17:39:10 +08:00 |
|
zhong yehong
|
2016adb557
|
Merge pull request #203 from zhongyehong/multimaster
Multimaster
|
2016-11-17 15:50:23 +08:00 |
|
zhongyehong
|
e9403f1c3e
|
fix some errors from merge
|
2016-11-17 15:40:58 +08:00 |
|
zhongyehong
|
80aaa0f4e2
|
Merge remote-tracking branch 'upstream/master' into multimaster
|
2016-11-17 14:43:24 +08:00 |