342 Commits

Author SHA1 Message Date
wangchuxiao
d600042110 tag and set private tips 2022-03-31 14:50:02 +08:00
wangchuxiao
29a268d476 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-29 17:33:13 +08:00
wangchuxiao
18d7aab703 tag 2022-03-29 17:33:06 +08:00
skiffer-git
373e6b6c8e mute group 2022-03-29 17:29:05 +08:00
Gordon
e8517e954d group add 2022-03-29 17:20:37 +08:00
Gordon
bc260fffde group add 2022-03-29 17:15:51 +08:00
Gordon
acca147ff2 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-29 16:56:43 +08:00
Gordon
d53da0e422 group add 2022-03-29 16:56:33 +08:00
wangchuxiao
d2fa0e7852 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-29 16:10:43 +08:00
wangchuxiao
f2b324abc2 tag 2022-03-29 16:10:36 +08:00
skiffer-git
d2225dd841 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-29 16:05:16 +08:00
skiffer-git
8d26aa86b9 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-29 16:05:08 +08:00
wangchuxiao
7e937d7d29 tag 2022-03-29 16:04:54 +08:00
skiffer-git
fe4b534b78 mute group 2022-03-29 16:04:15 +08:00
wangchuxiao
d0a65c7c68 tag 2022-03-29 15:58:42 +08:00
wangchuxiao
416f87f4bb tag 2022-03-29 15:50:20 +08:00
wangchuxiao
7eeb67be28 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-29 15:35:18 +08:00
wangchuxiao
7ed6ee5075 tag 2022-03-29 15:35:03 +08:00
skiffer-git
1aeff25316 mute group 2022-03-29 11:48:17 +08:00
Gordon
c5828aba91 Merge branch 'tuoyun'
# Conflicts:
#	cmd/open_im_api/main.go
#	config/config.yaml
#	go.sum
#	pkg/common/config/config.go
#	pkg/common/db/model.go
2022-03-29 10:58:01 +08:00
skiffer-git
1286f9dcb6 mute group 2022-03-29 09:34:45 +08:00
skiffer-git
391e525fc5 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-28 19:27:23 +08:00
skiffer-git
afc32b1cfa mute group 2022-03-28 19:27:05 +08:00
wangchuxiao
0797181967 tag 2022-03-28 19:18:30 +08:00
wangchuxiao
14c5e631ff tag 2022-03-28 19:15:59 +08:00
wangchuxiao
5cdb039c33 tag 2022-03-28 19:12:31 +08:00
wangchuxiao
a11c4fcb58 tag 2022-03-28 19:05:58 +08:00
wangchuxiao
e95400988e tag 2022-03-28 18:51:48 +08:00
wangchuxiao
d92ac8f588 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-28 18:13:08 +08:00
wangchuxiao
169665da32 tag 2022-03-28 18:13:01 +08:00
Gordon
c4d80b4844 auto migrate test 2022-03-28 17:52:40 +08:00
Gordon
7827749453 tag notification 2022-03-28 17:37:30 +08:00
wangchuxiao
e9ea117985 tag 2022-03-28 17:10:45 +08:00
wangchuxiao
b9ddb0140f tag 2022-03-28 17:02:03 +08:00
wangchuxiao
228cbb4082 tag 2022-03-28 16:59:15 +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
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
9d29d49ada group dismissed 2022-03-24 15:33:30 +08:00
wangchuxiao
e7b95892ff minio upload api 2022-03-23 17:40:51 +08:00
wangchuxiao
e6c36411cb mongo 2022-03-23 15:44:34 +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
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