m26508134
/
docklet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
883 Commits 1 Branch 0 Tags 4.4 MiB
Commit Graph

253 Commits

Author SHA1 Message Date
zhong yehong 0535bcd244 Revert "some modifications" 2016-06-21 17:55:36 +08:00
zhongyehong fb28184e3b 1.add udba parameter for aufs 
2.change the icon of admin page
3.fix a display error when create cluster
 2016-06-21 17:31:44 +08:00
tangshuangpku@hotmail.com 61167b5680 还原调试设置 2016-06-18 14:07:19 +08:00
tangshuangpku@hotmail.com 7c7411eff7 Merge remote-tracking branch 'upstream/experiment' 2016-06-08 12:20:04 +08:00
tangshuangpku@hotmail.com 7814e8a5bf 添加新接口 2016-06-07 22:12:51 +08:00
tangshuangpku@hotmail.com afb38fb5e6 添加新接口 2016-06-07 21:55:26 +08:00
tangshuangpku@hotmail.com 786a3ef0dd 添加新接口 2016-06-07 21:44:48 +08:00
tangshuangpku@hotmail.com 0540dd0db0 添加新接口 2016-06-07 21:37:26 +08:00
tangshuangpku@hotmail.com 98210f42f6 添加新接口 2016-06-07 21:20:17 +08:00
tangshuangpku@hotmail.com 2360fa94a2 添加新接口 2016-06-07 21:10:43 +08:00
tangshuangpku@hotmail.com 8344aaa4c4 添加新接口 2016-06-07 19:48:19 +08:00
tangshuangpku@hotmail.com 1f5724c5a0 添加新接口 2016-06-07 19:41:47 +08:00
tangshuangpku@hotmail.com d159b3eaa1 添加新接口 2016-06-07 19:37:44 +08:00
tangshuangpku@hotmail.com 3f454d5351 添加新接口 2016-06-07 19:35:00 +08:00
tangshuangpku@hotmail.com bf5059ba95 添加新接口 2016-06-07 19:31:45 +08:00
tangshuangpku@hotmail.com 0919efccd6 添加新接口 2016-06-07 19:23:27 +08:00
tangshuangpku@hotmail.com 1c81544d44 添加新接口 2016-06-07 19:13:01 +08:00
tangshuangpku@hotmail.com 3aee39b634 添加新接口 2016-06-07 18:57:10 +08:00
tangshuangpku@hotmail.com 5d2b28c4c7 添加新接口 2016-06-07 18:50:05 +08:00
tangshuangpku@hotmail.com dd4fdbca0d 添加新接口 2016-06-07 18:47:29 +08:00
tangshuangpku@hotmail.com 92c0d9c753 添加新接口 2016-06-07 18:06:55 +08:00
tangshuangpku@hotmail.com f6f1f19c99 添加新接口 2016-06-07 17:06:53 +08:00
tangshuangpku@hotmail.com 23169d687a 添加新接口 2016-06-07 16:53:44 +08:00
tangshuangpku@hotmail.com acf93ecf4c 添加新接口 2016-06-07 16:46:38 +08:00
tangshuangpku@hotmail.com ae71f8e695 添加新接口 2016-06-07 16:21:32 +08:00
zhongyehong cf1419dfae Merge remote-tracking branch 'upstream/master' 2016-06-07 15:30:55 +08:00
zhongyehong 1c09cb94c0 fix url error after dealing with request 2016-06-07 15:25:46 +08:00
zhongyehong 0316fe2973 fix url error after dealing with request 2016-06-07 15:19:59 +08:00
tangshuangpku@hotmail.com 3f30b796c6 添加新接口 2016-06-07 12:25:40 +08:00
tangshuangpku@hotmail.com 1e677408e9 添加新接口 2016-06-07 02:20:14 +08:00
tangshuangpku@hotmail.com c167444707 添加新接口 2016-06-07 02:06:41 +08:00
tangshuangpku@hotmail.com 9c5a6f8951 添加新接口 2016-06-07 01:12:43 +08:00
tangshuangpku@hotmail.com fa14046104 添加新接口 2016-06-07 00:59:47 +08:00
tangshuangpku@hotmail.com e5f2202104 添加新接口 2016-06-07 00:01:02 +08:00
tangshuangpku@hotmail.com 56a801ee34 添加新接口 2016-06-06 23:07:58 +08:00
tangshuangpku@hotmail.com 2758156e0b 添加新接口 2016-06-06 22:52:34 +08:00
tangshuangpku@hotmail.com c840643289 添加新接口 2016-06-06 22:10:25 +08:00
tangshuangpku@hotmail.com 6f231688f4 添加新接口 2016-06-06 22:05:36 +08:00
tangshuangpku@hotmail.com a0cb1b9687 添加新接口 2016-06-06 21:58:58 +08:00
tangshuangpku@hotmail.com c6eb0e4a3f 添加新接口 2016-06-06 21:43:03 +08:00
tangshuangpku@hotmail.com 533d8d6192 添加新接口 2016-06-06 21:41:07 +08:00
tangshuangpku@hotmail.com 1d6e86856d 添加新接口 2016-06-06 21:35:28 +08:00
tangshuangpku@hotmail.com 3717a9f46f 添加新接口 2016-06-06 18:19:35 +08:00
zhong yehong f674fc9783 Merge pull request #115 from fanshibear/master 
Limit privileges one can get via the admin page
 2016-05-30 15:45:10 +08:00
