37a44353a8
added access control to shopfloor, store and tenant in api and admin
2021-12-08 23:28:58 +08:00
31b70d4057
added access_control to costcenter and tariff
2021-12-08 10:22:16 +08:00
95c8dd95d5
Merge branch 'PR' into develop
2021-12-07 20:14:55 +08:00
9c9e316efc
added access control to point in api and admin
2021-12-07 19:50:37 +08:00
8ea1d4a812
added access control to shopfloor tenant and store
2021-12-07 15:04:26 +08:00
15cc27ac18
added access control to equipment in api and admin
2021-12-06 23:02:27 +08:00
9b417d0648
Merge branch 'PR' into develop
2021-12-06 22:17:44 +08:00
57671aa2b6
added access control to combinedequipment in api and admin
2021-12-06 19:31:51 +08:00
0bf0c829d0
equipment of access_control
2021-12-06 15:26:27 +08:00
fb31837efa
added access_control to combinedequipment
2021-12-06 14:52:15 +08:00
cd94e31a98
added user varification to webmessage in admin and api
2021-12-05 18:06:50 +08:00
996f7066e1
added access control to wechat message in api and admin
2021-12-05 12:37:42 +08:00
65565a5351
added access control to text message in api and admin
2021-12-04 20:48:56 +08:00
3e536d503e
added access control to email message in api and admin
2021-12-04 19:52:12 +08:00
3ec50fab0d
added access control to sersor in api and admin
2021-12-03 19:53:12 +08:00
b10cc91a3a
Merge branch 'PR89' into develop
2021-12-03 19:21:08 +08:00
4e0961e5fb
added access control to distribution system in api and admin
2021-12-03 19:09:39 +08:00
05b5631408
Merge branch 'PR88' into develop
2021-12-03 17:01:21 +08:00
0edaf58aee
added access control to sensorpoint
2021-12-03 16:42:18 +08:00
2eaa8df6c6
added access control to sensor
2021-12-03 16:36:48 +08:00
469c21672b
distrbutioncircuit/distributionsystem of access_control
2021-12-03 14:58:04 +08:00
fb8284ca52
added access control to privilege in api and admin
2021-12-03 14:16:51 +08:00
624e4f7e3b
Merge branch 'PR87' into develop
2021-12-03 14:00:48 +08:00
8f2db8952f
added access control to energyflowdiagram in api and admin
2021-12-03 13:51:32 +08:00
29f3b91e56
fixed the sequence of parameter
2021-12-02 10:57:39 +08:00
8dd998ed0c
added access_control to privilege
2021-12-02 10:43:32 +08:00
62312e8c54
energyflowdiagram of access_control2
2021-12-02 09:56:13 +08:00
f685728985
Merge remote-tracking branch 'origin/develop' into develop
2021-12-02 09:09:38 +08:00
213f669924
added access control to energyitem in api and admin
2021-12-01 22:16:11 +08:00
c7fe4dea79
energyflowdiagram of access_control
2021-12-01 14:21:38 +08:00
637f8ce481
added accecc_control to contact in api and admin
2021-11-30 22:57:51 +08:00
6e53449439
added access control to EnergyItem
2021-11-30 10:07:12 +08:00
16c7e858fb
added access control to EnergyItem
2021-11-30 10:00:38 +08:00
9304225419
contact of access_control
2021-11-29 18:48:29 +08:00
dfec9a8fc0
added access_control to menu in api and admin
2021-11-29 17:46:14 +08:00
7a2d2a3f1d
menu of access_control
2021-11-29 16:07:31 +08:00
3b0d4a13f5
added access control to meter in api and admin
2021-11-27 21:15:43 +08:00
d937acd1bb
fixed issue of EnergyCategory in admin and updated README of admin
2021-11-26 20:05:01 +08:00
8e0bb54616
Merge branch 'PR81' into develop
2021-11-23 23:16:24 +08:00
a8fec3a7dd
added access control to energycategory
2021-11-23 11:19:38 +08:00
365a0a903c
added access control to meter
2021-11-23 11:08:29 +08:00
566b57843a
added access control to gateway, datasource and point
2021-11-20 21:51:38 +08:00
d5155c04b8
added access control to offline meter file
2021-11-19 22:49:54 +08:00
d15fef3b52
added access control to knowledge file
2021-11-19 22:10:59 +08:00
2245dee31e
added access control to cost file
2021-11-18 22:51:01 +08:00
9937d0d051
added access control to email server
2021-11-17 22:58:24 +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
6865fba169
updated virtual meter model view in admin ui
2021-11-13 19:38:52 +08:00
dd279ba548
added access control to actions of user in api
2021-11-10 18:04:15 +08:00
72484ea920
added access control to GET all users in API
2021-11-10 16:19:46 +08:00
e2234902a2
updated version number to v1.3.4
2021-11-06 15:44:05 +08:00
7595d87b96
added installation on docker to readme of admin ui
2021-11-05 19:04:34 +08:00
e6a9d59f8a
Merge branch 'develop' of https://gitee.com/myems/myems into develop
2021-11-03 22:50:03 +08:00
ed86cf00e0
added docker command to admin ui readme
2021-11-03 22:49:20 +08:00
2671cd7f8e
updated dockerfiles
2021-11-02 16:50:54 +08:00
8d421975c5
updated Dockerfiles
2021-11-01 14:52:33 +08:00
70151b020f
updated version number to v1.3.3
2021-10-30 16:11:12 +08:00
6c69ad4f23
updated version number to v1.3.2
2021-10-22 16:53:32 +08:00
32256396ac
added validation for area of shopfloor, space, store and tenant in API
2021-10-19 18:45:17 +08:00
1a3999f983
updated database demo data in German
2021-10-17 11:23:20 +08:00
3936b7c2e7
updated version number to v1.3.1
2021-10-15 16:31:00 +08:00
f24abe8656
fixed issue for editing user name and password in Admin UI
2021-10-03 19:13:47 +08:00
2496c1a32b
fixed PEP8 warnings and update version number to v1.3.0
2021-09-24 13:47:31 +08:00
f529593322
updated translations in Admin UI
2021-09-22 23:03:41 +08:00
b29d8d1e9b
removed gsmmodem and aliyun sms api from API & Admin UI
2021-09-22 22:42:37 +08:00
02caabc640
changed start&end datetime formater for tariff from timestamp to strftime
2021-09-22 18:09:13 +08:00
efda021649
changed lease start&end datetime formater for tenant from timestamp to strftime
2021-09-22 16:07:38 +08:00
dec9bc6e87
changed last run datetime and next run datetime formater for rule from timestamp to strftime
2021-09-22 15:44:28 +08:00
15ca471b83
changed last seen datetime formater for gateway from timestamp to strftime
2021-09-22 15:25:30 +08:00
9624b75414
changed last seen datetime formater of datasource from timestamp to strftime
2021-09-22 14:50:41 +08:00
f27b95adee
changed upload datetime formater of knowledgefile and offlinemeterfile from timestamp to strftime;
2021-09-22 13:55:50 +08:00
6962c65aab
changed cost file upload datetime formatter from timestamp to strftime
2021-09-22 12:41:12 +08:00
0ac76ccd96
added expiration datetimes to User in Admin UI
2021-09-22 11:28:33 +08:00
4d29d3ec20
updated translation of Admin UI
2021-09-19 15:40:24 +08:00
3b236fe454
fixed typo in contact controller of Admin UI
2021-09-17 14:14:20 +08:00
a8aaf018f3
added API error messages to translations.js and i18n.js
2021-09-13 22:11:02 +08:00
44d7933323
updated Admin UI to make error messages more specific
2021-09-09 16:13:40 +08:00
e4142f7e20
updated translations of KGCE & KGCO2E in Admin UI
2021-09-08 16:42:45 +08:00
f24deea941
modified API error message for knowledge file cannot be removed from disk
2021-09-06 15:01:24 +08:00
637c7ea0be
fixed typo in translations of Admin UI
2021-09-04 18:21:49 +08:00
f1cd53e650
upgraded version number to v1.2.3
2021-09-04 12:43:58 +08:00
31b55cdd75
fixed Local Storage conflicts in Admin UI and Web UI
2021-09-03 20:34:08 +08:00
754a688d26
rename language cn to zh-ch in Admin UI
2021-09-03 19:33:22 +08:00
4255eaa167
upgraded version number to v1.2.2
2021-08-28 14:47:27 +08:00
3c95f47415
updated README
2021-08-28 13:32:38 +08:00
c350ddd808
fixed code style warnings in README
2021-08-26 14:57:44 +08:00
1b07a2147d
fixed typo caused error in Admin UI
2021-08-25 17:33:59 +08:00
3ef7ce386b
fixed undefined variable error in Admin UI
2021-08-25 16:35:44 +08:00
eb0d1ab56c
fixed translation errors in Admin UI
2021-08-23 17:32:50 +08:00
7766723f60
changed user token hash algorithm from sha1 to sha256 in API
2021-08-23 15:38:49 +08:00
49a5d433c6
fixed typeof issue of dropzone js in Admin UI
2021-08-23 14:16:37 +08:00
6d7b603aaa
removed unnecessary dropzone-amd-module library from Admin UI
2021-08-22 18:40:20 +08:00
879d6cf1e5
upgraded dorpzone js library in Admin UI
2021-08-22 18:11:33 +08:00
edc324e51e
moved css files for dropzone from js folder to css folder in Admin UI
2021-08-22 18:00:48 +08:00
e016b1df9b
fixed toaster issues for uploading file in Admin UI
2021-08-22 17:49:41 +08:00
ad2000c3fe
upgraded version numbers to 1.2.1
2021-08-19 15:32:42 +08:00
2555140ad9
renamed virtualmeter.model.html in Admin UI
2021-08-18 10:56:06 +08:00
63d649c16d
removed unnecessary jc.jsextend library from Admin UI
2021-08-17 22:56:34 +08:00
79c7725061
fixed debugging code issues in Admin UI
2021-08-17 22:29:08 +08:00
cac434cc5d
fixed unused code issues in Admin UI
2021-08-17 22:11:30 +08:00
13621160019@163.com