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

1357 Commits (b97c16fbb976431bd0df911066c3fb185b913416)

Author SHA1 Message Date
13621160019@163.com b97c16fbb9 updated config.py files to move all variables to .env files via Python Decouple 2021-10-12 18:39:42 +08:00
Winnerineast Lee 9a82cbb999
Merge pull request #2 from MyEMS/master 
catch up with the main site.
 2021-10-05 16:10:30 +08:00
13621160019@163.com b3d5816cfc updated database installation script and README 
Merge branch 'develop'
 2021-10-04 18:08:43 +08:00
13621160019@163.com cf879c4421 updated database installation script and README 2021-10-04 18:07:30 +08:00
13621160019@163.com 795fd04819 fixed issue for editing user name and password in Admin UI 
Merge branch 'develop'
 2021-10-03 19:14:10 +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 8b3007d901 updated format of excel exporters 
Merge branch 'develop'
 2021-10-03 09:59:56 +08:00
13621160019@163.com e098ec5763 updated format of excel exporters 2021-10-03 09:55:10 +08:00
13621160019@163.com df4b0f0031 updated format of excel exporters 
Merge branch 'develop'
 2021-10-02 22:52:50 +08:00
13621160019@163.com 70525e0631 updated format of excel exporters 2021-10-02 22:50:58 +08:00
Winnerineast Lee aa7db89bb9
Merge pull request #1 from MyEMS/master 
catch up with the main site.
 2021-10-02 19:47:37 +08:00
winnerineast 3e884614ce mask out all clear password into encrypted ones for myems-normalization. 2021-10-01 19:08:43 +08:00
winnerineast 808addf1ec mask out all clear password into encrypted ones for myems-modbus. 2021-10-01 19:05:48 +08:00
winnerineast 84abff5455 mask out all clear password into encrypted ones for myems-cleaning. 2021-10-01 19:02:50 +08:00
winnerineast 60906080f4 mask out all clear password into encrypted ones. 2021-10-01 18:58:05 +08:00
winnerineast 1bfdedf0cc fixed one bug for database. 
created a dirty and easy way to run myems-api.
enhanced requirements.txt for both database and myems-api.
 2021-10-01 18:38:34 +08:00
winnerineast 4a8f06af83 created batch script to initialize the database. 2021-10-01 13:45:30 +08:00
13621160019@163.com 5de2dc1814 updated Docker section in README 
Merge branch 'develop'
 2021-10-01 13:21:13 +08:00
13621160019@163.com 8a7ab4956e updated Docker section in README 
Merge branch 'PR65' into develop
 2021-10-01 13:17:51 +08:00
13621160019@163.com 4a2f2ba9c5 updated Docker section in README 2021-10-01 13:17:36 +08:00
hyh123a 672d3ded10 modify the README.md 2021-10-01 11:49:42 +08:00
13621160019@163.com 24c3b57d6c update format of excel exporters 
Merge branch 'develop'
 2021-09-30 22:41:44 +08:00
13621160019@163.com e1da419a2f updated format of excel exporters 2021-09-30 22:39:29 +08:00
13621160019@163.com 6a3662f9d9 updated format of excel exporters 
Merge branch 'develop'
 2021-09-30 22:24:23 +08:00
13621160019@163.com 047241d466 updated format of excel exporters 2021-09-30 22:21:44 +08:00
13621160019@163.com 53b30a9b4f updated format of excel exporters 
Merge branch 'develop'
 2021-09-29 22:45:16 +08:00
13621160019@163.com afaa33e4fb updated format of excel exporters 2021-09-29 22:42:47 +08:00
13621160019@163.com 43a68b3090 reformatted excel exporters 
Merge branch 'develop'
 2021-09-28 23:00:42 +08:00
13621160019@163.com 5f4776df4d reformatted excel exporters 2021-09-28 22:57:52 +08:00
13621160019@163.com f3373723f1 reformatted excel exporter of spaceenergycategory 
Merge branch 'develop'
 2021-09-28 22:20:51 +08:00
13621160019@163.com 0cefad0ef1 reformatted excel exporter of spaceenergycategory 2021-09-28 22:18:31 +08:00
13621160019@163.com 846a03e2e9 fixed NoneType issues in Excel Exporters 
Merge branch 'develop'
 2021-09-26 15:43:36 +08:00
13621160019@163.com 2e22c5cb92 fixed NoneType issues in ExcelExporters 2021-09-26 15:40:49 +08:00
13621160019@163.com 207a8d4230 Merge branch 'master' into develop 2021-09-25 22:43:34 +08:00
13621160019@163.com 3acb170e98 changed name font from Constantia to Arial in excel exporters 2021-09-25 22:42:26 +08:00
13621160019@163.com 4a02303da1 Merge branch 'develop' 2021-09-24 19:44:37 +08:00
13621160019@163.com 6d21b2517e updated version number to v1.3.0 2021-09-24 19:44:29 +08:00
13621160019@163.com 9b82828216 fixed PEP8 warnings and updated version number to v1.3.0 
Merge branch 'develop'
 2021-09-24 13:48:43 +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 ac39b6f8e3 replaced Chinese with English in Excel Exporters of API 
Merge branch 'develop'
 2021-09-23 17:33:56 +08:00
13621160019@163.com 685e96c0aa replaced Chinese with English in Excel Exporters of API 2021-09-23 17:33:39 +08:00
13621160019@163.com 4002482643 updated translations in Admin UI 
Merge branch 'develop'
 2021-09-22 23:05:37 +08:00
13621160019@163.com f529593322 updated translations in Admin UI 2021-09-22 23:03:41 +08:00
13621160019@163.com 8fa22120a4 removed gsmmodem and aliyun sms api from API & Admin UI 
Merge branch 'develop'
 2021-09-22 22:46:16 +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 483a4fb16c changed start&end datetime formater for tariff from timestamp to strftime 
Merge branch 'develop'
 2021-09-22 18:09:34 +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 e319f11fa6 changed lease start&end datetime formater for tenant from timestamp to strftime 
Merge branch 'develop'
 2021-09-22 16:10:24 +08:00
13621160019@163.com 26000b5af7 changed lease start&end datetime formater for tenant from timestamp to strftime 2021-09-22 16:10:10 +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