Peidong Liu c0802b1d44 Add version infomation in base_AdminLTE.html 2016-05-24 20:31:22 +08:00
leebaok 9041bb09a1 delete some unused code 2016-05-24 16:59:06 +08:00
zhuyj17 117cb718ff When worker is stopped, hosts realtime page will stop to fetch cpu and memory information. 2016-05-21 16:13:03 +08:00
zhuyj17 ec5861d67c When container is stopped, running time and disk usage will also be displayed. 2016-05-21 15:48:37 +08:00
Fan Shixiong 603662a350 Limit the privileges one can get via the admin page. 2016-05-19 08:59:38 -07:00
Fan Shixiong e9175e08fb Merge branch 'master' of https://github.com/unias/docklet 2016-05-19 06:17:05 -07:00
leebaok 755f135f60 Merge pull request #110 from FirmlyReality/realtime 
Compute running time of containers.
 2016-05-17 04:13:27 -05:00
Fan Shixiong b4342d92cf Label invalid values. Enable long words to be displayed. 2016-05-16 06:24:03 -07:00
zhuyj17 bacd43a5db Compute running time of a container. 2016-05-16 10:12:10 +08:00
Fan Shixiong 4400282343 Add administration features for administrators to configure Docklet 2016-05-15 07:12:06 -07:00
zhongyehong cdea33eb72 remove guest, fix a bug in httprest.py. 2016-05-09 15:09:55 +08:00
zhongyehong 1bdd11ea5a Merge remote-tracking branch 'upstream/master' 2016-05-09 12:49:19 +08:00
zhongyehong e72968fda2 fix a name error 2016-05-09 11:56:12 +08:00
Peidong Liu b8476c30e0 Simplify the procedure to change password 2016-05-08 20:35:50 +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
zhongyh16 8c5f835521 remove some unfinished code 2016-05-06 18:05:29 +08:00
zhongyh16 77ec586618 change some argument name in docklet.conf.template 2016-05-06 18:00:49 +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
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
zhuyj17 718d70d357 Using flask to display monitor info. 2016-04-30 16:45:48 +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
zhongyehong 961baf6ae2 add disk quota 2016-04-27 16:31:46 +08:00
Peidong Liu c56c3d52db Now backend is flask-styled 
fix a bug that will cause 404 in /login/
 2016-04-27 15:59:33 +08:00
