Commit Graph

1982 Commits (eda10a270c051e082a12533a7258869f56f2ed93)

Author SHA1 Message Date
Caozhenhui eda10a270c Merge branch 'develop' of gitee.com:myems/myems into develop 2022-02-14 15:04:43 +08:00
13621160019@163.com df93db46b0 added default character set and collate to database 2022-02-13 20:14:13 +08:00
13621160019@163.com 05ea20416f updated version number to v1.7.1 2022-02-12 21:03:25 +08:00
13621160019@163.com bdb14ee2c0 updated POSTMAN 2022-02-12 16:00:51 +08:00
13621160019@163.com 1e652da94d updated Web Message actions in API and Notification Page in Web UI 2022-02-12 15:53:55 +08:00
13621160019@163.com 12843792f1 Merge branch 'PR' into develop 2022-02-12 14:47:23 +08:00
13621160019@163.com e0f720b8e4 Bump node-sass from 6.0.1 to 7.0.0 in Web 2022-02-11 20:07:16 +08:00
13621160019@163.com 42ed405afa Merge branch 'PR' into develop 2022-02-11 16:45:51 +08:00
13621160019@163.com d4066543c3 updated database upgrade scripts 2022-02-11 16:12:17 +08:00
13621160019@163.com b721dfdd2a updated comment of tbl_web_messages in database 2022-02-11 15:07:41 +08:00
13621160019@163.com 03eb3ba94b fixed issue tbl_users in database 2022-02-11 14:58:37 +08:00
dependabot[bot] 32f0f85482
Bump node-sass from 6.0.1 to 7.0.0 in /web
Bumps [node-sass](https://github.com/sass/node-sass) from 6.0.1 to 7.0.0.
- [Release notes](https://github.com/sass/node-sass/releases)
- [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/node-sass/compare/v6.0.1...v7.0.0)

---
updated-dependencies:
- dependency-name: node-sass
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-11 04:04:12 +00:00
Caozhenhui 3dcd03218e fixed issue 192 2022-02-11 01:33:23 +08:00
13621160019@163.com e36cf6cf46 Merge branch 'PR' into develop 2022-02-10 22:06:19 +08:00
Caozhenhui 154a2a859e fixed issue 192 2022-02-10 20:37:40 +08:00
Caozhenhui 3690d0e02b fixed issue 192 2022-02-10 20:36:01 +08:00
tianlinzhong af332baa3c fixed Web UI Notification Error 2022-02-09 16:08:56 +08:00
13621160019@163.com 79c76e3419 fixed issue of Notification in Web UI 2022-02-09 10:44:33 +08:00
13621160019@163.com 444e226378 Merge branch 'PR' into develop 2022-02-09 09:29:32 +08:00
tianlinzhong 85ceeb8648 fixed Web UI Notification 404 Error 2022-02-08 19:51:24 +08:00
13621160019@163.com e330c36e77 Merge branch 'develop' 2022-02-08 15:31:59 +08:00
13621160019@163.com de96ac888b Merge branch 'PR' into develop 2022-02-08 15:05:19 +08:00
Caozhenhui 6e40b42403 fixed energyflowdiagram web error 2022-02-08 14:42:53 +08:00
13621160019@163.com 68646e540b Merge branch 'develop' 2022-02-04 10:11:35 +08:00
13621160019@163.com 252ecc9e92 updated docs 2022-02-04 10:10:18 +08:00
13621160019@163.com 066dcbc8ed Merge branch 'develop' 2022-01-30 21:45:48 +08:00
13621160019@163.com db1b32b4f9 updated installation guide in README 2022-01-30 21:42:18 +08:00
13621160019@163.com 4d3fe62eb9 Merge branch 'develop' 2022-01-30 20:14:08 +08:00
13621160019@163.com d3ca99e516 updated mysql-connector-python version in README 2022-01-30 20:12:19 +08:00
13621160019@163.com 39f419fccc Merge branch 'develop' 2022-01-29 18:10:35 +08:00
13621160019@163.com f977d2c1c4 added myems_carbon_db to recalculating script 2022-01-29 18:09:24 +08:00
13621160019@163.com e7a4453b8a added myems_carbon_db to recalculating script 2022-01-29 18:08:16 +08:00
13621160019@163.com d9c88d95d2 Merge branch 'develop' 2022-01-28 19:23:31 +08:00
13621160019@163.com 225dd53330 udpated version number to v1.7.0 2022-01-28 19:14:19 +08:00
13621160019@163.com a2660aa6e6 Merge branch 'develop' 2022-01-28 18:32:10 +08:00
13621160019@163.com 6026fc3d8c fixed isssues in README 2022-01-28 18:26:03 +08:00
13621160019@163.com 35cad1a811 fixed isssues in README 2022-01-28 18:23:14 +08:00
13621160019@163.com 11b4902661 Merge branch 'develop' 2022-01-28 13:56:23 +08:00
13621160019@163.com 5db7e8d4e5 added offline meter carbon dioxide emission aggregation procedure 2022-01-28 13:54:34 +08:00
13621160019@163.com 145d80cf38 Merge branch 'develop' 2022-01-28 13:44:47 +08:00
13621160019@163.com 0b7beecfb8 added virtual meter carbon dioxide emssion aggregation procedure 2022-01-28 13:42:45 +08:00
13621160019@163.com a1e60ab9f8 Merge branch 'develop' 2022-01-27 22:49:49 +08:00
13621160019@163.com efd73d962d added virtual meter carbon dioxide emssion aggregation procedure 2022-01-27 22:47:01 +08:00
13621160019@163.com a93dbe2d1b Merge branch 'develop' 2022-01-26 18:21:58 +08:00
13621160019@163.com 577f937fc5 updated example.env of myems-api 2022-01-26 18:19:46 +08:00
13621160019@163.com f00908f0b1 fixed issue of carbon_dioxide_emmision_factor in aggregation serivce 2022-01-26 17:37:06 +08:00
13621160019@163.com a544b58d5f Merge branch 'develop' 2022-01-26 16:10:22 +08:00
13621160019@163.com 281575a423 fixed issue of config in aggregation service 2022-01-26 16:08:52 +08:00
13621160019@163.com 4f68675c3e Merge branch 'develop' 2022-01-25 22:45:39 +08:00
13621160019@163.com 912fd5b613 added meter carbon dioxide emission aggregation procedure 2022-01-25 22:40:57 +08:00