blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-05-29 00:39:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,838 Commits 48 Branches 130 Tags
Commit Graph

2818 Commits

Author SHA1 Message Date
wangchuxiao
9c76988225 merge 2023-05-04 16:00:06 +08:00
wangchuxiao
076551594b Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-04 15:54:10 +08:00
wangchuxiao
4f01e10f65 merge 2023-05-04 15:54:04 +08:00
wangchuxiao
8793271541 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-04 15:53:58 +08:00
withchao
180b8c2d3f notification 2023-05-04 15:46:22 +08:00
wangchuxiao
5c8208e0f8 sourceID2conversationID 2023-05-04 15:06:23 +08:00
withchao
3e1f97e300 notification 2023-05-04 12:11:29 +08:00
withchao
0935f1d57b msg 2023-05-04 10:02:01 +08:00
withchao
3b5ab4cb41 Merge remote-tracking branch 'origin/errcode' into errcode 
# Conflicts:
#	internal/msgtransfer/init.go
#	internal/msgtransfer/online_history_msg_handler.go
#	internal/msgtransfer/online_msg_to_mongo_handler.go
#	pkg/common/db/controller/msg.go
#	pkg/proto/msg/msg.pb.go
#	pkg/proto/msg/msg.proto
 2023-04-28 18:45:28 +08:00
withchao
7a7a912352 msg 2023-04-28 18:39:21 +08:00
wangchuxiao
d855beb354 aggres 2023-04-28 18:38:12 +08:00
wangchuxiao
573b39f248 ConversationType 2023-04-28 18:33:33 +08:00
wangchuxiao
e6b2a9f8f9 msg 2023-04-28 11:01:48 +08:00
wangchuxiao
6da0c38927 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-04-26 18:57:47 +08:00
wangchuxiao
d7401e085d redis consumer split notification 2 msg 2023-04-26 18:57:41 +08:00
withchao
508cdf06ba group 2023-04-26 16:14:50 +08:00
withchao
f0a8b828be group 2023-04-26 15:42:43 +08:00
withchao
cf39ea7364 group 2023-04-26 15:16:56 +08:00
withchao
122f649da7 Merge remote-tracking branch 'origin/errcode' into errcode 2023-04-26 15:14:43 +08:00
withchao
84ee1cdf9f group 2023-04-26 15:10:20 +08:00
wangchuxiao
4214521dea groupID 2023-04-26 14:44:45 +08:00
wangchuxiao
5c9ecf38df friend&user 2023-04-26 14:30:52 +08:00
wangchuxiao
16231ee077 conversation 2023-04-26 14:10:12 +08:00
wangchuxiao
0dc16d54a5 modify dictory 2023-04-26 11:19:49 +08:00
wangchuxiao
88427518b0 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-04-26 10:48:16 +08:00
wangchuxiao
0a227f8731 msg 2023-04-26 10:47:55 +08:00
withchao
aaf62f3e27 group 2023-04-26 10:10:26 +08:00
withchao
64bb44d181 group 2023-04-25 17:40:01 +08:00
withchao
1fc2264028 group 2023-04-25 14:18:26 +08:00
withchao
66d996cbc1 group 2023-04-25 10:36:13 +08:00
withchao
469458dd2a group 2023-04-24 19:45:29 +08:00
wangchuxiao
dc637059ab validate 2023-04-24 14:57:35 +08:00
wangchuxiao
9c594dacde notification 2023-04-24 11:06:58 +08:00
wangchuxiao
0071252777 notification 2023-04-23 21:14:40 +08:00
wangchuxiao
f6cebdbdef notification 2023-04-23 20:07:41 +08:00
wangchuxiao
94b5703399 notification 2023-04-23 19:50:42 +08:00
wangchuxiao
c80babaef6 friend 2023-04-23 16:47:41 +08:00
wangchuxiao
95e4506279 notification 2023-04-23 15:20:35 +08:00
wangchuxiao
2ab6136b2f Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-04-23 14:21:45 +08:00
wangchuxiao
4dccfd0a81 notification 2023-04-23 14:21:36 +08:00
withchao
cfbf1593c6 s3 2023-04-23 11:44:33 +08:00
withchao
f815e9bd9a s3 2023-04-23 10:46:52 +08:00
withchao
2196f69804 third 2023-04-23 10:30:38 +08:00
wangchuxiao
e3d907f113 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-04-21 20:29:13 +08:00
wangchuxiao
2a7e305992 notification 2023-04-21 20:29:08 +08:00
withchao
705ec6f65e Merge remote-tracking branch 'origin/errcode' into errcode 2023-04-21 19:54:02 +08:00
withchao
b5fc6dbf04 third 2023-04-21 19:52:57 +08:00
wangchuxiao
9ec692585d page 1 2023-04-21 19:26:07 +08:00
wangchuxiao
c0ef0a8660 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-04-21 17:51:33 +08:00
wangchuxiao
fde574be1b conn 2023-04-21 17:51:28 +08:00