zhuyj17 fb2148833b Add truename on Node list page. 2016-04-25 01:00:06 +08:00
zhuyj17 237ce6f26f Display disk usage on status page. 2016-04-23 18:42:04 +08:00
zhuyj17 92c839ff45 Modify the table on status and status realtime pages. 2016-04-23 17:45:49 +08:00
zhuyj17 a343c16847 Modify the unit on host Realtime page. 2016-04-23 17:04:00 +08:00
zhuyj17 6075fe54c4 Display owner of container on Node list page. 2016-04-23 16:37:15 +08:00
leebaok d91978b1e1 Merge pull request #62 from leebaok/master 
fix quota info failed
#62
 2016-04-18 10:36:42 +08:00
leebaok 898aad3229 fix quota info failed 2016-04-18 10:35:04 +08:00
Peidong Liu 9ec437c27a Now token will expires in 3600s 
Now workspace name will be checked, if not correct, flask will raise a 500 error
 2016-04-18 10:28:26 +08:00
leebaok 534b34b1f7 [home page] new home page of docklet 2016-04-17 14:55:00 +08:00
zhuyj17 55bc81e816 Add hours to idletime. 2016-04-15 23:36:57 +08:00
zhuyj17 5f5ee95f8c Merge branch 'master' into displayquota 2016-04-15 23:33:35 +08:00
zhongyehong 7cd40a48e0 fix a bug when create guest #49 
add hint for quota #7
 2016-04-14 17:26:30 +08:00
zhuyj17 9bdd012bd0 Add a table in status page to display user's quotas. 2016-04-14 15:52:44 +08:00
Peidong Liu c4dae009a3 Fix a bug that will lead to error when external_login() is called 2016-04-13 14:30:44 +08:00
zhongyehong be05b079c1 make image quota come true, 
fix display bug of label,
rename some quota,
 2016-04-12 18:11:34 +08:00
zhongyehong b1680681ae fix label display error, fix some bug on web 2016-04-12 15:20:11 +08:00
zhongyehong fd120f4232 add disk quota, add button on adminpage to add quota #7 
move system data to global/sys #41
 2016-04-12 15:03:00 +08:00
zhuyj17 02cbccdd15 Set quota in etcd and read from etcd for each container. 2016-04-11 12:17:06 +08:00
zhongyehong 545a644f9a Merge remote-tracking branch 'upstream/master' into adminpage 2016-04-08 13:48:52 +08:00
zhongyehong 6e0998e2d7 fix button in admin page #6 
add breadcrumb
 2016-04-08 13:39:36 +08:00
zhong yehong 51b1fda651 Merge pull request #27 from zhongyehong/adminpage 
Adminpage
 2016-04-06 17:34:18 +08:00
leebaok 3c905af403 [external login] bug of external login failed 2016-04-06 17:18:47 +08:00
zhong d409d2358e can remove quota group from web page 
can add quota with just one click
 2016-04-06 14:43:16 +08:00
zhong 402fcf8c91 Merge remote-tracking branch 'upstream/master' into adminpage 2016-04-06 13:42:05 +08:00
zhong 8853435ba5 fix bug in proxy port #4 2016-04-06 12:59:29 +08:00
leebaok 377c09ec81 Merge pull request #13 from PedroLiu/modified-log 
Will not log user's password now
 2016-04-05 18:31:19 +08:00
zhuyj17 3aa87cf858 Display quota in Status page. 2016-04-05 17:41:43 +08:00
zhong 08df8532b2 move quota group from database to json file 2016-04-05 17:36:39 +08:00
Peidong Liu abb6f716b2 Will not log user's password now 2016-04-05 16:59:27 +08:00
Peidong Liu e9dfd7b395 Now updating userinfo take effects immediately 
Change background color of profile and signout button
 2016-04-04 21:13:19 +08:00
leebaok 1936fb6ce4 hot fix of external login of web 2016-04-01 19:30:55 +08:00
leebaok 66906a1424 [Init] init repository with Docklet 0.2.6 2016-03-31 16:03:38 +08:00