Commit Graph

173 Commits

Author SHA1 Message Date
zhongyh16 4e93b6d11a Merge remote-tracking branch 'upstream/master' 2017-05-08 15:55:36 +08:00
zhongyh16 12bf36cb7a fix a bug of waiting dead worker 2017-05-08 15:47:34 +08:00
zhongyh16 fdbde29934 modify the addcluster page
change the ttl of heartbeat
create a new rpc client when execute a rpc call
2017-05-07 15:47:21 +08:00
zhuyj17 b38f611228 fix some bug 2017-04-30 17:57:34 +08:00
zhuyj17 38854367ed Change proxy url to let user can change distributed gateway to non-distributed. 2017-04-29 17:00:34 +08:00
zhuyj17 6b1b96a95b fix confilct 2017-04-25 08:17:34 +08:00
zhuyj17 59aa00fcb3 edit proxy_url 2017-04-18 16:45:04 +08:00
zhuyj17 468adef76a save usrgw in etcd 2017-04-18 01:27:50 +08:00
zhongyh16 1bab7f93cd add external_login url 2017-04-17 13:22:13 +08:00
zhuyj17 94d2028986 add nginx proxy 2017-04-11 07:56:55 +08:00
zhongyh16 8458d41bd8 stop debug mode 2017-04-10 15:27:41 +08:00
zhongyh16 974cb13811 Merge remote-tracking branch 'upstream/master' 2017-04-10 15:27:00 +08:00
zhongyh16 669afabd1b fix a bug in data table 2017-04-10 15:21:39 +08:00
zhongyh16 0bdc313258 monitor part of multiple master 2017-04-09 18:18:12 +08:00
zhongyh16 21cb80346d multiple master 2017-04-07 16:25:57 +08:00
zhuyj17 58c9a5178b Fix a bug of rpc when worker is stopped 2017-03-25 17:50:42 +08:00
zhongyehong e714049d54 Merge remote-tracking branch 'upstream/multimaster' 2017-03-19 20:47:55 +08:00
zhuyj17 afaaf5e86f Set proxy route by rpc. 2017-03-19 16:02:53 +08:00
zhongyehong 5e734e81aa add hyperlink to the project in github. 2017-03-09 15:23:55 +08:00
zhongyehong 20c2f8986e change the Dashboard to Workspace 2017-02-17 16:27:31 +08:00
zhongyehong 01a06875bf fix an external login bug. 2016-12-04 17:52:50 +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
zhuyj17 3bbba35145 'Billing this hour' on status realtime page will be updated by seconds. 2016-11-12 15:48:17 +08:00
zhuyj17 2b5383dd76 Fix billing this hour bug. 2016-10-30 17:05:16 +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
Peidong Liu 6bf26e9d3d change the location of "chpassword" button in /user/list 2016-10-17 00:38:25 +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
leebaok f50664315e not track home.html 2016-09-26 13:25:03 +08:00
zhuyj17 8dfe21acd4 Add submission time to applymsg. 2016-09-25 17:17:34 +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
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 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
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
zhongyehong 947eea0482 Merge remote-tracking branch 'upstream/master' 2016-09-05 10:17:24 +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 7d883432ac Display error message when failing to start cluster. 2016-08-21 15:30:59 +08:00
zhuyj17 4656b1866e Fetch data of beans from server and display it on the page. 2016-08-10 17:16:45 +08:00
zhuyj17 64c16c6c3f Add a icon of bean on page. 2016-08-10 16:45:46 +08:00