8dfe21acd4
Add submission time to applymsg.
2016-09-25 17:17:34 +08:00
becb8306ee
Merge branch 'master' of https://github.com/zhongyehong/docklet
2016-09-23 17:21:05 +08:00
a3c04cb5bd
Merge remote-tracking branch 'upstream/master'
2016-09-23 17:14:00 +08:00
e1f9c24b15
change the image from directory to an archive
2016-09-23 17:11:37 +08:00
95177efb19
Merge remote-tracking branch 'upstream/master'
2016-09-23 16:20:28 +08:00
af90488927
add dependency in prepare.sh
2016-09-19 10:37:57 +08:00
b6792f6632
Merge pull request #188 from PedroLiu/master
...
Now chpassword is a independent button
2016-09-19 09:47:32 +08:00
9a2efd005b
Merge pull request #187 from FirmlyReality/billing
...
Billing
2016-09-19 09:10:36 +08:00
617dcf2705
Add a 'apply' button beside the user's beans.
2016-09-17 17:57:42 +08:00
6853d39055
Administrator can agree or reject beans applications on user list page.
2016-09-17 17:50:09 +08:00
051a2126f6
Prevent user from applying beans when his/her beans are not less than 1000.
2016-09-17 15:25:10 +08:00
41d3db3c0e
Add beans application page.
2016-09-15 18:04:12 +08:00
f39b8467e9
Add a page to display beans applications information.
2016-09-12 16:56:45 +08:00
6712a4ad44
Add a column on User List page to display user's beans.
2016-09-12 16:15:25 +08:00
fc214ff751
Small change
2016-09-12 15:02:29 +08:00
316f6bb864
change the worker heartbeat ttl from 60s to 2s
2016-09-12 15:01:50 +08:00
2bbca0b9d8
Add application database and some functions.
2016-09-11 17:06:52 +08:00
44cfecae1c
Small change.
2016-09-11 11:31:34 +08:00
5c61b4c6b7
Add information of current billing on history page and shrink the beans icon.
2016-09-11 11:23:38 +08:00
86db4c8aa8
Merge pull request #186 from zhongyehong/master
...
update base image
2016-09-05 10:21:59 +08:00
947eea0482
Merge remote-tracking branch 'upstream/master'
2016-09-05 10:17:24 +08:00
3229126800
Merge pull request #185 from FirmlyReality/billing
...
Add Billing system to docklet. Please run "sudo tools/update-UserTable.sh" to update User Table before starting the system! You could send email to firmlyzhu@163.com if you have any problem.
2016-09-04 23:28:35 +08:00
cac7a50901
Now admin need to type password twice to change a user's password
2016-09-04 14:48:46 +08:00
390077535a
Now chpassword is a independent button
2016-09-02 23:38:02 +08:00
e33cd5fac1
add a button to update base image in admin page
2016-08-26 18:10:41 +08:00
bb8614ab65
Merge remote-tracking branch 'upstream/master'
2016-08-24 17:07:03 +08:00
b8f2635e3b
Fix a bug in billing_increment
2016-08-21 17:41:26 +08:00
7cbf2021e3
Complete work.
2016-08-21 17:30:33 +08:00
cfa40f96f6
Add update-UserTable.sh
2016-08-21 17:18:56 +08:00
7d883432ac
Display error message when failing to start cluster.
2016-08-21 15:30:59 +08:00
dcb0b91302
System will prevent user from creating,starting and scaleouting when beans are less than or equal to zero.
2016-08-18 18:09:05 +08:00
522ffb81f3
Add stopall url to httprest and system will stop a user's all clusters when his beans are less than or equal to zero.
2016-08-18 17:48:59 +08:00
4656b1866e
Fetch data of beans from server and display it on the page.
2016-08-10 17:16:45 +08:00
64c16c6c3f
Add a icon of bean on page.
2016-08-10 16:45:46 +08:00
e3bb1e1974
Edit alterUserTable.py
2016-08-10 15:39:32 +08:00
1230abdd4a
Merge branch 'master' of https://github.com/unias/docklet into billing
2016-08-10 14:33:10 +08:00
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
50a24d4f95
Add history page and user can query all history of created vnodes.
2016-08-07 17:10:18 +08:00
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
1db12812eb
Merge pull request #183 from PedroLiu/master
...
Finished 3 issues
2016-08-04 22:09:23 +08:00
925634cfcd
Merge branch 'master' of https://github.com/PedroLiu/docklet
2016-08-04 22:04:24 +08:00
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
2054182cbf
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 21:58:08 +08:00
fc4139b852
Fix notification
2016-08-02 16:30:17 +08:00
4ba7d3c2da
Merge pull request #181 from zhongyehong/customSetting
...
fix bug that docklet don't create generated_password file
2016-08-01 17:26:29 +08:00
f2e209cb42
fix bug that docklet don't create generated_password file
2016-08-01 17:24:43 +08:00
c1454e14d7
Add beans to User table
2016-07-31 15:39:04 +08:00
b7fadb3489
Merge pull request #179 from zhongyehong/customSetting
...
update CHANGES and VERSION
2016-07-28 12:03:43 +08:00
2da24f9176
update date
2016-07-28 12:01:53 +08:00
b26bb6b274
update CHANGES and VERSION
2016-07-28 12:01:11 +08:00
zhuyj17