PedroLiu
|
758f55a7a5
|
Merge pull request #98 from PedroLiu/master
Simplify the procedure to change password
|
2016-05-08 20:38:41 +08:00 |
|
Peidong Liu
|
b8476c30e0
|
Simplify the procedure to change password
|
2016-05-08 20:35:50 +08:00 |
|
leebaok
|
b2c7eb37cf
|
Merge pull request #94 from leebaok/network-ip-check
Network ip check
|
2016-05-07 04:09:28 -05:00 |
|
leebaok
|
0a248edfdb
|
[network] overwrite inrange check of UserPool to replace EnumPool's
Because UserPool has gateway but EnumPool not has
|
2016-05-07 16:56:14 +08:00 |
|
leebaok
|
ed8fe423b0
|
Merge remote-tracking branch 'upstream/master' into network-ip-check
|
2016-05-07 13:44:19 +08:00 |
|
PedroLiu
|
ce6947d806
|
Merge pull request #91 from PedroLiu/master
Bug fix
|
2016-05-06 23:20:32 +08:00 |
|
Peidong Liu
|
aaee153da3
|
Now tables in /user/list/ and /admin/ have a scroll bar when screen is now wide enough
|
2016-05-06 23:15:46 +08:00 |
|
leebaok
|
01084c0ba3
|
[network] check addr/cidr whether in range of center pool and whether overlaping some addr/cidr in pool when free addr/cidr to center pool (when delete users)
|
2016-05-06 23:01:13 +08:00 |
|
leebaok
|
c919a1e85e
|
Merge remote-tracking branch 'upstream/master' into network-ip-check
|
2016-05-06 21:48:10 +08:00 |
|
zhong yehong
|
04049fa536
|
Merge pull request #90 from zhongyehong/master
rename some argument
|
2016-05-06 18:07:21 +08:00 |
|
zhongyh16
|
8c5f835521
|
remove some unfinished code
|
2016-05-06 18:05:29 +08:00 |
|
zhongyh16
|
5714c791a5
|
fix a name error
|
2016-05-06 18:02:09 +08:00 |
|
zhongyh16
|
77ec586618
|
change some argument name in docklet.conf.template
|
2016-05-06 18:00:49 +08:00 |
|
zhong yehong
|
94549aff0a
|
Merge pull request #89 from zhongyehong/master
Fix bug of change default group and make data quota come true
|
2016-05-06 16:58:05 +08:00 |
|
leebaok
|
5bbbe705b4
|
Merge branch 'master' into network-ip-check
|
2016-05-06 16:56:53 +08:00 |
|
zhongyh16
|
acbe31325a
|
make data quota come true
|
2016-05-06 16:41:11 +08:00 |
|
zhongyh16
|
390da9c41b
|
use get method instead of getvalue
|
2016-05-06 13:50:46 +08:00 |
|
Cao, Donggang
|
91f9500121
|
Merge pull request #84 from caodg/master
fix a bug in worker.py of var not found error
|
2016-05-05 12:37:25 +08:00 |
|
Donggang Cao
|
4396710c6f
|
fix a bug in worker.py of var not found error
|
2016-05-05 00:25:25 -04:00 |
|
leebaok
|
b22a34882c
|
Merge pull request #82 from FirmlyReality/diskbug
Fix a bug in monitor.py, which may stop the thread.
|
2016-05-04 09:07:23 -05:00 |
|
leebaok
|
e226fb27c8
|
Merge pull request #83 from SourceZh/separate
fix a bug of independent starting master and worker.
|
2016-05-04 08:46:38 -05:00 |
|
ooooo
|
f4c5126b06
|
rename variable
|
2016-05-04 20:15:19 +08:00 |
|
ooooo
|
ff7c5b04df
|
fix a bug
|
2016-05-04 20:08:50 +08:00 |
|
leebaok
|
a17aff2b20
|
Merge pull request #81 from SourceZh/separate
Independent starting of master and worker. But not work for **init mode** of startup.
|
2016-05-04 06:37:05 -05:00 |
|
ooooo
|
8fcdd229e3
|
delete method getnode in etcdlib.py
|
2016-05-04 11:54:24 +08:00 |
|
zhuyj17
|
8a1056a0bf
|
Fix a bug in monitor.py, which may stop the thread.
|
2016-05-04 11:54:11 +08:00 |
|
PedroLiu
|
7b93c9f390
|
Merge pull request #79 from PedroLiu/master
Bug fix
|
2016-05-03 22:36:20 +08:00 |
|
Peidong Liu
|
628c478198
|
Fix a bug that will occur when user token expires.
Closed the debug mode in httprest.py and web.py
Now 500 error in web.py will lead to a 500 page
500 error in httprest.py will lead to logout page
|
2016-05-03 22:29:32 +08:00 |
|
leebaok
|
10560577ad
|
Merge pull request #78 from leebaok/master
Master : disable debug mode of flask in httprest.py
|
2016-05-03 06:31:38 -05:00 |
|
leebaok
|
44cd289cea
|
Master : disable debug mode of flask in httprest.py
debug mode of flask will restart the process
this will make some work before flask lost
|
2016-05-03 19:04:58 +08:00 |
|
leebaok
|
6a4dae1d1c
|
[merge] merge flask-rewrite with reuse-vlanid
|
2016-05-03 17:06:30 +08:00 |
|
leebaok
|
f8bce19fa9
|
Merge branch 'master' of https://github.com/PedroLiu/docklet into merge-flask-rewrite
|
2016-05-03 16:47:19 +08:00 |
|
leebaok
|
7deb9852b0
|
Merge branch 'master' into network-ip-check
|
2016-05-03 16:31:15 +08:00 |
|
leebaok
|
9ebd3673bf
|
Merge pull request #73 from jklj077/master
vlan ids reusing
|
2016-05-03 03:23:58 -05:00 |
|
Peidong Liu
|
80144894b4
|
Merge branch 'master' of https://github.com/PedroLiu/docklet
|
2016-05-03 15:40:39 +08:00 |
|
zhuyj17
|
d4cbf43ed1
|
Using flask to display monitor info.
|
2016-05-03 15:31:53 +08:00 |
|
Peidong Liu
|
2fc5a79163
|
Now backend is flask-styled
fix a bug that will cause 404 in /login/
|
2016-05-03 15:31:53 +08:00 |
|
Peidong Liu
|
a1fb4b0aee
|
Test the code
|
2016-05-03 15:03:28 +08:00 |
|
zhuyj17
|
718d70d357
|
Using flask to display monitor info.
|
2016-04-30 16:45:48 +08:00 |
|
zhong yehong
|
26b2961dc9
|
Merge pull request #74 from zhongyehong/master
pay attention
|
2016-04-29 16:12:13 +08:00 |
|
zhongyehong
|
d5d12d3c06
|
fix some css style in datatable
|
2016-04-29 16:08:10 +08:00 |
|
zhongyehong
|
a0ca4e5081
|
Merge remote-tracking branch 'upstream/master'
|
2016-04-29 15:43:17 +08:00 |
|
zhongyehong
|
7b96837dfe
|
add upgrade.py to upgrade some configure file
add data space quota, but it doesn't work now
add default quota group, can change it in admin page
fix a bug when user first time to create image
|
2016-04-29 15:40:53 +08:00 |
|
jklj077
|
e8f96133d7
|
fix bugs related to vlan ids reusing
|
2016-04-29 13:47:56 +08:00 |
|
jklj077
|
9906f0588f
|
reuse vlanids
|
2016-04-29 12:58:48 +08:00 |
|
ooooo
|
2741371153
|
delete unused var
|
2016-04-27 16:54:47 +08:00 |
|
ooooo
|
c2c2adaa39
|
delete unused var
|
2016-04-27 16:43:11 +08:00 |
|
ooooo
|
996d73c3f4
|
Merge remote-tracking branch 'upstream/master' into separate
|
2016-04-27 16:37:31 +08:00 |
|
ooooo
|
25ba87423d
|
fix a little bug
|
2016-04-27 16:36:32 +08:00 |
|
zhongyehong
|
961baf6ae2
|
add disk quota
|
2016-04-27 16:31:46 +08:00 |