13621160019@163.com
|
623ecd87d1
|
updated config files
|
2021-12-19 07:58:01 +08:00 |
|
13621160019@163.com
|
5f4e6fa39d
|
updated config.py in myems-aggregation service
|
2021-12-18 21:17:53 +08:00 |
|
13621160019@163.com
|
04b9849141
|
updated example.env in api
|
2021-12-18 20:52:27 +08:00 |
|
13621160019@163.com
|
402d969c12
|
updated CHANGELOG
|
2021-12-18 17:44:09 +08:00 |
|
13621160019@163.com
|
8c93ba813a
|
Merge branch 'develop'
|
2021-12-18 17:28:17 +08:00 |
|
13621160019@163.com
|
cdaa3fd186
|
changed all datatype JSON columns to datatype LONGTEXT in database
upgrade version number to v1.5.1
|
2021-12-18 17:11:11 +08:00 |
|
13621160019@163.com
|
3cbde358b8
|
Merge branch 'develop'
|
2021-12-18 11:10:54 +08:00 |
|
13621160019@163.com
|
b41f785f6e
|
updated date time picker of fdd message views in admin
|
2021-12-18 10:35:09 +08:00 |
|
13621160019@163.com
|
326e428363
|
Merge branch 'develop'
|
2021-12-17 22:38:32 +08:00 |
|
13621160019@163.com
|
1d1775a7aa
|
Merge branch 'PR' into develop
|
2021-12-17 22:34:37 +08:00 |
|
13621160019@163.com
|
6e4fd34651
|
updated date-range-picker of emailmessage view in admin
|
2021-12-17 22:34:24 +08:00 |
|
13621160019@163.com
|
0d20df82c5
|
Merge branch 'develop'
|
2021-12-17 21:01:02 +08:00 |
|
13621160019@163.com
|
01e894eaea
|
changed codechina to gitcode in README
|
2021-12-17 20:51:48 +08:00 |
|
13621160019@163.com
|
abf8322cac
|
Merge branch 'develop'
|
2021-12-17 20:10:42 +08:00 |
|
13621160019@163.com
|
d7101d3c34
|
Merge branch 'PR' into develop
|
2021-12-17 19:32:47 +08:00 |
|
Caozhenhui
|
1b1afa7de1
|
The step of judging the number of 'failed login count' moves to myems-api
|
2021-12-17 10:19:06 +08:00 |
|
Caozhenhui
|
7534e7a019
|
avoid merge conflict
|
2021-12-17 09:52:42 +08:00 |
|
Caozhenhui
|
273ab4cdab
|
avoid merge conflict
|
2021-12-17 09:45:10 +08:00 |
|
13621160019@163.com
|
58d18cf476
|
Merge branch 'develop'
|
2021-12-16 22:25:27 +08:00 |
|
13621160019@163.com
|
33e6c24e28
|
added unlock user into api and admin
|
2021-12-16 22:24:04 +08:00 |
|
13621160019@163.com
|
9af6a90a86
|
Merge branch 'PR' into develop
|
2021-12-16 21:57:33 +08:00 |
|
13621160019@163.com
|
82a9735a77
|
added maximum_failed_login_count to config in api
|
2021-12-16 21:57:16 +08:00 |
|
tianlinzhong
|
9086a2c767
|
Modified the EmailMessages interface 5
|
2021-12-15 15:13:52 +08:00 |
|
Caozhenhui
|
8375885468
|
If the login is successful, failed login count is cleared
|
2021-12-15 14:40:13 +08:00 |
|
Caozhenhui
|
747daab4cb
|
2021/12/15 11:49
|
2021-12-15 11:49:46 +08:00 |
|
Caozhenhui
|
3810b0cf30
|
modified login_counter to failed_login_count
|
2021-12-15 11:48:06 +08:00 |
|
Caozhenhui
|
7303ebdc58
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2021-12-15 11:36:04 +08:00 |
|
tianlinzhong
|
a581caa2fa
|
Modified the EmailMessages interface4
|
2021-12-15 09:52:55 +08:00 |
|
tianlinzhong
|
952e9dd278
|
Modified the EmailMessages interface3
|
2021-12-15 09:49:38 +08:00 |
|
13621160019@163.com
|
99bc30040a
|
Merge branch 'develop'
|
2021-12-14 23:18:17 +08:00 |
|
13621160019@163.com
|
d56f839e21
|
added failed_login_count to user database
|
2021-12-14 23:17:48 +08:00 |
|
Caozhenhui
|
d387684a78
|
lock user
|
2021-12-13 20:15:41 +08:00 |
|
tianlinzhong
|
3cc2c929ec
|
Modified the EmailMessages interface
|
2021-12-13 17:28:20 +08:00 |
|
tianlinzhong
|
45e9bd9e7e
|
Modified the EmailMessages interface
|
2021-12-13 17:13:11 +08:00 |
|
tianlinzhong
|
905cd6f870
|
EmailMessages interface is modified
|
2021-12-13 17:07:52 +08:00 |
|
13621160019@163.com
|
0bebd82064
|
Merge branch 'develop'
|
2021-12-12 17:42:32 +08:00 |
|
13621160019@163.com
|
56c4c6b188
|
upgraded version number to v1.5.0
|
2021-12-12 17:40:07 +08:00 |
|
13621160019@163.com
|
49d21f2fa0
|
Merge branch 'develop'
|
2021-12-11 21:30:34 +08:00 |
|
13621160019@163.com
|
a31d040f85
|
updated README
|
2021-12-11 21:26:36 +08:00 |
|
13621160019@163.com
|
c479e31fb0
|
Merge branch 'develop'
|
2021-12-10 19:30:36 +08:00 |
|
13621160019@163.com
|
af7157fff9
|
added access control to space, offline meter and virtual meter in api and admin
|
2021-12-10 19:24:49 +08:00 |
|
13621160019@163.com
|
849934afa3
|
Merge branch 'PR' into develop
|
2021-12-10 18:22:39 +08:00 |
|
13621160019@163.com
|
fb93dad115
|
Merge branch 'develop'
|
2021-12-10 17:59:58 +08:00 |
|
13621160019@163.com
|
d3519bf39c
|
added access control to rule in api and admin
|
2021-12-10 17:58:42 +08:00 |
|
13621160019@163.com
|
5844dcb632
|
Merge branch 'develop'
|
2021-12-10 17:25:10 +08:00 |
|
13621160019@163.com
|
806554923f
|
added energy model database
added tables to energy baseline database
added tables to billing baseline database
|
2021-12-10 17:22:34 +08:00 |
|
13621160019@163.com
|
3768022234
|
Merge branch 'develop'
|
2021-12-09 12:10:18 +08:00 |
|
13621160019@163.com
|
bf6a8ba8ee
|
added access control to costcenter and tariff in api and admin
|
2021-12-09 12:08:00 +08:00 |
|
Caozhenhui
|
3e78a06a1d
|
added access control to space virtualmeter and offlinemeter
|
2021-12-09 12:04:30 +08:00 |
|
13621160019@163.com
|
4d9b60af3d
|
Merge branch 'PR' into develop
|
2021-12-09 11:20:33 +08:00 |