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

418 Commits

Author SHA1 Message Date
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
leebaok 356f609a4a fix a bug in etcd_multi_nodes.sh 2016-09-26 15:49:49 +08:00
leebaok f50664315e not track home.html 2016-09-26 13:25:03 +08:00
Yujian Zhu 857434b85e Merge pull request #191 from FirmlyReality/bug 
Fix some bugs
 2016-09-26 09:34:02 +08:00
zhuyj17 dcb85ef739 Fix little bugs. 2016-09-26 09:33:12 +08:00
zhuyj17 fad3beecfc Fix little bugs. 2016-09-26 09:31:23 +08:00
Yujian Zhu 2f5351693c Merge pull request #190 from FirmlyReality/bug 
Fix some little bugs.
 2016-09-26 09:28:53 +08:00
zhuyj17 ea4ba5c1cf Fix some little bugs. 2016-09-26 09:28:05 +08:00
Yujian Zhu f07ed7a023 Merge pull request #189 from FirmlyReality/ApprovalRobot 
Approval robot
 2016-09-25 21:08:26 +08:00
zhuyj17 f24f38ead4 Add approval robot. 2016-09-25 21:06:46 +08:00
zhuyj17 8dfe21acd4 Add submission time to applymsg. 2016-09-25 17:17:34 +08:00
zhongyehong becb8306ee Merge branch 'master' of https://github.com/zhongyehong/docklet 2016-09-23 17:21:05 +08:00
zhongyehong a3c04cb5bd Merge remote-tracking branch 'upstream/master' 2016-09-23 17:14:00 +08:00
zhongyehong e1f9c24b15 change the image from directory to an archive 2016-09-23 17:11:37 +08:00
zhongyehong 95177efb19 Merge remote-tracking branch 'upstream/master' 2016-09-23 16:20:28 +08:00
leebaok af90488927 add dependency in prepare.sh 2016-09-19 10:37:57 +08:00
Bao Li b6792f6632 Merge pull request #188 from PedroLiu/master 
Now chpassword is a independent button
 2016-09-19 09:47:32 +08:00
Yujian Zhu 9a2efd005b Merge pull request #187 from FirmlyReality/billing 
Billing
 2016-09-19 09:10:36 +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 051a2126f6 Prevent user from applying beans when his/her beans are not less than 1000. 2016-09-17 15:25:10 +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
zhongyehong 316f6bb864 change the worker heartbeat ttl from 60s to 2s 2016-09-12 15:01:50 +08:00
zhuyj17 2bbca0b9d8 Add application database and some functions. 2016-09-11 17:06:52 +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
zhong yehong 86db4c8aa8 Merge pull request #186 from zhongyehong/master 
update base image
 2016-09-05 10:21:59 +08:00
zhongyehong 947eea0482 Merge remote-tracking branch 'upstream/master' 2016-09-05 10:17:24 +08:00
Yujian Zhu 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
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 b8f2635e3b Fix a bug in billing_increment 2016-08-21 17:41:26 +08:00
zhuyj17 7cbf2021e3 Complete work. 2016-08-21 17:30:33 +08:00
zhuyj17 cfa40f96f6 Add update-UserTable.sh 2016-08-21 17:18:56 +08:00
zhuyj17 7d883432ac Display error message when failing to start cluster. 2016-08-21 15:30:59 +08:00