1602 Commits

Author SHA1 Message Date
Gordon
679c913f3a Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-28 16:57:24 +08:00
Gordon
03fb7947c3 add oa notification 2022-03-28 16:57:08 +08:00
wangchuxiao
c39f5a27b2 tag 2022-03-28 16:49:19 +08:00
wangchuxiao
dbdb516f3c tag 2022-03-28 16:42:18 +08:00
wangchuxiao
c1a97b7356 tag 2022-03-28 16:20:20 +08:00
wangchuxiao
a6d8f7ea24 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-28 16:03:16 +08:00
wangchuxiao
574c7600e0 tag 2022-03-28 16:02:31 +08:00
Gordon
d1c0205d77 add oa notification 2022-03-28 15:55:55 +08:00
wangchuxiao
13c29d2c1e tag 2022-03-28 15:04:42 +08:00
wangchuxiao
dc1a0f050e tag 2022-03-28 14:54:46 +08:00
wangchuxiao
e252a00d55 tag 2022-03-28 14:11:47 +08:00
Gordon
5bedbb7c7d script modify 2022-03-28 12:56:59 +08:00
wangchuxiao
e510418152 Merge branch 'office_tag' into tuoyun 2022-03-28 12:17:48 +08:00
wangchuxiao
8197ae6aa7 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-28 12:17:32 +08:00
wangchuxiao
9d619d520d tag 2022-03-28 12:17:07 +08:00
wangchuxiao
46605479e9 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into office_tag 2022-03-25 18:48:30 +08:00
wangchuxiao
6d20eddd43 mongo 2022-03-25 18:46:27 +08:00
skiffer-git
c1ee2a0adb
Update docker-compose.yaml 2022-03-25 12:48:11 +08:00
skiffer-git
9d29d49ada group dismissed v2.0.5 2022-03-24 15:33:30 +08:00
wangchuxiao
e7b95892ff minio upload api 2022-03-23 17:40:51 +08:00
wangchuxiao
4bf5c77374 mongo 2022-03-23 17:18:40 +08:00
wangchuxiao
df4a75f4b0 mongo 2022-03-23 17:15:46 +08:00
wangchuxiao
4bdb4cbbb5 mongo 2022-03-23 16:13:18 +08:00
wangchuxiao
4cdcdee8e4 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-23 15:44:59 +08:00
wangchuxiao
e6c36411cb mongo 2022-03-23 15:44:34 +08:00
skiffer-git
a4788a95af
Update issue templates 2022-03-23 11:33:35 +08:00
Gordon
b5de638c0b ws remove log 2022-03-23 11:32:58 +08:00
skiffer-git
c1a210313e
Update issue templates 2022-03-23 11:28:08 +08:00
skiffer-git
ab0ed67f81
Update issue templates 2022-03-23 11:26:25 +08:00
skiffer-git
5d54d5b7d6
Update issue templates 2022-03-23 11:25:59 +08:00
Gordon
1d09ffa529 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-22 18:13:48 +08:00
Gordon
eef9d15aaa ws remove log 2022-03-22 18:13:34 +08:00
wangchuxiao
8034ddc413 mongo 2022-03-22 14:30:07 +08:00
wangchuxiao
e75adb165a mongo 2022-03-21 19:36:10 +08:00
wangchuxiao
09ce0d5285 mongo 2022-03-21 19:19:33 +08:00
wangchuxiao
cc1ad41e94 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-21 16:57:14 +08:00
wangchuxiao
8a38646bc5 mongo 2022-03-21 16:56:52 +08:00
Gordon
a2b65f52f6 fix group create bug 2022-03-21 15:45:26 +08:00
jaonzyx
c16d8da784
管理员创建群组bug fix (#168) 2022-03-21 15:43:43 +08:00
goubo
a55582a018
方便测试导入数据 (#148) 2022-03-21 15:25:41 +08:00
Gordon
ea6d472002 pr modify and update 2022-03-21 14:59:00 +08:00
Gordon
3dc4290f2a pr modify and update 2022-03-21 14:57:35 +08:00
hxnets
6c43f75f9f
新增阿里云OSS文件上传参数获取接口 (#115)
* configure update

* mongo:4.0

* open-im-server -> open_im_server

* sleep 15

* 0.0.0.0

* sleep 10 15

* Update config.yaml

* config

* Update docker-compose.yaml

* Update config.yaml

* Create ISSUE_TEMPLATE.md

* Update ISSUE_TEMPLATE.md

* Create ISSUE_TEMPLATE

* add issue template

* add issue template

* add issue template

* add issue template

* Update README.md

* script

* script

* script

* config

* script

* config update

* script update

* image: openim/open_im_server:v1.0.6

* script

* script

* script

* version update

* sender message sync

* version update

* 阿里云oss sts上传参数

* 阿里云oss sts上传参数

Co-authored-by: wenxu12345 <44203734@qq.com>
Co-authored-by: skiffer-git <72860476+skiffer-git@users.noreply.github.com>
Co-authored-by: Gordon <1432970085@qq.com>
Co-authored-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2022-03-21 14:43:41 +08:00
Sunny
e0c6972bed
Update config.yaml (#167)
Co-authored-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2022-03-21 11:19:10 +08:00
马守越
1ab3e04cba
新增mongo.dbUrl配置 (#174)
* 当dbUri值不为空则直接使用该值

* 新增支持ali oss

Co-authored-by: mashouyue's m1max <mashouyue@toowow.cn>
2022-03-21 11:13:17 +08:00
Arthur
1b8f664c8a
fix: json tag value of UserIDResult.UserID (#178)
Signed-off-by: arthur <yang_yapo@126.com>
2022-03-21 11:03:46 +08:00
Gordon
25adfe5b28 check shell update v2.04 2022-03-18 20:06:52 +08:00
Gordon
7637b2bec2 check shell update 2022-03-18 19:08:31 +08:00
Gordon
6b3d984ca6 log update 2022-03-18 19:02:46 +08:00
Gordon
da5bfe32af log update 2022-03-18 18:18:10 +08:00