Commit Graph

1331 Commits (672d3ded108d5cf127ea190b474879463b864965)

Author SHA1 Message Date
hyh123a 672d3ded10 modify the README.md 2021-10-01 11:49:42 +08:00
13621160019@163.com e1da419a2f updated format of excel exporters 2021-09-30 22:39:29 +08:00
13621160019@163.com 047241d466 updated format of excel exporters 2021-09-30 22:21:44 +08:00
13621160019@163.com afaa33e4fb updated format of excel exporters 2021-09-29 22:42:47 +08:00
13621160019@163.com 5f4776df4d reformatted excel exporters 2021-09-28 22:57:52 +08:00
13621160019@163.com 0cefad0ef1 reformatted excel exporter of spaceenergycategory 2021-09-28 22:18:31 +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
13621160019@163.com 7c0d6b955a changed last run datetime and next run datetime formater for rule from timestamp to strftime
Merge branch 'develop'
2021-09-22 15:44:46 +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 f8f2cdc9c4 changed last seen datetime formater for gateway from timestamp to strftime
Merge branch 'develop'
2021-09-22 15:25:54 +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 10404da946 changed last seen datetime formater of datasource from timestamp to strftime
Merge branch 'develop'
2021-09-22 14:50:57 +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 76ee5c048c Merge branch 'develop' 2021-09-22 14:01:29 +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 aaa2907a79 updated demo scripts of database
Merge branch 'develop'
2021-09-22 11:38:34 +08:00
13621160019@163.com 74de652736 updated demo scripts of database 2021-09-22 11:35:17 +08:00
13621160019@163.com be0f0e3807 added expiration datetimes to User in Admin UI
Merge branch 'develop'
2021-09-22 11:33:30 +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 9ec8a02b84 added expiration datetimes to user actions in API
Merge branch 'develop'
2021-09-21 16:59:42 +08:00
13621160019@163.com 01b6dabb31 added expiration datetimes to user actions in API 2021-09-21 16:03:39 +08:00
13621160019@163.com c346742387 added expiration datetimes to user table in database
Merge branch 'develop'
2021-09-20 22:19:26 +08:00
13621160019@163.com e56f52d625 added expiration datetimes to user table in database 2021-09-20 22:17:25 +08:00
13621160019@163.com a4305b523e updated demo script of database
Merge branch 'develop'
2021-09-19 15:45:54 +08:00
13621160019@163.com ee228c752b updated demo script of database 2021-09-19 15:42:23 +08:00
13621160019@163.com 4d29d3ec20 updated translation of Admin UI 2021-09-19 15:40:24 +08:00
13621160019@163.com 898e1286dc updated demo scripts of database
Merge branch 'develop'
2021-09-18 22:50:24 +08:00
13621160019@163.com 824bd8b1a7 updated demo scripts of database 2021-09-18 22:49:48 +08:00
13621160019@163.com dc57bbbc02 updated demo script of database
Merge branch 'develop'
2021-09-17 17:52:45 +08:00
13621160019@163.com 984d394d25 updated demo script of database 2021-09-17 17:52:21 +08:00
13621160019@163.com f1dd8c6d89 fixed typo in contact controller of Admin UI
Merge branch 'develop'
2021-09-17 14:15:15 +08:00
13621160019@163.com 3b236fe454 fixed typo in contact controller of Admin UI 2021-09-17 14:14:20 +08:00