zhong yehong
|
613c5cee4a
|
Merge pull request #349 from zhongyehong/master
support user to report a bug in dashboard
|
2018-11-09 19:02:00 +08:00 |
|
zhongyehong
|
0c71df4804
|
Merge remote-tracking branch 'upstream/master'
|
2018-11-09 19:00:48 +08:00 |
|
zhongyehong
|
f84661bb69
|
support user to report a bug in dashboard
|
2018-11-09 18:58:46 +08:00 |
|
Yujian Zhu
|
62d2c6bbbc
|
Merge pull request #346 from FirmlyReality/master
update status.html that use container name to tag the data
|
2018-10-22 00:48:21 +08:00 |
|
zhuyj17
|
949b77c9b8
|
update status.html
|
2018-10-22 00:47:06 +08:00 |
|
zhong yehong
|
b4d72a809b
|
Merge pull request #344 from zhongyehong/master
release lock when exception occur
|
2018-10-21 14:57:08 +08:00 |
|
zhongyehong
|
e765225d62
|
release lock when exception occur
|
2018-10-21 14:00:50 +08:00 |
|
zhongyehong
|
6d29858905
|
release lock when exception occur
|
2018-10-20 21:33:55 +08:00 |
|
Yujian Zhu
|
d190b90766
|
Merge pull request #341 from FirmlyReality/master
Aggregate api of monitor at the backend
|
2018-10-14 22:47:59 +08:00 |
|
zhuyj17
|
6a3e1eace7
|
Aggregate http request on status realtime pages for monitor information
|
2018-10-14 22:45:24 +08:00 |
|
zhuyj17
|
c1ba31a4b6
|
Aggregate api of monitor at the backend
|
2018-10-14 21:34:46 +08:00 |
|
Yujian Zhu
|
69059c3fff
|
Merge pull request #337 from FirmlyReality/login_info
further update
|
2018-09-20 00:24:49 +08:00 |
|
zhuyj17
|
f5e960a80a
|
further update
|
2018-09-20 00:23:43 +08:00 |
|
Yujian Zhu
|
b07eb75a62
|
Merge pull request #336 from FirmlyReality/login_info
Prevent users that is not activated from applying for beans
|
2018-09-20 00:19:57 +08:00 |
|
zhuyj17
|
4ddab4fa4b
|
Check if user is activated before applying for beans
|
2018-09-20 00:16:53 +08:00 |
|
zhuyj17
|
7497e58bdc
|
Fix a bug of not import urlencode
|
2018-09-19 22:57:16 +08:00 |
|
Yujian Zhu
|
cba223104c
|
Merge pull request #335 from FirmlyReality/login_info
Login info
|
2018-09-16 23:22:31 +08:00 |
|
Firmlyzhu
|
7e470463b1
|
add login info into db
|
2018-09-16 16:18:06 +08:00 |
|
Firmlyzhu
|
987077e7d7
|
Add information of login to user log
|
2018-09-16 15:52:15 +08:00 |
|
Firmlyzhu
|
46ea09828d
|
fix a bug that net stats can't be shown
|
2018-09-16 14:56:27 +08:00 |
|
Yujian Zhu
|
d64b39bcc4
|
Merge pull request #322 from FirmlyReality/master
Check if number field is null before submit application for beans
|
2018-08-07 17:43:22 +08:00 |
|
zhuyj17
|
62fdaa489e
|
Check if number field is null before submit application for beans
|
2018-08-07 17:26:16 +08:00 |
 amber
|
4c3b11cc25
|
Merge pull request #301 from FirmlyReality/tidycode
Tidycode
|
2018-06-12 10:04:13 +08:00 |
|
zhuyj17
|
95ab1104f4
|
Tide user and web code
|
2018-06-11 00:14:41 +08:00 |
|
zhuyj17
|
1315ca0c3a
|
Tidy master code
|
2018-06-10 23:53:21 +08:00 |
|
zhuyj17
|
183ccb3d21
|
Rename com to utils
|
2018-06-04 01:22:50 +08:00 |
|
zhuyj17
|
18d9ea08fd
|
Rename com to utils
|
2018-06-04 01:16:32 +08:00 |
|
zhuyj17
|
868be0c8c0
|
Tidy master codes
|
2018-05-27 17:17:08 +08:00 |
|
zhuyj17
|
9b8a9a7135
|
Tidy worker codes
|
2018-05-27 17:09:09 +08:00 |
|
zhuyj17
|
9fb63fb475
|
Tide worker codes
|
2018-05-27 17:08:44 +08:00 |
|
zhuyj17
|
c486930d8f
|
tidy worker codes
|
2018-05-27 15:52:45 +08:00 |
|
zhong yehong
|
fbe88b0cbb
|
Merge pull request #297 from zhongyehong/master
Implement addnode function on aliyun cloud
|
2018-05-20 17:42:35 +08:00 |
|
zhongyehong
|
b40fad7acc
|
Add a parameter to control whether the add node function is enabled.
|
2018-05-20 17:32:35 +08:00 |
|
zhongyehong
|
490a9901ac
|
allow root change the cloud setting in cloud pannel
|
2018-05-20 17:16:56 +08:00 |
|
zhongyehong
|
37c9b13e28
|
Merge remote-tracking branch 'upstream/master'
|
2018-05-20 16:08:00 +08:00 |
|
zhongyehong
|
d3750eb7f8
|
Implement addnode function on aliyun cloud
|
2018-05-20 16:05:11 +08:00 |
|
zhongyehong
|
2ca69b8e47
|
adding scale module
|
2018-05-13 13:21:17 +08:00 |
|
Yujian Zhu
|
16cfef3219
|
Merge pull request #295 from FirmlyReality/file2db
File2db
|
2018-04-22 16:03:55 +08:00 |
|
zhuyj17
|
03df782f62
|
Merge branch 'master' of https://github.com/unias/docklet into file2db
|
2018-04-22 15:59:09 +08:00 |
|
zhuyj17
|
3e999e4511
|
1.Fix bugs on upgrade script. 2. Can't add port mappings when cluster is stopped.
|
2018-04-22 15:58:41 +08:00 |
|
zhuyj17
|
5d8abf2d44
|
Add a python script to upgrade
|
2018-04-22 15:21:19 +08:00 |
|
zhong yehong
|
b82498eae9
|
Merge pull request #294 from zhongyehong/master
Modified recovery mode
|
2018-04-22 14:47:26 +08:00 |
|
zhongyehong
|
984819686e
|
fix a bug caused by merge
|
2018-04-22 14:45:04 +08:00 |
|
zhongyehong
|
867ee221b6
|
fix a bug of displaying copy button
|
2018-04-22 14:23:32 +08:00 |
|
zhongyehong
|
d5bc0e583d
|
Merge remote-tracking branch 'upstream/master'
|
2018-04-22 14:06:43 +08:00 |
|
zhongyehong
|
39fcf8a26f
|
Modified recovery mode
|
2018-04-22 14:03:41 +08:00 |
|
zhuyj17
|
0cbb288175
|
Add BillingHistory model and fix a bug when use db to bill
|
2018-04-22 12:39:54 +08:00 |
|
Yujian Zhu
|
7ba93cfa65
|
Merge pull request #293 from FirmlyReality/file2db
Use database when operating on clusters, containers, ports mappings and images.
|
2018-04-15 23:50:58 +08:00 |
|
zhuyj17
|
d959b6f23e
|
Update copy image to use db
|
2018-04-15 22:52:00 +08:00 |
|
zhuyj17
|
c152d8650a
|
Fix conlicts
|
2018-04-14 00:25:05 +08:00 |