Commit Graph

427 Commits

Author SHA1 Message Date
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
zhong yehong 4e32b718e4 Merge pull request #169 from zhongyehong/master
mail module
2016-07-02 17:23:48 +08:00
zhongyehong cf358de156 Merge branch 'Thinginitself-checkbox' 2016-07-02 17:16:30 +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
zhongyehong 304355dfab fix some bug in mail module 2016-07-02 17:01:25 +08:00
Thinginitself aefd2a7498 checkbox sendmail 2016-06-29 21:28:41 +08:00
zhong yehong 2fe9c01cf4 Merge pull request #157 from FirmlyReality/billing
Billing
2016-06-28 11:40:25 +08:00
zhuyj17 585420c768 Add billing to monitor and status page. 2016-06-26 21:42:25 +08:00
zhuyj17 0f00f854ac Add billing in monitor. 2016-06-26 21:30:57 +08:00
zhong yehong 1c1ca65e15 Merge pull request #153 from unias/revert-150-revert-149-master
Revert "Revert "some modifications""
2016-06-21 19:09:31 +08:00
zhong yehong 066969c012 Revert "Revert "some modifications"" 2016-06-21 19:07:24 +08:00
zhong yehong a329f84770 Merge pull request #152 from unias/revert-151-revert-148-master
Revert "Revert "Add notification module""
2016-06-21 19:06:53 +08:00
zhong yehong f690c320e5 Revert "Revert "Add notification module"" 2016-06-21 19:05:45 +08:00
zhong yehong 81526596ac Merge pull request #151 from unias/revert-148-master
Revert "Add notification module"
2016-06-21 17:57:03 +08:00
zhong yehong 652c5bb5e1 Revert "Add notification module" 2016-06-21 17:56:27 +08:00
zhong yehong 78eba37a70 Merge pull request #150 from unias/revert-149-master
Revert "some modifications"
2016-06-21 17:56:04 +08:00
zhong yehong 0535bcd244 Revert "some modifications" 2016-06-21 17:55:36 +08:00
zhong yehong 1da7e26378 Merge pull request #149 from zhongyehong/master
some modifications
2016-06-21 17:37:51 +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
zhong yehong f56d07b4f5 Merge pull request #148 from tangxiaoshuang/master
Add notification module
2016-06-21 17:12:20 +08:00
tangshuangpku@hotmail.com 61167b5680 还原调试设置 2016-06-18 14:07:19 +08:00
tangshuangpku@hotmail.com cca4a91726 删除文档 2016-06-18 14:04:48 +08:00
tangshuangpku@hotmail.com 41cb13f0d8 删除文档 2016-06-18 13:55:52 +08:00
tangshuangpku@hotmail.com 7c7411eff7 Merge remote-tracking branch 'upstream/experiment' 2016-06-08 12:20:04 +08:00
tangshuangpku@hotmail.com 4e1b2aa00f 添加文档 2016-06-08 12:19:56 +08:00
Bao Li 19b60a8aa4 Merge pull request #133 from FirmlyReality/experiment
Add 2016-monitor
2016-06-07 21:06:51 -05:00
zhuyj17 243d180ab6 Add 2016-monitor 2016-06-08 01:09:13 +08:00
zhuyj17 10dfefe5bd Merge branch 'experiment' of https://github.com/unias/docklet into experiment 2016-06-08 01:06:36 +08:00
tangshuangpku@hotmail.com d54caef30e 添加新接口 2016-06-07 22:19:31 +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