seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,940 Commits
2 Branches
32 Tags
112 MiB
Commit Graph

141 Commits (db1b32b4f9b9f2f00f57e3daace2043bccd4f42f)

Author SHA1 Message Date
tianlinzhong 62312e8c54 energyflowdiagram of access_control2 2021-12-02 09:56:13 +08:00
tianlinzhong f685728985 Merge remote-tracking branch 'origin/develop' into develop 2021-12-02 09:09:38 +08:00
13621160019@163.com 213f669924 added access control to energyitem in api and admin 2021-12-01 22:16:11 +08:00
tianlinzhong c7fe4dea79 energyflowdiagram of access_control 2021-12-01 14:21:38 +08:00
13621160019@163.com 637f8ce481 added accecc_control to contact in api and admin 2021-11-30 22:57:51 +08:00
Caozhenhui 6e53449439 added access control to EnergyItem 2021-11-30 10:07:12 +08:00
Caozhenhui 16c7e858fb added access control to EnergyItem 2021-11-30 10:00:38 +08:00
tianlinzhong 9304225419 contact of access_control 2021-11-29 18:48:29 +08:00
13621160019@163.com dfec9a8fc0 added access_control to menu in api and admin 2021-11-29 17:46:14 +08:00
tianlinzhong 7a2d2a3f1d menu of access_control 2021-11-29 16:07:31 +08:00
13621160019@163.com 3b0d4a13f5 added access control to meter in api and admin 2021-11-27 21:15:43 +08:00
13621160019@163.com d937acd1bb fixed issue of EnergyCategory in admin and updated README of admin 2021-11-26 20:05:01 +08:00
guangyuzhang 8e0bb54616 Merge branch 'PR81' into develop 2021-11-23 23:16:24 +08:00
tianlinzhong a8fec3a7dd added access control to energycategory 2021-11-23 11:19:38 +08:00
Caozhenhui 365a0a903c added access control to meter 2021-11-23 11:08:29 +08:00
13621160019@163.com 566b57843a added access control to gateway, datasource and point 2021-11-20 21:51:38 +08:00
13621160019@163.com d5155c04b8 added access control to offline meter file 2021-11-19 22:49:54 +08:00
13621160019@163.com d15fef3b52 added access control to knowledge file 2021-11-19 22:10:59 +08:00
13621160019@163.com 2245dee31e added access control to cost file 2021-11-18 22:51:01 +08:00
13621160019@163.com 9937d0d051 added access control to email server 2021-11-17 22:58:24 +08:00
13621160019@163.com dd279ba548 added access control to actions of user in api 2021-11-10 18:04:15 +08:00
13621160019@163.com 72484ea920 added access control to GET all users in API 2021-11-10 16:19:46 +08:00
13621160019@163.com 32256396ac added validation for area of shopfloor, space, store and tenant in API 2021-10-19 18:45:17 +08:00
13621160019@163.com 1a3999f983 updated database demo data in German 2021-10-17 11:23:20 +08:00
13621160019@163.com f529593322 updated translations in Admin UI 2021-09-22 23:03:41 +08:00
13621160019@163.com b29d8d1e9b removed gsmmodem and aliyun sms api from API & Admin UI 2021-09-22 22:42:37 +08:00
13621160019@163.com 02caabc640 changed start&end datetime formater for tariff from timestamp to strftime 2021-09-22 18:09:13 +08:00
13621160019@163.com efda021649 changed lease start&end datetime formater for tenant from timestamp to strftime 2021-09-22 16:07:38 +08:00
13621160019@163.com 0ac76ccd96 added expiration datetimes to User in Admin UI 2021-09-22 11:28:33 +08:00
13621160019@163.com 4d29d3ec20 updated translation of Admin UI 2021-09-19 15:40:24 +08:00
13621160019@163.com 3b236fe454 fixed typo in contact controller of Admin UI 2021-09-17 14:14:20 +08:00
13621160019@163.com a8aaf018f3 added API error messages to translations.js and i18n.js 2021-09-13 22:11:02 +08:00
13621160019@163.com 44d7933323 updated Admin UI to make error messages more specific 2021-09-09 16:13:40 +08:00
13621160019@163.com e4142f7e20 updated translations of KGCE & KGCO2E in Admin UI 2021-09-08 16:42:45 +08:00
13621160019@163.com f24deea941 modified API error message for knowledge file cannot be removed from disk 2021-09-06 15:01:24 +08:00
13621160019@163.com 637c7ea0be fixed typo in translations of Admin UI 2021-09-04 18:21:49 +08:00
13621160019@163.com 31b55cdd75 fixed Local Storage conflicts in Admin UI and Web UI 2021-09-03 20:34:08 +08:00
13621160019@163.com 754a688d26 rename language cn to zh-ch in Admin UI 2021-09-03 19:33:22 +08:00
13621160019@163.com 1b07a2147d fixed typo caused error in Admin UI 2021-08-25 17:33:59 +08:00
13621160019@163.com 3ef7ce386b fixed undefined variable error in Admin UI 2021-08-25 16:35:44 +08:00
13621160019@163.com eb0d1ab56c fixed translation errors in Admin UI 2021-08-23 17:32:50 +08:00
13621160019@163.com e016b1df9b fixed toaster issues for uploading file in Admin UI 2021-08-22 17:49:41 +08:00
13621160019@163.com 79c7725061 fixed debugging code issues in Admin UI 2021-08-17 22:29:08 +08:00
13621160019@163.com cac434cc5d fixed unused code issues in Admin UI 2021-08-17 22:11:30 +08:00
13621160019@163.com 8697c66c67 replaced stateChangeStart with transitions.onStart in Admin UI 2021-08-17 18:52:25 +08:00
13621160019@163.com fd37fd53aa removed unused logs 2021-08-17 15:24:43 +08:00
13621160019@163.com 659b0cf50e added filters for jstree action types of menu and space in Admin UI 2021-08-16 22:10:21 +08:00
13621160019@163.com bb13f923f8 fixed self assignment error in Web UI 2021-08-16 19:24:22 +08:00
13621160019@163.com 21d84ccabd removed js plugins codemirror and summernote from Admin UI 2021-08-15 16:21:09 +08:00
13621160019@163.com edbd8bff42 upgraded Highcharts JS to v9.1.2 2021-08-15 11:26:32 +08:00
13621160019@163.com 17b8af550a replaced == with === to avoid casting in Admin UI 2021-08-14 17:44:41 +08:00
13621160019@163.com 1412d2e6b2 upgraded AngularJS to v1.8.2 2021-08-14 17:26:51 +08:00
13621160019@163.com d27de89239 deleted duplicated words from translations of Admin UI 2021-08-11 12:13:35 +08:00
13621160019@163.com 1ccb6bdfef removed unnecessary libraries d3, and3, nvd3 and c3 from Admin UI 2021-08-11 11:19:44 +08:00
13621160019@163.com d049269d58 removed unnecessary library mathjax from Admin UI 2021-08-11 10:23:40 +08:00
13621160019@163.com a34acc11a7 deleted keys which are used more than once in translations of Admin UI 2021-08-10 17:16:07 +08:00
13621160019@163.com c0e363c87d updated Admin UI translations for Error Messages of API 2021-08-10 16:41:01 +08:00
Caozhenhui 0638f18b16 Added Missing Error Messages Words of API 2021-08-10 14:43:42 +08:00
Caozhenhui 708b836999 sorted and removed unnecessary error messages 2021-08-09 14:42:12 +08:00
13621160019@163.com 9c4c65ad14 deleted unnecessary words in translantions of Admin UI 2021-08-05 19:26:47 +08:00
13621160019@163.com b5e05ad629 updated Menu Setting in Admin UI 2021-08-02 12:16:46 +08:00
13621160019@163.com 2c0de0f673 updated Menu Setting in Admin UI 2021-08-02 10:52:13 +08:00
13621160019@163.com efd239be06 added Menu Setting to Admin UI 2021-08-01 20:43:24 +08:00
13621160019@163.com 62ccf58599 deleted uncessary controllers from Admin UI 2021-07-23 15:58:46 +08:00
13621160019@163.com 56ec24c94b deleted unnecessary words in translations of Admin UI 2021-07-21 12:27:19 +08:00
13621160019@163.com 4015e101e6 fixed issue of gitignore in Admin UI 2021-07-20 18:29:35 +08:00
13621160019@163.com abb45dadbc added Cost File to API and Admin UI and upgraded to v1.1.4 2021-07-19 19:48:00 +08:00
13621160019@163.com 44403742a5 added restore button to offline meter file in API and Admin UI 2021-07-19 16:20:37 +08:00
13621160019@163.com c6a5ad2a7b fixed issues of deleting text message and wechat message in Admin UI 2021-06-09 19:12:17 +08:00
13621160019@163.com 384e73f38a fixed issue of deleting email message in Admin UI 2021-06-09 18:56:22 +08:00
13621160019@163.com ac1b94abae fixed typo for deleting email messages in Admin UI 2021-06-09 18:18:19 +08:00
13621160019@163.com bb875521ef added is_virtual to point in myems-admin 2021-05-07 09:01:19 +08:00
13621160019@163.com 1619849c16 added last seen datetime to data source setting in Admin UI 2021-04-28 15:55:10 +08:00
13621160019@163.com e4b9cffd18 added last seen datetime to Gateway Setting in Admin UI 2021-04-28 15:02:56 +08:00
13621160019@163.com c2bc3bac85 updated year in LICENSE 2021-04-25 11:55:17 +08:00
13621160019@163.com a367bfc140 updated changelog and set version number to 1.1.2 2021-04-23 11:28:14 +08:00
13621160019@163.com cee412557a moved category before fdd_code of rule in admin UI and API 2021-03-23 10:51:34 +08:00
13621160019@163.com c9aa2a1f23 added last_run_datetime and next_run_datetime to rule in admin UI 2021-03-22 18:13:16 +08:00
13621160019@163.com 409617ff75 fixed headers issue of cost file in admin UI 2021-03-17 11:34:16 +08:00
13621160019@163.com b99d251e4c fixed headers issues of offline meter file and knowledge file in admin UI 2021-03-17 11:32:20 +08:00
13621160019@163.com 65a18aff97 updated cost file controller in admin UI 2021-03-16 18:39:35 +08:00
13621160019@163.com 82479e8b18 fixed issue when deleting offline meter file 2021-03-16 12:07:10 +08:00
13621160019@163.com faecb1f670 fixed issue of add space in web UI 2021-03-15 14:56:22 +08:00
13621160019@163.com 8fca486742 added Optional key to translation in admin UI 2021-03-15 13:20:11 +08:00
13621160019@163.com d61583c560 added Optional key to translation in admin UI 2021-03-15 13:14:06 +08:00
13621160019@163.com fd41af641b added translation for German 2021-03-10 19:36:04 +08:00
13621160019@163.com 6797790785 fixed wrong headers issues in admin 2021-03-02 14:57:56 +08:00
guangyuzhang ce7553afcb fixed null contact issue in space controller in admin 2021-03-01 22:38:20 +08:00
13621160019@163.com f9eb2e39ba fixed energy item undefined issue when edit virtual meter and offline meter 2021-02-27 12:52:27 +08:00
13621160019@163.com 143dd46aa2 fixed typo in combinedequipment controller in admin 2021-02-26 18:04:50 +08:00
13621160019@163.com 070c7a0d56 merged myems-admin 2021-02-19 14:43:12 +08:00