Commit Graph

1292 Commits (c3467423877927d410e82b59a39748e8b80f6f0c)

Author SHA1 Message Date
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
13621160019@163.com 33f6d3b289 added column ID to StoreBatch Excel Exporter in API
Merge branch 'develop'
2021-09-17 12:24:51 +08:00
13621160019@163.com bd43969274 added column ID to StoreBatch Excel Exporter in API 2021-09-17 12:24:25 +08:00
13621160019@163.com 367050e90b updated README of database
Merge branch 'develop'
2021-09-16 22:26:03 +08:00
13621160019@163.com 61fa6270c3 updated database README 2021-09-16 22:21:24 +08:00
13621160019@163.com f801f16ac5 updated demo script of database
Merge branch 'develop'
2021-09-16 16:44:29 +08:00
13621160019@163.com 4703bdbcf8 updated demo script of database 2021-09-16 16:44:02 +08:00
13621160019@163.com e1fbc075ba added meter ID to meterbatch excel exporter in API
Merge branch 'develop'
2021-09-15 22:36:14 +08:00
13621160019@163.com d2d4ced4d6 added meter ID to meterbatch excel exporter in API 2021-09-15 22:35:25 +08:00
13621160019@163.com 11a2f58c4f added new protocols of datasource into API
Merge branch 'develop'
2021-09-14 15:31:29 +08:00
13621160019@163.com b25559414d added new protocols of datasource into API 2021-09-14 15:30:47 +08:00
13621160019@163.com 9f9ad4a53d added new datasource protocols to API
Merge branch 'develop'
2021-09-14 11:10:52 +08:00
13621160019@163.com 982b71f1a4 added new datasource protocols to API 2021-09-14 11:10:18 +08:00
13621160019@163.com 67e85a7b43 added API error messages to translations.js and i18n.js
Merge branch 'develop'
2021-09-13 22:14:10 +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 79497c3cb5 added aliyunsmsapi to api/core
Merge branch 'develop'
2021-09-12 22:50:57 +08:00
13621160019@163.com 447eb57202 added aliyunsmsapi to api/core 2021-09-12 22:50:36 +08:00
13621160019@163.com 4d64ecc114 fixed typo
Merge branch 'develop'
2021-09-11 22:33:53 +08:00
13621160019@163.com 83e7e487ca fixed typo 2021-09-11 22:32:40 +08:00
13621160019@163.com a7f3f85deb updated demo databse for database ingestion servcie
Merge branch 'develop'
2021-09-10 19:06:18 +08:00
13621160019@163.com 9c3b53080b updated demo databse for database ingestion servcie 2021-09-10 19:05:47 +08:00
13621160019@163.com a560fcf186 updated distributionsystem point value timeout value to 30 minutes
Merge branch 'develop'
2021-09-10 15:56:35 +08:00
13621160019@163.com 7a760ad088 updated distibutionssystem point value timeout value to 30 minutes 2021-09-10 15:56:12 +08:00
13621160019@163.com a7d888eea8 updated Admin UI to make error messages more specific
Merge branch 'develop'
2021-09-09 16:15:29 +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 a22cd3266d added spinners to Dashboard of Web UI
Merge branch 'develop'
2021-09-09 12:10:26 +08:00
13621160019@163.com 9cb3a29469 added spinners to Dashboard of Web UI 2021-09-09 12:10:02 +08:00
13621160019@163.com f04411a856 updated translations of KGCE & KGCO2E in Admin UI
Merge branch 'develop'
2021-09-08 16:43:11 +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 8164502bd8 updated i18n of Web UI 2021-09-08 15:43:01 +08:00
13621160019@163.com eb56051699 updated README of Web UI
Merge branch 'develop'
2021-09-08 14:43:08 +08:00
13621160019@163.com 7de07eb002 updated README of Web UI 2021-09-08 14:42:42 +08:00
13621160019@163.com 88af282d66 added try_files directive to avoid 404 error while refreshing pages in Web UI
Merge branch 'develop'
2021-09-07 18:26:08 +08:00
13621160019@163.com f41a527c8b added try_files directive to avoid 404 error while refreshing pages in Web UI
Merge branch 'PR64' into develop
2021-09-07 18:25:48 +08:00
13621160019@163.com eed6617264 added try_files directive to avoid 404 error while refreshing pages in Web UI 2021-09-07 18:25:28 +08:00
13621160019@163.com b035654bd0 updated README for installing openpyxl
Merge branch 'develop'
2021-09-07 17:33:30 +08:00
13621160019@163.com 0018459f0e updated README for installing openpyxl 2021-09-07 17:33:10 +08:00
hyh123a 74ee2a9eba Merge branch 'develop' of https://gitee.com/hyh123_a/myems into develop 2021-09-07 15:18:34 +08:00
hyh123a 0444bc9d2e fixed the 404 error 2021-09-07 15:18:31 +08:00
13621160019@163.com 185325b5b0 updated Web UI README
Merge branch 'develop'
2021-09-07 12:24:50 +08:00