13621160019@163.com
|
6d66f5b5a2
|
Merge branch 'develop'
|
2022-02-18 18:22:05 +08:00 |
|
13621160019@163.com
|
5171f55700
|
Merge branch 'PR' into develop
|
2022-02-18 18:10:12 +08:00 |
|
tianlinzhong
|
46167e1839
|
fixed Web UI NotificationDown bug
|
2022-02-18 14:28:27 +08:00 |
|
13621160019@163.com
|
2019a6b90a
|
Merge branch 'develop'
|
2022-02-18 12:00:11 +08:00 |
|
13621160019@163.com
|
ab4bb773f0
|
updated docker-compose guide
|
2022-02-18 11:56:50 +08:00 |
|
13621160019@163.com
|
9eb6d96bc3
|
Merge branch 'develop'
|
2022-02-17 18:55:54 +08:00 |
|
13621160019@163.com
|
8ac293d4b3
|
added Mark All As Read action to notification
|
2022-02-17 18:55:31 +08:00 |
|
13621160019@163.com
|
93f9641d8b
|
added Mark All As Read action to notification
|
2022-02-17 18:54:54 +08:00 |
|
13621160019@163.com
|
73c5a990a9
|
Merge branch 'PR' into develop
|
2022-02-17 18:18:50 +08:00 |
|
Caozhenhui
|
51ff6234a6
|
added DateTimeRangeContainer to MeterEnergy
|
2022-02-16 01:07:33 +08:00 |
|
tianlinzhong
|
b132a3ba13
|
fixed Web UI Notification bug
|
2022-02-14 17:06:46 +08:00 |
|
Caozhenhui
|
eda10a270c
|
Merge branch 'develop' of gitee.com:myems/myems into develop
|
2022-02-14 15:04:43 +08:00 |
|
13621160019@163.com
|
f3dce31a38
|
Merge branch 'develop'
|
2022-02-13 20:15: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
|
d65f17a5ac
|
Merge branch 'develop'
|
2022-02-12 21:09:58 +08:00 |
|
13621160019@163.com
|
05ea20416f
|
updated version number to v1.7.1
|
2022-02-12 21:03:25 +08:00 |
|
13621160019@163.com
|
94918841c7
|
Merge branch 'develop'
|
2022-02-12 16:02:03 +08:00 |
|
13621160019@163.com
|
bdb14ee2c0
|
updated POSTMAN
|
2022-02-12 16:00:51 +08:00 |
|
13621160019@163.com
|
289b05d6f5
|
Merge branch 'develop'
|
2022-02-12 15:55:57 +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
|
814fe6a9a0
|
Merge branch 'develop'
|
2022-02-11 20:08:37 +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
|
63e5a00fe5
|
Merge branch 'develop'
|
2022-02-11 16:16:35 +08:00 |
|
13621160019@163.com
|
d4066543c3
|
updated database upgrade scripts
|
2022-02-11 16:12:17 +08:00 |
|
13621160019@163.com
|
6b0dd3d44a
|
Merge branch 'develop'
|
2022-02-11 15:16:26 +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
|
89d3d6e41d
|
Merge branch 'develop'
|
2022-02-09 10:44:54 +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 |