Commit Graph

2002 Commits (ac9a4991f5c7188cd1ccdc3a8c55b9cb79203595)

Author SHA1 Message Date
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
13621160019@163.com 04b9849141 updated example.env in api 2021-12-18 20:52:27 +08:00
13621160019@163.com 8ddc889b3e Merge branch 'develop' 2021-12-18 17:46:14 +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