13621160019@163.com
|
4fceb3beb5
|
Merge branch 'develop'
|
2021-12-29 18:02:47 +08:00 |
|
13621160019@163.com
|
1f823647eb
|
updated dependencies in web ui
|
2021-12-29 17:58:51 +08:00 |
|
13621160019@163.com
|
abe83be033
|
Merge branch 'develop'
|
2021-12-29 12:28:56 +08:00 |
|
13621160019@163.com
|
79a7227e82
|
updated react-countup to v6.1.0 in web ui
|
2021-12-29 12:24:21 +08:00 |
|
13621160019@163.com
|
f6317b2be3
|
Merge branch 'develop'
|
2021-12-29 11:43:05 +08:00 |
|
13621160019@163.com
|
d6a7b7ad78
|
updated Meter RealtimeChart in web ui
|
2021-12-29 11:41:22 +08:00 |
|
13621160019@163.com
|
ec7fa13f3f
|
Merge branch 'PR' into develop
|
2021-12-29 10:49:03 +08:00 |
|
Caozhenhui
|
16bf7df2f8
|
fixed issue 159
|
2021-12-29 10:18:45 +08:00 |
|
Caozhenhui
|
84c01910e0
|
fixed issue 159
|
2021-12-28 21:24:09 +08:00 |
|
Caozhenhui
|
a435fb50a6
|
fixed issue 159
|
2021-12-28 20:41:57 +08:00 |
|
13621160019@163.com
|
ce242594c2
|
Merge branch 'develop'
|
2021-12-28 17:20:38 +08:00 |
|
13621160019@163.com
|
a248df9006
|
updated web for latest Node.js version
|
2021-12-28 17:17:31 +08:00 |
|
13621160019@163.com
|
ffa5b9ac3a
|
Merge branch 'develop'
|
2021-12-28 14:57:46 +08:00 |
|
13621160019@163.com
|
e31307dfd9
|
added PUT actions to text/wechat/email messages in api
|
2021-12-28 14:57:22 +08:00 |
|
13621160019@163.com
|
78c2514afa
|
Merge branch 'PR' into develop
|
2021-12-28 14:21:28 +08:00 |
|
13621160019@163.com
|
fadf138f62
|
Merge branch 'develop'
|
2021-12-27 23:09:54 +08:00 |
|
13621160019@163.com
|
0f17f7483d
|
Merge branch 'PR' into develop
|
2021-12-27 23:08:25 +08:00 |
|
Caozhenhui
|
1158bc841f
|
solved I4ENPR
|
2021-12-27 17:04:40 +08:00 |
|
tianlinzhong
|
be7c51b2c1
|
Added Put Update New EmailMessage API and text message and wechat message
|
2021-12-27 16:03:13 +08:00 |
|
13621160019@163.com
|
c592207cf8
|
Merge branch 'develop'
|
2021-12-26 22:49:05 +08:00 |
|
13621160019@163.com
|
da14bd2376
|
updated readme for docker-compose
|
2021-12-26 22:47:29 +08:00 |
|
13621160019@163.com
|
5e6fd0d84d
|
Merge branch 'develop'
|
2021-12-25 22:48:06 +08:00 |
|
13621160019@163.com
|
9dfe7365c8
|
updated bind mount directory of api and adin in docker compose
|
2021-12-25 22:43:26 +08:00 |
|
13621160019@163.com
|
1c8daa74e8
|
updated bind mount directory of api and adin in docker compose
|
2021-12-25 22:39:48 +08:00 |
|
13621160019@163.com
|
5269c11310
|
Merge branch 'develop'
|
2021-12-25 21:30:07 +08:00 |
|
13621160019@163.com
|
abadf16516
|
added bind-mount upload file folder to containers of myems-api and admin
|
2021-12-25 21:28:29 +08:00 |
|
13621160019@163.com
|
81555f8693
|
Merge branch 'develop'
|
2021-12-24 19:57:44 +08:00 |
|
13621160019@163.com
|
d0e06e122e
|
added POST actions to create new email/wechat/text messages
|
2021-12-24 19:54:22 +08:00 |
|
13621160019@163.com
|
2749a8670f
|
Merge branch 'PR' into develop
|
2021-12-24 18:10:16 +08:00 |
|
tianlinzhong
|
289a6439e8
|
Added POST Create New WechatMessage API 2
|
2021-12-23 16:11:54 +08:00 |
|
tianlinzhong
|
1d88799907
|
Added POST Create New EmailMessage API 2
|
2021-12-22 10:47:49 +08:00 |
|
tianlinzhong
|
d66cdd54d0
|
Added POST Create New EmailMessage API and text message and wechat message
|
2021-12-21 15:29:37 +08:00 |
|
tianlinzhong
|
043c39b81a
|
Added POST Create New EmailMessage API and text message and wechat message
|
2021-12-21 15:04:09 +08:00 |
|
13621160019@163.com
|
faba06271f
|
Merge branch 'develop'
|
2021-12-20 21:21:40 +08:00 |
|
13621160019@163.com
|
907a582c48
|
updated get messages by date range in admin and api
|
2021-12-20 21:15:26 +08:00 |
|
13621160019@163.com
|
3045e8d4f0
|
Merge branch 'PR' into develop
|
2021-12-20 20:25:40 +08:00 |
|
13621160019@163.com
|
be9b8eec03
|
Merge branch 'develop'
|
2021-12-20 20:08:12 +08:00 |
|
13621160019@163.com
|
75ea44dd84
|
added locl/unlock user who faied login some times to admin and api
|
2021-12-20 20:00:48 +08:00 |
|
13621160019@163.com
|
701e9f2ad5
|
Merge branch 'PR' into develop
|
2021-12-20 19:29:00 +08:00 |
|
Caozhenhui
|
545ea96fee
|
use config.maximum failed login count instead of 3
|
2021-12-20 19:25:02 +08:00 |
|
13621160019@163.com
|
5e8153ba95
|
Merge branch 'PR' into develop
|
2021-12-20 18:42:32 +08:00 |
|
Caozhenhui
|
3d26c687fd
|
Solved two problems of the last PR
|
2021-12-20 14:21:32 +08:00 |
|
tianlinzhong
|
c45e4a84e3
|
Modified the TextMessages webmessage wechatmessage interface
|
2021-12-20 11:55:16 +08:00 |
|
13621160019@163.com
|
1140398c30
|
Merge branch 'develop'
|
2021-12-20 09:30:37 +08:00 |
|
13621160019@163.com
|
4f414cb34a
|
updated get emailmessages api in postman and readme
|
2021-12-20 09:24:39 +08:00 |
|
13621160019@163.com
|
5057fc9e4c
|
Merge branch 'develop'
|
2021-12-19 08:01:06 +08:00 |
|
13621160019@163.com
|
623ecd87d1
|
updated config files
|
2021-12-19 07:58:01 +08:00 |
|
13621160019@163.com
|
d940f4e470
|
Merge branch 'develop'
|
2021-12-18 21:18:14 +08:00 |
|
13621160019@163.com
|
5f4e6fa39d
|
updated config.py in myems-aggregation service
|
2021-12-18 21:17:53 +08:00 |
|
13621160019@163.com
|
b629cc8cf3
|
Merge branch 'develop'
|
2021-12-18 20:52:52 +08:00 |