zhongyehong
|
01a06875bf
|
fix an external login bug.
|
2016-12-04 17:52:50 +08:00 |
|
zhong yehong
|
50d2d2edde
|
Merge pull request #207 from zhongyehong/master
save the image as an archived file
|
2016-12-04 17:49:58 +08:00 |
|
zhongyehong
|
0e4b206d29
|
Merge branch 'external_login'
|
2016-12-04 17:42:27 +08:00 |
|
zhongyehong
|
f09b2a1674
|
Merge remote-tracking branch 'upstream/master' into external_login
|
2016-12-04 17:37:04 +08:00 |
|
zhongyehong
|
a729034525
|
save the image as a archived file
all admins' email can receive remind mail
|
2016-12-04 17:35:10 +08:00 |
|
Yujian Zhu
|
71a41c5d3d
|
Merge pull request #205 from FirmlyReality/multimaster
Multimaster
|
2016-11-19 17:57:46 +08:00 |
|
zhuyj17
|
0ee773e3a4
|
fix some bugs.
|
2016-11-19 17:55:59 +08:00 |
|
zhuyj17
|
e01f9c1f1c
|
Seperate monitor from users' databases.
|
2016-11-19 17:39:10 +08:00 |
|
zhong yehong
|
2016adb557
|
Merge pull request #203 from zhongyehong/multimaster
Multimaster
|
2016-11-17 15:50:23 +08:00 |
|
zhongyehong
|
e9403f1c3e
|
fix some errors from merge
|
2016-11-17 15:40:58 +08:00 |
|
zhongyehong
|
80aaa0f4e2
|
Merge remote-tracking branch 'upstream/master' into multimaster
|
2016-11-17 14:43:24 +08:00 |
|
zhongyehong
|
1a8eef9867
|
change the user module to an independent http server.
|
2016-11-17 14:22:40 +08:00 |
|
Yujian Zhu
|
c184053e5b
|
Merge pull request #202 from FirmlyReality/annotation
Annotation
|
2016-11-13 14:43:49 +08:00 |
|
zhuyj17
|
f6bce94d63
|
Change billing parameters
|
2016-11-13 14:40:48 +08:00 |
|
zhuyj17
|
b64716ba96
|
Add annotation to beansapplicationmgr.py
|
2016-11-13 14:36:04 +08:00 |
|
zhuyj17
|
f5d29ef751
|
Fix a little bug
|
2016-11-13 13:57:48 +08:00 |
|
zhuyj17
|
9bd64ac3c2
|
Add annotation to monitor.py
|
2016-11-13 13:46:12 +08:00 |
|
zhuyj17
|
1cc6c4e8e9
|
Add annotations.
|
2016-11-12 17:52:09 +08:00 |
|
zhuyj17
|
3bbba35145
|
'Billing this hour' on status realtime page will be updated by seconds.
|
2016-11-12 15:48:17 +08:00 |
|
Yujian Zhu
|
9c7c433e63
|
Merge pull request #201 from FirmlyReality/billingbug
Billingbug
|
2016-10-31 23:51:34 +08:00 |
|
zhuyj17
|
bc6d5a5c9c
|
Change billing parameters.
|
2016-10-31 23:49:56 +08:00 |
|
zhuyj17
|
76622e3ed9
|
Fix the bug that can't send mail to remind users of beans.
|
2016-10-31 23:46:40 +08:00 |
|
zhuyj17
|
78ef75b75f
|
Fix a billing bug that avemem is not correct.
|
2016-10-31 10:45:33 +08:00 |
|
Yujian Zhu
|
feb02373fb
|
Merge pull request #200 from FirmlyReality/billingbug
Billingbug
|
2016-10-30 21:09:16 +08:00 |
|
zhuyj17
|
a55a2db6e1
|
Fix the billing this hour bug
|
2016-10-30 17:29:23 +08:00 |
|
zhuyj17
|
2b5383dd76
|
Fix billing this hour bug.
|
2016-10-30 17:05:16 +08:00 |
|
zhuyj17
|
ae5d9b9fd5
|
Fix a bug that reason can't input a new line.
|
2016-10-30 16:53:23 +08:00 |
|
zhuyj17
|
950d533036
|
Billing this hour will display 0 when container is stopped.
|
2016-10-30 15:54:22 +08:00 |
|
zhong yehong
|
d9a7937ff9
|
Merge pull request #199 from FirmlyReality/billing
Billing
|
2016-10-29 17:50:04 +08:00 |
|
zhongyehong
|
c41771e0b7
|
Merge remote-tracking branch 'upstream/master' into external_login
|
2016-10-29 17:47:02 +08:00 |
|
zhongyehong
|
ae3453ee39
|
Merge remote-tracking branch 'upstream/master'
|
2016-10-29 17:43:36 +08:00 |
|
zhuyj17
|
f1db20c8ee
|
Add billing this hour.
|
2016-10-23 23:42:29 +08:00 |
|
zhuyj17
|
ad2be9bad1
|
Display running time more clearly.
|
2016-10-23 22:52:01 +08:00 |
|
zhuyj17
|
ed6d0d6486
|
Modify some error message.
|
2016-10-23 22:36:02 +08:00 |
|
zhuyj17
|
48424e7bf5
|
Modify billing parameters and let docklet send email to remind users of their beans.
|
2016-10-23 17:47:08 +08:00 |
|
PedroLiu
|
a51d2fba3e
|
Merge pull request #198 from PedroLiu/master
change the location of "chpassword" button in /user/list
|
2016-10-17 00:40:01 +08:00 |
|
Peidong Liu
|
6bf26e9d3d
|
change the location of "chpassword" button in /user/list
|
2016-10-17 00:38:25 +08:00 |
|
Yujian Zhu
|
f9f3a5eec8
|
Merge pull request #197 from FirmlyReality/stopallbug
Fix the bug of stop all cluster.
|
2016-10-15 17:43:41 +08:00 |
|
Firmlyzhu
|
eec5310c6a
|
Fix the bug of stop all cluster.
|
2016-10-15 17:38:39 +08:00 |
|
Cao, Donggang
|
8d0ba2117c
|
Merge pull request #196 from caodg/master
fix small typo of README
|
2016-10-12 10:38:45 +08:00 |
|
Donggang Cao
|
0fac84d833
|
fix small typo of README
|
2016-10-12 10:37:51 +08:00 |
|
PedroLiu
|
87f7716647
|
Merge pull request #195 from PedroLiu/master
Now local user can change password in /user/info
|
2016-10-10 18:46:52 +08:00 |
|
Peidong Liu
|
299d98850c
|
Merge branch 'scripts-operation'
|
2016-10-10 01:48:36 +08:00 |
|
Peidong Liu
|
563f5620ae
|
add chpassword in /user/info
toggle some test codes
|
2016-10-10 01:32:50 +08:00 |
|
PedroLiu
|
791f52321b
|
Merge pull request #194 from PedroLiu/master
Now admin need to type password twice to change a user's password
|
2016-10-09 14:56:55 +08:00 |
|
Peidong Liu
|
89786e4b8d
|
script operation test
|
2016-10-09 14:45:04 +08:00 |
|
Yujian Zhu
|
ea47ab8e3b
|
Merge pull request #193 from FirmlyReality/master
Fix a bug.
|
2016-10-07 00:08:21 +08:00 |
|
zhuyj17
|
b03e6efe28
|
Fix a bug.
|
2016-10-07 00:06:09 +08:00 |
|
Yujian Zhu
|
5bd6bd7821
|
Merge pull request #192 from FirmlyReality/Fixabug
Fix a bug in monitor.py
|
2016-10-06 15:24:47 +08:00 |
|
zhuyj17
|
b03018374a
|
Fix a bug in monitor.py
|
2016-10-06 15:23:59 +08:00 |