blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,007 Commits 40 Branches 130 Tags
Commit Graph

216 Commits

Author SHA1 Message Date
skiffer-git
de55c14a16 mute group 2022-03-29 17:24:46 +08:00
skiffer-git
85cf7f26ce mute group 2022-03-29 17:03:06 +08:00
skiffer-git
fe4b534b78 mute group 2022-03-29 16:04:15 +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
afc32b1cfa mute group 2022-03-28 19:27:05 +08:00
wangchuxiao
e252a00d55 tag 2022-03-28 14:11:47 +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
e6c36411cb mongo 2022-03-23 15:44:34 +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
wenxu12345
91b9e50fd0 2.0.4 2022-03-18 17:21:04 +08:00
wangchuxiao
366f7621fa rtc add 2022-03-17 19:00:05 +08:00
wangchuxiao
58cea3e947 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-17 12:49:00 +08:00
wangchuxiao
f02fb7ba15 rtc add 2022-03-17 12:48:54 +08:00
wenxu12345
7bdf6717e1 add log 2022-03-17 11:57:21 +08:00
wangchuxiao
8fef1f975a rtc add 2022-03-16 20:37:37 +08:00
wangchuxiao
b0aa168c9a rtc add 2022-03-16 18:02:26 +08:00
wenxu12345
204b27ca5d pb platformID 2022-03-15 10:51:25 +08:00
wangchuxiao
1d3f05c22b rtc 2022-03-14 20:02:42 +08:00
wangchuxiao
51c2f845d8 opt 2022-03-11 17:37:01 +08:00
wangchuxiao
bcae7720e1 add callback 2022-03-04 14:27:54 +08:00
wenxu12345
e1f58f07fe 2.0.1 2022-02-25 19:55:58 +08:00
wenxu12345
0fca91ca37 config description 2022-02-23 18:22:44 +08:00
wenxu12345
8f5b5ab0f9 openIM_v2 2022-02-23 10:31:11 +08:00
wangchuxiao
079efe5de6 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-02-21 16:25:36 +08:00
wangchuxiao
4d28ccebad add reset pwd 2022-02-21 16:24:25 +08:00
wenxu12345
bf948789ea replace mongo driver 2022-02-21 15:07:50 +08:00
wenxu12345
571c83314a Refactoring code 2022-02-21 15:01:06 +08:00
wangchuxiao
6e9b9341d4 mini cr 2022-02-18 17:06:27 +08:00
wangchuxiao
65be1263b9 make file 2022-02-15 18:28:54 +08:00
wangchuxiao
445100f32d Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-02-15 14:11:30 +08:00
wangchuxiao
648a852ba7 conversation opt 2022-02-15 14:11:20 +08:00
skiffer-git
6f1a5eb79c log 2022-02-14 16:03:55 +08:00
wangchuxiao
22bfb6be4b merge code 2022-02-14 10:46:32 +08:00
wangchuxiao
52579c5fab add 2022-02-12 17:13:31 +08:00
wangchuxiao
b80c8013c0 add user req group reqlist api 2022-02-09 19:19:22 +08:00
wangchuxiao
6de61cb214 cms dev 2022-02-09 16:22:58 +08:00
wangchuxiao
43a9bba96f msg cms 2022-02-09 00:45:23 +08:00
wangchuxiao
a7f9faf868 statistics 2022-02-07 08:44:21 +08:00
wangchuxiao
fb396d9cf0 add 2022-01-27 18:31:31 +08:00
skiffer-git
fca092d392 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 
# Conflicts:
#	config/config.yaml
#	internal/rpc/chat/send_msg.go
#	internal/rpc/group/create_group.go
#	pkg/common/config/config.go
#	pkg/proto/sdk_ws/ws.pb.go
#	pkg/proto/sdk_ws/ws.proto
 2022-01-27 11:51:34 +08:00
wangchuxiao
1607853393 cms 2022-01-24 01:40:49 +08:00
skiffer-git
27d402104e Merge remote-tracking branch 'origin/tuoyun' into tuoyun 
# Conflicts:
#	cmd/Open-IM-SDK-Core
#	pkg/common/config/config.go
 2022-01-22 09:55:54 +08:00
wangchuxiao
d58bcd136a pb api 2022-01-21 18:39:57 +08:00
Gordon
e4f87b53b4 protocol modify 2022-01-20 11:53:57 +08:00
wenxu12345
14ccbf335d Refactor code 2022-01-19 17:17:51 +08:00