13621160019@163.com
|
e2234902a2
|
updated version number to v1.3.4
|
2021-11-06 15:44:05 +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
|
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 |
|
guangyuzhang
|
2671cd7f8e
|
updated dockerfiles
|
2021-11-02 16:50:54 +08:00 |
|
guangyuzhang
|
8d421975c5
|
updated Dockerfiles
|
2021-11-01 14:52:33 +08:00 |
|
13621160019@163.com
|
70151b020f
|
updated version number to v1.3.3
|
2021-10-30 16:11:12 +08:00 |
|
13621160019@163.com
|
6c69ad4f23
|
updated version number to v1.3.2
|
2021-10-22 16:53:32 +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
|
3936b7c2e7
|
updated version number to v1.3.1
|
2021-10-15 16:31:00 +08:00 |
|
13621160019@163.com
|
f24abe8656
|
fixed issue for editing user name and password in Admin UI
|
2021-10-03 19:13:47 +08:00 |
|
13621160019@163.com
|
2496c1a32b
|
fixed PEP8 warnings and update version number to v1.3.0
|
2021-09-24 13:47:31 +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
|
dec9bc6e87
|
changed last run datetime and next run datetime formater for rule from timestamp to strftime
|
2021-09-22 15:44:28 +08:00 |
|
13621160019@163.com
|
15ca471b83
|
changed last seen datetime formater for gateway from timestamp to strftime
|
2021-09-22 15:25:30 +08:00 |
|
13621160019@163.com
|
9624b75414
|
changed last seen datetime formater of datasource from timestamp to strftime
|
2021-09-22 14:50:41 +08:00 |
|
13621160019@163.com
|
f27b95adee
|
changed upload datetime formater of knowledgefile and offlinemeterfile from timestamp to strftime;
|
2021-09-22 13:55:50 +08:00 |
|
13621160019@163.com
|
6962c65aab
|
changed cost file upload datetime formatter from timestamp to strftime
|
2021-09-22 12:41:12 +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
|
f1cd53e650
|
upgraded version number to v1.2.3
|
2021-09-04 12:43:58 +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
|
4255eaa167
|
upgraded version number to v1.2.2
|
2021-08-28 14:47:27 +08:00 |
|
13621160019@163.com
|
3c95f47415
|
updated README
|
2021-08-28 13:32:38 +08:00 |
|
13621160019@163.com
|
c350ddd808
|
fixed code style warnings in README
|
2021-08-26 14:57:44 +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
|
7766723f60
|
changed user token hash algorithm from sha1 to sha256 in API
|
2021-08-23 15:38:49 +08:00 |
|
13621160019@163.com
|
49a5d433c6
|
fixed typeof issue of dropzone js in Admin UI
|
2021-08-23 14:16:37 +08:00 |
|
13621160019@163.com
|
6d7b603aaa
|
removed unnecessary dropzone-amd-module library from Admin UI
|
2021-08-22 18:40:20 +08:00 |
|
13621160019@163.com
|
879d6cf1e5
|
upgraded dorpzone js library in Admin UI
|
2021-08-22 18:11:33 +08:00 |
|
13621160019@163.com
|
edc324e51e
|
moved css files for dropzone from js folder to css folder in Admin UI
|
2021-08-22 18:00:48 +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
|
ad2000c3fe
|
upgraded version numbers to 1.2.1
|
2021-08-19 15:32:42 +08:00 |
|
13621160019@163.com
|
2555140ad9
|
renamed virtualmeter.model.html in Admin UI
|
2021-08-18 10:56:06 +08:00 |
|
13621160019@163.com
|
63d649c16d
|
removed unnecessary jc.jsextend library from Admin UI
|
2021-08-17 22:56:34 +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
|
e898822272
|
removed diff-match-patch library from Admin UI
|
2021-08-17 10:22:28 +08:00 |
|
13621160019@163.com
|
c755082856
|
removed jeditable library from Admin UI
|
2021-08-17 10:01:06 +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
|
98f09259db
|
replaced href with ng-href in Admin UI
|
2021-08-16 16:28:35 +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
|
3b18672f90
|
upgraded jquery-ui to v1.12.1
|
2021-08-14 20:43:03 +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
|
611e0aa036
|
removed unnecessary library nggrid from Admin UI
|
2021-08-11 17:09:55 +08:00 |
|
13621160019@163.com
|
72d045e277
|
added version tags to images in Dockerfile
|
2021-08-11 13:17:30 +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
|
4a4c31bb70
|
upgraded ocLazyLoad to v1.0.10 in Admin UI
|
2021-08-10 18:57:46 +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
|
95e77bcb18
|
upgraded version number to v1.2.0
|
2021-08-06 19:26:41 +08:00 |
|
13621160019@163.com
|
14cec6a333
|
updated README for Docker
|
2021-08-06 18:45:51 +08:00 |
|
hyh123a
|
1656d9b131
|
Merge branch 'develop' of https://gitee.com/hyh123_a/myems into develop
|
2021-08-06 16:12:00 +08:00 |
|
hyh123a
|
3828f1f73b
|
modify the docker files and README.md
|
2021-08-06 16:08:51 +08:00 |
|
13621160019@163.com
|
9c4c65ad14
|
deleted unnecessary words in translantions of Admin UI
|
2021-08-05 19:26:47 +08:00 |
|
hyh123a
|
35d9ea4a02
|
modify the Dockerfile
|
2021-08-05 10:35:15 +08:00 |
|
13621160019@163.com
|
ff15db356c
|
upgraded to v1.1.6
|
2021-08-02 17:30:56 +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 |
|
hyh123a
|
24204896df
|
modify the Dockerfile
|
2021-07-30 18:40:24 +08:00 |
|
hyh123a
|
d72b12363a
|
Merge branch 'develop' of https://gitee.com/hyh123_a/myems into develop
|
2021-07-29 15:34:37 +08:00 |
|
13621160019@163.com
|
fcc2c3e30b
|
updated REAEME files in Admin UI and Web UI
|
2021-07-29 13:26:50 +08:00 |
|
hyh123a
|
9f7eefce10
|
Merge branch 'docker' into develop
|
2021-07-29 13:17:14 +08:00 |
|
hyh123a
|
020a4a85a5
|
add the docker installation
|
2021-07-29 13:14:06 +08:00 |
|
Caozhenhui
|
ca0fe37a9d
|
Added how to install Apache
|
2021-07-29 11:33:14 +08:00 |
|
13621160019@163.com
|
4822e1472b
|
upgraded jquery to v2.2.4 in Admin UI
|
2021-07-27 14:39:09 +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
|
fd990f94b9
|
upgraded to v1.1.5
|
2021-07-20 18:57:27 +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
|
afc3ea98b4
|
added new category to FDD rule in API & Admin UI
|
2021-06-17 16:06:18 +08:00 |
|
13621160019@163.com
|
7271ae38f8
|
added data sort to FDD messages in Admin UI
|
2021-06-14 15:52:14 +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
|
fd8245420d
|
updated version to v1.1.3
|
2021-05-25 17:55:47 +08:00 |
|
13621160019@163.com
|
db10874f19
|
updated version to v1.1.3
|
2021-05-25 17:05:59 +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
|
bfb2fcd2e5
|
deleted slim-scroll from and added maxheight to panel of views in Admin UI
|
2021-04-07 22:10:37 +08:00 |
|
13621160019@163.com
|
b092caff50
|
updated panel width and height of costcenter in Admin UI
|
2021-04-07 21:23:25 +08:00 |
|
13621160019@163.com
|
75ad399750
|
updated panel width and height of combinedequipment view in Admin UI
|
2021-04-07 21:01:34 +08:00 |
|
13621160019@163.com
|
da45ba0f68
|
updated panel width and height of equipment view in Admin UI
|
2021-04-07 20:48:44 +08:00 |
|
guangyuzhang
|
7071375e8c
|
upated panels' width and height in shopfloor view of Admin UI
|
2021-04-04 16:20:33 +08:00 |
|
guangyuzhang
|
b6e5cf9960
|
upated panels width and height of store view in Admin UI
|
2021-04-04 16:04:54 +08:00 |
|
guangyuzhang
|
714edc42ad
|
updated panels' widith and height of tenant view in Admin UI
|
2021-04-04 15:47:16 +08:00 |
|
guangyuzhang
|
ad611f096a
|
updated width and height of panels in space view in Admin UI
|
2021-04-04 13:38:10 +08:00 |
|
guangyuzhang
|
c8819ba9ba
|
updated space bind meter panel to be scrollable in Admin UI
|
2021-04-04 12:22:07 +08:00 |
|
13621160019@163.com
|
e76066b62a
|
upgraded version to v1.1.1
|
2021-03-31 15:49:23 +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 |
|
guangyuzhang
|
9e6362df25
|
added Deutsch (German) login language list in admin UI
|
2021-03-21 09:09:29 +08:00 |
|
13621160019@163.com
|
c08db755f4
|
updated version to v1.1.0
|
2021-03-18 11:47:46 +08:00 |
|
13621160019@163.com
|
373c2a1fb1
|
added 'optional' tips to meter,virtual meter and offline meter setting in admin UI
|
2021-03-17 17:24:34 +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
|
57b6dd3266
|
changed to set contact of space is optional in web UI and API
|
2021-03-15 13:46:16 +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
|
7eb371bf30
|
updated version to v1.0.8
|
2021-03-11 16:09:33 +08:00 |
|
13621160019@163.com
|
fd41af641b
|
added translation for German
|
2021-03-10 19:36:04 +08:00 |
|
13621160019@163.com
|
38d98a5ca1
|
updated change log and version number
|
2021-03-07 15:29:57 +08:00 |
|
13621160019@163.com
|
6797790785
|
fixed wrong headers issues in admin
|
2021-03-02 14:57:56 +08:00 |
|
13621160019@163.com
|
3e2eae7a77
|
Merge branch 'develop' of https://github.com/myems/myems into develop
|
2021-03-02 12:02:44 +08:00 |
|
13621160019@163.com
|
aaf72ba41d
|
updated badges in README
|
2021-03-02 12:02:23 +08:00 |
|
guangyuzhang
|
ce7553afcb
|
fixed null contact issue in space controller in admin
|
2021-03-01 22:38:20 +08:00 |
|
guangyuzhang
|
215e90aa4b
|
deleted require property for space contact in admin
|
2021-03-01 22:17:50 +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
|
1399fbc3c8
|
removed required property from equipment model in admin
|
2021-02-26 17:57:06 +08:00 |
|
13621160019@163.com
|
06eb9ae4c2
|
modified gitignore file in admin
|
2021-02-22 15:49:08 +08:00 |
|
13621160019@163.com
|
375f94ed3a
|
updated READMEs for using gzip on NGINX
|
2021-02-21 15:54:42 +08:00 |
|
13621160019@163.com
|
19959847ef
|
updated README files
|
2021-02-21 13:56:12 +08:00 |
|
13621160019@163.com
|
6514e753d0
|
updated gitignore files
|
2021-02-20 20:04:48 +08:00 |
|
13621160019@163.com
|
070c7a0d56
|
merged myems-admin
|
2021-02-19 14:43:12 +08:00 |