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

190 Commits

Author SHA1 Message Date
Bao Li b6792f6632 Merge pull request #188 from PedroLiu/master 
Now chpassword is a independent button
 2016-09-19 09:47:32 +08:00
zhuyj17 617dcf2705 Add a 'apply' button beside the user's beans. 2016-09-17 17:57:42 +08:00
zhuyj17 6853d39055 Administrator can agree or reject beans applications on user list page. 2016-09-17 17:50:09 +08:00
zhuyj17 41d3db3c0e Add beans application page. 2016-09-15 18:04:12 +08:00
Firmlyzhu f39b8467e9 Add a page to display beans applications information. 2016-09-12 16:56:45 +08:00
Firmlyzhu 6712a4ad44 Add a column on User List page to display user's beans. 2016-09-12 16:15:25 +08:00
zhuyj17 fc214ff751 Small change 2016-09-12 15:02:29 +08:00
zhuyj17 44cfecae1c Small change. 2016-09-11 11:31:34 +08:00
zhuyj17 5c61b4c6b7 Add information of current billing on history page and shrink the beans icon. 2016-09-11 11:23:38 +08:00
zhongyehong 947eea0482 Merge remote-tracking branch 'upstream/master' 2016-09-05 10:17:24 +08:00
Peidong Liu cac7a50901 Now admin need to type password twice to change a user's password 2016-09-04 14:48:46 +08:00
PedroLiu 390077535a Now chpassword is a independent button 2016-09-02 23:38:02 +08:00
zhongyehong e33cd5fac1 add a button to update base image in admin page 2016-08-26 18:10:41 +08:00
zhongyehong bb8614ab65 Merge remote-tracking branch 'upstream/master' 2016-08-24 17:07:03 +08:00
zhuyj17 7d883432ac Display error message when failing to start cluster. 2016-08-21 15:30:59 +08:00
zhuyj17 4656b1866e Fetch data of beans from server and display it on the page. 2016-08-10 17:16:45 +08:00
zhuyj17 64c16c6c3f Add a icon of bean on page. 2016-08-10 16:45:46 +08:00
Yujian Zhu 2f65abfba6 Merge pull request #184 from FirmlyReality/history 
Add a history page and user can query all history of created vnodes.
 2016-08-10 14:27:10 +08:00
zhuyj17 50a24d4f95 Add history page and user can query all history of created vnodes. 2016-08-07 17:10:18 +08:00
zhong yehong ab442bb14f Merge pull request #182 from iteratorlee/test1 
fix bugs on the view of notification numbers(by LiYan)
 2016-08-07 15:01:41 +08:00
Peidong Liu 2b81f1963e Add a new button to activate user quickly 
Remove password changing to avoid errors caused by auto-filling
Change the time record to current time other than UTC time
 2016-08-04 22:00:01 +08:00
root fc4139b852 Fix notification 2016-08-02 16:30:17 +08:00
zhuyj17 63a2d387bd Add button to history page on status page. 2016-07-24 18:23:27 +08:00
zhuyj17 d0ab069657 Add history in web. 2016-07-24 13:51:01 +08:00
zhongyehong 8291643929 default container cpu, memory and disk can be modify in admin page 2016-07-21 19:19:53 +08:00
zhongyehong 64c228ea88 init usage info when start docklet with init mode 2016-07-21 17:43:26 +08:00
zhuyj17 3a608caa7c Change the interval to update the info on webpage. 2016-07-17 10:22:59 +08:00
zhuyj17 f73aeaf9ec To Compute cpu percent of a container on a host and display the result on webpage. 2016-07-17 10:18:30 +08:00
zhongyehong 2a03269133 give user a total quota, let themselves decide how to use quota 2016-07-15 23:35:47 +08:00
zhongyehong 6397636135 add warning for update base image 2016-07-14 13:35:11 +08:00
zhongyehong b9ea18dc9f add update base image button in admin page 2016-07-11 15:19:23 +08:00
zhongyehong 97a90d9c89 add send email checkbox when creating notification, change the style of email checkbox 2016-07-02 17:14:19 +08:00
Thinginitself aefd2a7498 checkbox sendmail 2016-06-29 21:28:41 +08:00
zhuyj17 585420c768 Add billing to monitor and status page. 2016-06-26 21:42:25 +08:00
zhong yehong 066969c012 Revert "Revert "some modifications"" 2016-06-21 19:07:24 +08:00
zhong yehong f690c320e5 Revert "Revert "Add notification module"" 2016-06-21 19:05:45 +08:00
zhong yehong 652c5bb5e1 Revert "Add notification module" 2016-06-21 17:56:27 +08:00
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