Commit Graph

3170 Commits

Author SHA1 Message Date
Gordon 8d998ad63c pb update 2023-05-06 10:27:07 +08:00
wangchuxiao 72aa6d5eab msg 2023-05-05 21:30:32 +08:00
wangchuxiao 6b612ec345 pull msg 2023-05-05 12:19:04 +08:00
wangchuxiao 5f7fa2a7a2 conversations 2023-05-04 20:34:20 +08:00
wangchuxiao c0f8b9910a conversation 2023-05-04 20:07:20 +08:00
wangchuxiao 640313386b conversation create 2023-05-04 17:27:29 +08:00
wangchuxiao 5d617cc240 conversation 2023-05-04 16:06:17 +08:00
wangchuxiao 9c76988225 merge 2023-05-04 16:00:06 +08:00
wangchuxiao 334e1b77b6 merge 2023-05-04 15:57:43 +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
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 45ad252a44 msg 2023-04-28 10:26:27 +08:00
wangchuxiao d7401e085d redis consumer split notification 2 msg 2023-04-26 18:57:41 +08:00
withchao 84ee1cdf9f group 2023-04-26 15:10:20 +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 c2a5f664af conversation 2023-04-26 10:48:43 +08:00
wangchuxiao 88427518b0 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-04-26 10:48:16 +08:00
withchao aaf62f3e27 group 2023-04-26 10:10:26 +08:00
withchao 554445eeba group 2023-04-26 09:44:14 +08:00
wangchuxiao cae843a6e3 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-04-25 10:20:05 +08:00
withchao 469458dd2a group 2023-04-24 19:45:29 +08:00
wangchuxiao 180309c878 notification 2023-04-24 17:28:39 +08:00
wangchuxiao 9c594dacde notification 2023-04-24 11:06:58 +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 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
wangchuxiao 2bd22b42b7 conversation 2023-04-21 11:26:48 +08:00
wangchuxiao b05bedf243 conversation 2023-04-20 16:05:22 +08:00
withchao d2068857e1 friend 2023-04-19 19:13:31 +08:00
withchao e6e5268df9 friend 2023-04-19 18:31:52 +08:00
withchao f86fd1fd95 friend 2023-04-19 18:28:30 +08:00
withchao 8d57409392 friend 2023-04-19 17:57:22 +08:00
wangchuxiao 6b9353d7b5 cache 2023-04-19 17:21:05 +08:00
withchao ee7016753a friend 2023-04-19 17:11:09 +08:00
withchao 0b0f38da20 group 2023-04-19 16:37:50 +08:00
withchao 1f02053ed3 group 2023-04-19 16:16:06 +08:00
withchao d30fc3ef54 group 2023-04-19 15:51:47 +08:00
withchao da180aacdd group 2023-04-19 15:51:23 +08:00