13621160019@163.com
|
5b21d77f94
|
Merge branch 'develop'
|
2021-11-10 12:27:34 +08:00 |
|
13621160019@163.com
|
5c900e9a82
|
fixed issue in on_delete of gateway in API
|
2021-11-10 12:25:05 +08:00 |
|
13621160019@163.com
|
3f9e36b276
|
Merge branch 'develop'
|
2021-11-09 21:53:14 +08:00 |
|
13621160019@163.com
|
9e14d82ce8
|
upgraded falcon framework to v3.0.1 in API
Merge branch 'PR79' into develop
|
2021-11-09 21:50:19 +08:00 |
|
13621160019@163.com
|
5d0679d60a
|
recovered usage of falcon_cors middleware in API
|
2021-11-09 21:50:05 +08:00 |
|
Caozhenhui
|
6051c05221
|
Resolved ERROR:PUT method not found
|
2021-11-09 13:55:43 +08:00 |
|
Caozhenhui
|
5cd0363acd
|
CORS Method not found when submit a PUT request
|
2021-11-08 18:13:15 +08:00 |
|
Caozhenhui
|
738f91d181
|
modified falcon.API to falcon.App and CORS to falcon.CORSmiddleware
|
2021-11-08 09:37:26 +08:00 |
|
13621160019@163.com
|
1ab8e04edf
|
Merge branch 'develop'
|
2021-11-07 18:43:57 +08:00 |
|
13621160019@163.com
|
a7e9586ecb
|
added installation on docker to myems-modbus-tcp
|
2021-11-07 18:43:15 +08:00 |
|
13621160019@163.com
|
2874b73eb3
|
Merge branch 'develop'
|
2021-11-06 15:44:19 +08:00 |
|
13621160019@163.com
|
e2234902a2
|
updated version number to v1.3.4
|
2021-11-06 15:44:05 +08:00 |
|
13621160019@163.com
|
a27d5762e1
|
added default gateway token to database and myems_modbus_tcp
|
2021-11-06 15:43:06 +08:00 |
|
13621160019@163.com
|
894ea902de
|
Merge branch 'develop'
|
2021-11-06 14:18:19 +08:00 |
|
13621160019@163.com
|
4329569bb1
|
added notification drop down list and notification page
Merge branch 'PR78' into develop
|
2021-11-06 14:16:37 +08:00 |
|
13621160019@163.com
|
8c5e2ca202
|
Merge branch 'develop'
|
2021-11-05 23:09:02 +08:00 |
|
13621160019@163.com
|
f9fb61035d
|
updated README
|
2021-11-05 23:03:28 +08:00 |
|
13621160019@163.com
|
b1da8e6234
|
Merge branch 'develop'
|
2021-11-05 20:06:30 +08:00 |
|
13621160019@163.com
|
405fa656f4
|
added installation on docker to readme of web ui
|
2021-11-05 20:01:00 +08:00 |
|
13621160019@163.com
|
abaf130b54
|
Merge branch 'develop'
|
2021-11-05 19:10:04 +08:00 |
|
13621160019@163.com
|
7595d87b96
|
added installation on docker to readme of admin ui
|
2021-11-05 19:04:34 +08:00 |
|
13621160019@163.com
|
ad08b424bf
|
Merge branch 'develop'
|
2021-11-05 17:52:32 +08:00 |
|
13621160019@163.com
|
753b2a86ce
|
added installation on docker to README
|
2021-11-05 17:52:22 +08:00 |
|
13621160019@163.com
|
df44aac6e1
|
Merge branch 'develop'
|
2021-11-05 16:49:07 +08:00 |
|
13621160019@163.com
|
df91f3b170
|
added installation on docker to README of myems-api
|
2021-11-05 16:42:06 +08:00 |
|
tianlinzhong
|
4d91e63dcb
|
solve the bug
|
2021-11-05 10:06:19 +08:00 |
|
13621160019@163.com
|
ea58d50c43
|
fixed NoneType errors in detailed data formatters of Web UI
Merge branch 'develop'
|
2021-11-04 22:13:42 +08:00 |
|
13621160019@163.com
|
df57994c7a
|
fixed NoneType errors in detailed data formatters of Web UI
|
2021-11-04 22:13:22 +08:00 |
|
13621160019@163.com
|
74a776af87
|
added new period type weekly
Merge branch 'develop'
|
2021-11-04 21:47:04 +08:00 |
|
13621160019@163.com
|
20422f9074
|
added new period type 'weekly'
Merge branch 'PR77' into develop
|
2021-11-04 21:46:15 +08:00 |
|
13621160019@163.com
|
cfe749e44d
|
added weekly to i18n of Web UI
|
2021-11-04 21:18:50 +08:00 |
|
Caozhenhui
|
2c748d2eee
|
Modified the current_datetime_utcvariable in the statistics_hourly_data_by_period method
|
2021-11-04 20:24:51 +08:00 |
|
Caozhenhui
|
bffef535ea
|
Modified the current_datetime_utcvariable in the statistics_hourly_data_by_period method
|
2021-11-04 19:50:44 +08:00 |
|
Caozhenhui
|
67f22d2dd3
|
Modified the current_datetime_utcvariable in the statistics_hourly_data_by_period method
|
2021-11-04 19:49:23 +08:00 |
|
Caozhenhui
|
caa65ef136
|
Added the time scale of weekly in statistics_hourly_data_by_period
|
2021-11-04 16:24:23 +08:00 |
|
Caozhenhui
|
f2bee0bb2c
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2021-11-04 16:23:13 +08:00 |
|
13621160019@163.com
|
b7565b4d33
|
Merge branch 'develop'
|
2021-11-03 22:51:03 +08:00 |
|
13621160019@163.com
|
e6a9d59f8a
|
Merge branch 'develop' of https://gitee.com/myems/myems into develop
|
2021-11-03 22:50:03 +08:00 |
|
13621160019@163.com
|
ed86cf00e0
|
added docker command to admin ui readme
|
2021-11-03 22:49:20 +08:00 |
|
Caozhenhui
|
88e33fa9c6
|
Added the time scale of weekly
|
2021-11-03 11:09:48 +08:00 |
|
Caozhenhui
|
4a44727a0a
|
Added the time scale of weekly
|
2021-11-03 11:00:17 +08:00 |
|
Caozhenhui
|
3fc620b596
|
Added the time scale of weekly
|
2021-11-03 10:32:16 +08:00 |
|
Caozhenhui
|
62ad53d430
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2021-11-02 17:03:08 +08:00 |
|
guangyuzhang
|
b6e1a380cf
|
Merge branch 'develop'
|
2021-11-02 16:51:46 +08:00 |
|
guangyuzhang
|
2671cd7f8e
|
updated dockerfiles
|
2021-11-02 16:50:54 +08:00 |
|
tianlinzhong
|
2bade8434f
|
Energy management system notification function WEB UI
|
2021-11-02 16:02:42 +08:00 |
|
tianlinzhong
|
c2004ca4c4
|
Energy management system notification function WEB UI
|
2021-11-02 15:35:54 +08:00 |
|
guangyuzhang
|
5ee5fb9fbc
|
Merge branch 'master' into develop
|
2021-11-01 14:53:01 +08:00 |
|
guangyuzhang
|
8d421975c5
|
updated Dockerfiles
|
2021-11-01 14:52:33 +08:00 |
|
Caozhenhui
|
9ea6c505a5
|
Added the time scale of weekly to all required files
|
2021-11-01 11:28:07 +08:00 |