6cf064b196
Merge branch 'develop'
2021-11-17 13:32:40 +08:00
cda9381ec1
added access control to POST/PUT/DELETE of storetype in api
2021-11-17 13:32:23 +08:00
1e585716bb
Merge branch 'develop'
2021-11-16 21:56:17 +08:00
9d17baff1c
added access control to tenanttype POST/PUT/DELETE actions in api
2021-11-16 21:42:41 +08:00
185d0b544a
Merge branch 'develop'
2021-11-16 21:20:57 +08:00
aac085d160
added access control to timezone PUT action in api
2021-11-16 21:20:26 +08:00
c6f8bac228
Merge branch 'develop'
2021-11-15 21:24:31 +08:00
5b30a23a85
updated command of myems-api service in docker-compose
2021-11-15 21:24:03 +08:00
a9cbee6cd1
updated Dockerfile of myems-api
2021-11-15 21:22:11 +08:00
1ee02562bd
Merge branch 'develop'
2021-11-14 19:44:59 +08:00
5767d98825
updated virtual meter procedure in normalization service
2021-11-14 19:44:32 +08:00
d28b0947c4
Merge branch 'develop'
...
Upgrade procedure for this change:
1. Stop the myems-normalization service or container.
2. Backup your database.
3. Upgrade myems/admin, myems/myems-api, and myems/myems-normalization source code,
and keep previous .env files unchanged.
4. Run database/upgrade/upgrade1.4.0.sql to merge expression into virtual meter
5. Check the virtual meters in Admin UI.
6. Start the myems-normalization service or container.
2021-11-14 17:15:31 +08:00
ef7c602508
upgraded version number to v1.4.0
...
Upgrade procedure for this change:
1. Stop the myems-normalization service or container.
2. Backup your database.
3. Upgrade myems/admin, myems/myems-api, and myems/myems-normalization source code,
and keep previous .env files unchanged.
4. Run database/upgrade/upgrade1.4.0.sql to merge expression into virtual meter
5. Check the virtual meters in Admin UI.
6. Start the myems-normalization service or container.
2021-11-14 17:15:17 +08:00
9331ea10b6
Merge branch 'develop'
2021-11-14 16:41:14 +08:00
6856423ed1
Merged expression table into virtual meter table in database
2021-11-14 16:40:58 +08:00
0c6174df88
Merge branch 'develop'
2021-11-13 19:47:19 +08:00
6865fba169
updated virtual meter model view in admin ui
2021-11-13 19:38:52 +08:00
862afae8eb
Merge branch 'develop'
2021-11-12 23:26:52 +08:00
6c666021de
updated docker hub address in README
2021-11-12 23:26:18 +08:00
5e7f397f73
Merge branch 'develop'
2021-11-11 22:48:01 +08:00
0c22efbe2f
updated excel exporters to make them print friendly
2021-11-11 22:45:45 +08:00
b4637d15ad
Merge branch 'develop'
2021-11-10 18:12:38 +08:00
8f8bc8a969
added access control to actions of user in api
2021-11-10 18:12:30 +08:00
dd279ba548
added access control to actions of user in api
2021-11-10 18:04:15 +08:00
08fcc022f1
Merge branch 'develop'
2021-11-10 16:43:25 +08:00
72484ea920
added access control to GET all users in API
2021-11-10 16:19:46 +08:00
5b21d77f94
Merge branch 'develop'
2021-11-10 12:27:34 +08:00
5c900e9a82
fixed issue in on_delete of gateway in API
2021-11-10 12:25:05 +08:00
3f9e36b276
Merge branch 'develop'
2021-11-09 21:53:14 +08:00
9e14d82ce8
upgraded falcon framework to v3.0.1 in API
...
Merge branch 'PR79' into develop
2021-11-09 21:50:19 +08:00
5d0679d60a
recovered usage of falcon_cors middleware in API
2021-11-09 21:50:05 +08:00
6051c05221
Resolved ERROR:PUT method not found
2021-11-09 13:55:43 +08:00
5cd0363acd
CORS Method not found when submit a PUT request
2021-11-08 18:13:15 +08:00
738f91d181
modified falcon.API to falcon.App and CORS to falcon.CORSmiddleware
2021-11-08 09:37:26 +08:00
1ab8e04edf
Merge branch 'develop'
2021-11-07 18:43:57 +08:00
a7e9586ecb
added installation on docker to myems-modbus-tcp
2021-11-07 18:43:15 +08:00
2874b73eb3
Merge branch 'develop'
2021-11-06 15:44:19 +08:00
e2234902a2
updated version number to v1.3.4
2021-11-06 15:44:05 +08:00
a27d5762e1
added default gateway token to database and myems_modbus_tcp
2021-11-06 15:43:06 +08:00
894ea902de
Merge branch 'develop'
2021-11-06 14:18:19 +08:00
4329569bb1
added notification drop down list and notification page
...
Merge branch 'PR78' into develop
2021-11-06 14:16:37 +08:00
8c5e2ca202
Merge branch 'develop'
2021-11-05 23:09:02 +08:00
f9fb61035d
updated README
2021-11-05 23:03:28 +08:00
b1da8e6234
Merge branch 'develop'
2021-11-05 20:06:30 +08:00
405fa656f4
added installation on docker to readme of web ui
2021-11-05 20:01:00 +08:00
abaf130b54
Merge branch 'develop'
2021-11-05 19:10:04 +08:00
7595d87b96
added installation on docker to readme of admin ui
2021-11-05 19:04:34 +08:00
ad08b424bf
Merge branch 'develop'
2021-11-05 17:52:32 +08:00
753b2a86ce
added installation on docker to README
2021-11-05 17:52:22 +08:00
df44aac6e1
Merge branch 'develop'
2021-11-05 16:49:07 +08:00
13621160019@163.com