Commit Graph

  • 44dd543422 add a script to auto deploy docklet worker. zhongyehong 2017-03-13 20:11:28 +0800
  • e52d124e65 Enable the Distributed_gw in conf. zhuyj17 2017-03-13 19:08:23 +0800
  • 576bf50525 Merge pull request #214 from zhongyehong/master zhong yehong 2017-03-13 18:54:01 +0800
  • 134aa84796 update prepare.sh zhongyehong 2017-03-13 16:48:38 +0800
  • 8f083d442e Enable user gateway to be set up on the worker. zhuyj17 2017-03-12 16:22:47 +0800
  • 7cef8f567f Merge pull request #213 from zhongyehong/master zhong yehong 2017-03-09 15:28:48 +0800
  • 239b4e6379 Merge remote-tracking branch 'upstream/master' zhongyehong 2017-03-09 15:24:46 +0800
  • 5e734e81aa add hyperlink to the project in github. zhongyehong 2017-03-09 15:23:55 +0800
  • 2cf548cd49 Merge pull request #211 from zhongyehong/master zhong yehong 2017-02-17 16:28:52 +0800
  • 20c2f8986e change the Dashboard to Workspace zhongyehong 2017-02-17 16:27:31 +0800
  • fab8ab4789 Merge pull request #209 from zhongyehong/master zhong yehong 2016-12-18 00:51:51 +0800
  • 48689cb1ff fix a bug zhongyehong 2016-12-18 00:49:11 +0800
  • ac8eea20f9 update upgrade.py zhongyehong 2016-12-17 17:55:39 +0800
  • d8629cb454 make admin email address config can be change in admin page don't compress when save image zhongyehong 2016-12-17 17:52:10 +0800
  • 5f5e506598 Merge pull request #208 from zhongyehong/master zhong yehong 2016-12-04 17:53:59 +0800
  • 01a06875bf fix an external login bug. zhongyehong 2016-12-04 17:52:50 +0800
  • 50d2d2edde Merge pull request #207 from zhongyehong/master zhong yehong 2016-12-04 17:49:58 +0800
  • 0e4b206d29 Merge branch 'external_login' zhongyehong 2016-12-04 17:42:27 +0800
  • f09b2a1674 Merge remote-tracking branch 'upstream/master' into external_login zhongyehong 2016-12-04 17:37:04 +0800
  • a729034525 save the image as a archived file all admins' email can receive remind mail zhongyehong 2016-12-04 17:35:10 +0800
  • 71a41c5d3d Merge pull request #205 from FirmlyReality/multimaster Yujian Zhu 2016-11-19 17:57:46 +0800
  • 0ee773e3a4 fix some bugs. zhuyj17 2016-11-19 17:55:59 +0800
  • e01f9c1f1c Seperate monitor from users' databases. zhuyj17 2016-11-19 17:39:10 +0800
  • 2016adb557 Merge pull request #203 from zhongyehong/multimaster zhong yehong 2016-11-17 15:50:23 +0800
  • e9403f1c3e fix some errors from merge zhongyehong 2016-11-17 15:40:58 +0800
  • 80aaa0f4e2 Merge remote-tracking branch 'upstream/master' into multimaster zhongyehong 2016-11-17 14:43:24 +0800
  • 1a8eef9867 change the user module to an independent http server. zhongyehong 2016-11-17 14:22:40 +0800
  • c184053e5b Merge pull request #202 from FirmlyReality/annotation Yujian Zhu 2016-11-13 14:43:49 +0800
  • f6bce94d63 Change billing parameters zhuyj17 2016-11-13 14:40:48 +0800
  • b64716ba96 Add annotation to beansapplicationmgr.py zhuyj17 2016-11-13 14:36:04 +0800
  • f5d29ef751 Fix a little bug zhuyj17 2016-11-13 13:57:48 +0800
  • 9bd64ac3c2 Add annotation to monitor.py zhuyj17 2016-11-13 13:46:12 +0800
  • 1cc6c4e8e9 Add annotations. zhuyj17 2016-11-12 17:52:09 +0800
  • 3bbba35145 'Billing this hour' on status realtime page will be updated by seconds. zhuyj17 2016-11-12 15:48:17 +0800
  • 9c7c433e63 Merge pull request #201 from FirmlyReality/billingbug Yujian Zhu 2016-10-31 23:51:34 +0800
  • bc6d5a5c9c Change billing parameters. zhuyj17 2016-10-31 23:49:56 +0800
  • 76622e3ed9 Fix the bug that can't send mail to remind users of beans. zhuyj17 2016-10-31 23:46:40 +0800
  • 78ef75b75f Fix a billing bug that avemem is not correct. zhuyj17 2016-10-31 10:45:33 +0800
  • feb02373fb Merge pull request #200 from FirmlyReality/billingbug Yujian Zhu 2016-10-30 21:09:16 +0800
  • a55a2db6e1 Fix the billing this hour bug zhuyj17 2016-10-30 17:29:23 +0800
  • 2b5383dd76 Fix billing this hour bug. zhuyj17 2016-10-30 17:05:16 +0800
  • ae5d9b9fd5 Fix a bug that reason can't input a new line. zhuyj17 2016-10-30 16:53:23 +0800
  • 950d533036 Billing this hour will display 0 when container is stopped. zhuyj17 2016-10-30 15:54:22 +0800
  • d9a7937ff9 Merge pull request #199 from FirmlyReality/billing zhong yehong 2016-10-29 17:50:04 +0800
  • c41771e0b7 Merge remote-tracking branch 'upstream/master' into external_login zhongyehong 2016-10-29 17:47:02 +0800
  • ae3453ee39 Merge remote-tracking branch 'upstream/master' zhongyehong 2016-10-29 17:43:36 +0800
  • f1db20c8ee Add billing this hour. zhuyj17 2016-10-23 23:42:29 +0800
  • ad2be9bad1 Display running time more clearly. zhuyj17 2016-10-23 22:52:01 +0800
  • ed6d0d6486 Modify some error message. zhuyj17 2016-10-23 22:36:02 +0800
  • 48424e7bf5 Modify billing parameters and let docklet send email to remind users of their beans. zhuyj17 2016-10-23 17:47:08 +0800
  • a51d2fba3e Merge pull request #198 from PedroLiu/master PedroLiu 2016-10-17 00:40:01 +0800
  • 6bf26e9d3d change the location of "chpassword" button in /user/list Peidong Liu 2016-10-17 00:38:25 +0800
  • f9f3a5eec8 Merge pull request #197 from FirmlyReality/stopallbug Yujian Zhu 2016-10-15 17:43:41 +0800
  • eec5310c6a Fix the bug of stop all cluster. Firmlyzhu 2016-10-15 17:38:39 +0800
  • 8d0ba2117c Merge pull request #196 from caodg/master Cao, Donggang 2016-10-12 10:38:45 +0800
  • 0fac84d833 fix small typo of README Donggang Cao 2016-10-12 10:37:51 +0800
  • 87f7716647 Merge pull request #195 from PedroLiu/master PedroLiu 2016-10-10 18:46:52 +0800
  • 299d98850c Merge branch 'scripts-operation' Peidong Liu 2016-10-10 01:48:36 +0800
  • 563f5620ae add chpassword in /user/info toggle some test codes Peidong Liu 2016-10-10 01:32:50 +0800
  • 791f52321b Merge pull request #194 from PedroLiu/master PedroLiu 2016-10-09 14:56:55 +0800
  • 89786e4b8d script operation test Peidong Liu 2016-10-09 14:45:04 +0800
  • ea47ab8e3b Merge pull request #193 from FirmlyReality/master Yujian Zhu 2016-10-07 00:08:21 +0800
  • b03e6efe28 Fix a bug. zhuyj17 2016-10-07 00:06:09 +0800
  • 5bd6bd7821 Merge pull request #192 from FirmlyReality/Fixabug Yujian Zhu 2016-10-06 15:24:47 +0800
  • b03018374a Fix a bug in monitor.py zhuyj17 2016-10-06 15:23:59 +0800
  • 356f609a4a fix a bug in etcd_multi_nodes.sh leebaok 2016-09-26 15:49:49 +0800
  • f50664315e not track home.html leebaok 2016-09-26 13:25:03 +0800
  • 857434b85e Merge pull request #191 from FirmlyReality/bug Yujian Zhu 2016-09-26 09:34:02 +0800
  • dcb85ef739 Fix little bugs. zhuyj17 2016-09-26 09:33:12 +0800
  • fad3beecfc Fix little bugs. zhuyj17 2016-09-26 09:31:23 +0800
  • 2f5351693c Merge pull request #190 from FirmlyReality/bug Yujian Zhu 2016-09-26 09:28:53 +0800
  • ea4ba5c1cf Fix some little bugs. zhuyj17 2016-09-26 09:28:05 +0800
  • f07ed7a023 Merge pull request #189 from FirmlyReality/ApprovalRobot Yujian Zhu 2016-09-25 21:08:26 +0800
  • f24f38ead4 Add approval robot. zhuyj17 2016-09-25 21:06:46 +0800
  • 8dfe21acd4 Add submission time to applymsg. zhuyj17 2016-09-25 17:17:34 +0800
  • becb8306ee Merge branch 'master' of https://github.com/zhongyehong/docklet zhongyehong 2016-09-23 17:21:05 +0800
  • a3c04cb5bd Merge remote-tracking branch 'upstream/master' zhongyehong 2016-09-23 17:14:00 +0800
  • e1f9c24b15 change the image from directory to an archive zhongyehong 2016-09-23 17:11:37 +0800
  • 95177efb19 Merge remote-tracking branch 'upstream/master' zhongyehong 2016-09-23 16:20:28 +0800
  • af90488927 add dependency in prepare.sh leebaok 2016-09-19 10:37:57 +0800
  • b6792f6632 Merge pull request #188 from PedroLiu/master Bao Li 2016-09-19 09:47:32 +0800
  • 9a2efd005b Merge pull request #187 from FirmlyReality/billing Yujian Zhu 2016-09-19 09:10:36 +0800
  • 617dcf2705 Add a 'apply' button beside the user's beans. zhuyj17 2016-09-17 17:57:42 +0800
  • 6853d39055 Administrator can agree or reject beans applications on user list page. zhuyj17 2016-09-17 17:50:09 +0800
  • 051a2126f6 Prevent user from applying beans when his/her beans are not less than 1000. zhuyj17 2016-09-17 15:25:10 +0800
  • 41d3db3c0e Add beans application page. zhuyj17 2016-09-15 18:04:12 +0800
  • f39b8467e9 Add a page to display beans applications information. Firmlyzhu 2016-09-12 16:56:45 +0800
  • 6712a4ad44 Add a column on User List page to display user's beans. Firmlyzhu 2016-09-12 16:15:25 +0800
  • fc214ff751 Small change zhuyj17 2016-09-12 15:02:29 +0800
  • 316f6bb864 change the worker heartbeat ttl from 60s to 2s zhongyehong 2016-09-12 15:01:50 +0800
  • 2bbca0b9d8 Add application database and some functions. zhuyj17 2016-09-11 17:06:52 +0800
  • 44cfecae1c Small change. zhuyj17 2016-09-11 11:31:34 +0800
  • 5c61b4c6b7 Add information of current billing on history page and shrink the beans icon. zhuyj17 2016-09-11 11:23:38 +0800
  • 86db4c8aa8 Merge pull request #186 from zhongyehong/master zhong yehong 2016-09-05 10:21:59 +0800
  • 947eea0482 Merge remote-tracking branch 'upstream/master' zhongyehong 2016-09-05 10:17:24 +0800
  • 3229126800 Merge pull request #185 from FirmlyReality/billing Yujian Zhu 2016-09-04 23:28:35 +0800
  • cac7a50901 Now admin need to type password twice to change a user's password Peidong Liu 2016-09-04 14:48:46 +0800
  • 390077535a Now chpassword is a independent button PedroLiu 2016-09-02 23:38:02 +0800
  • e33cd5fac1 add a button to update base image in admin page zhongyehong 2016-08-26 18:10:41 +0800
  • bb8614ab65 Merge remote-tracking branch 'upstream/master' zhongyehong 2016-08-24 17:07:03 +0800