Commit Graph

263 Commits

Author SHA1 Message Date
Firmlyzhu 8382be2837 Set 0 to unlimit the input rate limit 2017-12-08 17:27:43 +08:00
Firmlyzhu 50f1f5aa32 fix a bug on status.html when gateways are not set up 2017-12-08 16:58:32 +08:00
Firmlyzhu 0853ec5f25 fix some bugs on billing_history 2017-12-05 17:47:06 +08:00
Firmlyzhu 8e63b80ed2 add rate graph 2017-12-05 17:04:50 +08:00
Firmlyzhu 911e7b2f6e Merge branch 'master' of https://github.com/unias/docklet into networkbillings 2017-12-05 15:54:01 +08:00
zhuyj17 51ae3d88b7 add rate graph 2017-12-05 15:50:32 +08:00
GallenShao 22745d2f04 merge branch 'beans' into master 2017-12-04 12:03:25 +08:00
GallenShao 8dc8cc2cb6 add billing detail and billing history detail 2017-12-04 11:52:45 +08:00
zhuyj17 8cd49f4c84 add network billings 2017-12-04 02:10:25 +08:00
zhuyj17 0637d81304 add monitoring of gateways 2017-12-04 01:40:04 +08:00
Firmlyzhu db6aeda16f add hyperlink to billings document besides beans 2017-11-26 15:56:15 +08:00
zhuyj17 0fca69aec6 add network stats to monitoring 2017-11-26 14:15:58 +08:00
zhuyj17 47b28e12e8 add description into quota editing. 2017-11-24 15:13:26 +08:00
zhuyj17 8571498063 limit quota of vnode to 2^n -3 2017-11-24 15:01:33 +08:00
GallenShao 0060cf6fab
Merge branch 'master' into master 2017-11-20 09:10:35 +08:00
zhuyj17 7ccae98b23 update status quota 2017-11-20 00:40:27 +08:00
GallenShao 4ab4e5b4ca add multiple port mapping and quota 2017-11-19 22:15:07 +08:00
zhongyh16 6fbcac579e fix a bug of xmlrpc client setup
fix a bug of image list
2017-09-13 14:44:45 +08:00
Firmlyzhu a0387fce44 remove proxy & fix some bugs on config.html 2017-07-16 12:24:58 +08:00
zhuyj17 05317336de Add Port Mapping 2017-07-10 23:48:06 +08:00
zhongyh16 58bda3c0f9 change the format of url, place the masterip on the second field 2017-06-26 18:46:01 +08:00
zhongyh16 8602b9b34d change some field in the settings page 2017-06-16 16:07:00 +08:00
zhongyh16 28f5a05cd7 change the admin page to settings page
move editable setting to settings page
change the settings request from master to user
add 2 editable settings:OPEN_REGISTRY and APPROVAL_RBT
remove some setting from docklet.conf.template
2017-06-16 16:01:46 +08:00
Peidong Liu 2057f4535b now in /settings/, admin can input several email addreses instead of only one
delete mail settings in /admin/ (need to reconfig the docklet.conf)
2017-06-16 01:18:35 +08:00
zhongyh16 551f2ffd16 change help url
change the order of master start
2017-06-07 13:32:13 +08:00
zhongyh16 3cf3d482c9 add OPEN_REGISTRY to control whether allow user to register a new
account.
2017-06-05 15:30:27 +08:00
Firmlyzhu c78bf1c0c2 Add public IP 2017-05-29 16:45:35 +08:00
zhongyh16 148fa72d2a add master description in dashboard and addcluster page 2017-05-21 16:08:12 +08:00
zhongyh16 d23005569a change the interval of heartbeat function 2017-05-15 13:23:37 +08:00
Peidong Liu 236081e5af fix another bug 2017-05-08 17:01:57 +08:00
Peidong Liu 3551b9e524 fix some bugs when merging 2017-05-08 16:55:20 +08:00
Peidong Liu 00761061d4 merge my own branches & fix some bugs 2017-05-08 16:53:49 +08:00
Peidong Liu 8986dbff57 change the time of reading e-mail address 2017-05-08 16:53:30 +08:00
zhuyj17 7b08e78cb9 fix some bug 2017-05-08 16:52:30 +08:00
zhuyj17 546c4b3608 edit proxy_url 2017-05-08 16:48:43 +08:00
zhongyh16 01ff009ca2 stop debug mode 2017-05-08 16:44:32 +08:00
zhongyh16 375abd85b7 monitor part of multiple master 2017-05-08 16:42:57 +08:00
zhongyh16 3b17bd33a3 multiple master 2017-05-08 16:40:31 +08:00
zhongyehong 0fd1e571c2 change the user module to an independent http server. 2017-05-08 16:26:08 +08:00
Peidong Liu d37e2e066a change the time of reading e-mail address 2017-05-08 16:22:30 +08:00
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
Yujian Zhu 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
zhuyj17 50a24d4f95 Add history page and user can query all history of created vnodes. 2016-08-07 17:10:18 +08:00
zhong yehong 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
Peidong Liu 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
root fc4139b852 Fix notification 2016-08-02 16:30:17 +08:00
zhuyj17 63a2d387bd Add button to history page on status page. 2016-07-24 18:23:27 +08:00
zhuyj17 d0ab069657 Add history in web. 2016-07-24 13:51:01 +08:00
zhongyehong 8291643929 default container cpu, memory and disk can be modify in admin page 2016-07-21 19:19:53 +08:00
zhongyehong 64c228ea88 init usage info when start docklet with init mode 2016-07-21 17:43:26 +08:00
zhuyj17 3a608caa7c Change the interval to update the info on webpage. 2016-07-17 10:22:59 +08:00