Commit Graph

5681 Commits

Author SHA1 Message Date
wangchuxiao 2d57c94d0e Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-06 18:51:16 +08:00
wangchuxiao 121523626d msg 2023-05-06 18:51:10 +08:00
Gordon 4eb311dd21 Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-06 12:01:34 +08:00
Gordon 573a669ac2 pb update 2023-05-06 12:01:03 +08:00
wangchuxiao 287b028ba8 msg 2023-05-06 11:48:03 +08:00
wangchuxiao d369d05ee4 options 2023-05-06 11:31:04 +08:00
wangchuxiao a62335a910 msg pull 2023-05-06 11:13:38 +08:00
wangchuxiao 4509530859 pb 2023-05-06 11:11:54 +08:00
wangchuxiao 4cca3b54e4 msg 2023-05-06 11:04:28 +08:00
wangchuxiao 3b4c8ad2f0 conversation 2023-05-06 10:57:49 +08:00
wangchuxiao 7df211ca18 notification 2023-05-06 10:52:29 +08:00
wangchuxiao a94ef2c290 notification 2023-05-06 10:52:03 +08:00
wangchuxiao 0fd38ece0a Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-06 10:42:19 +08:00
wangchuxiao c9334ca827 conversationID 2023-05-06 10:42:11 +08:00
Gordon 8d998ad63c pb update 2023-05-06 10:27:07 +08:00
wangchuxiao 72aa6d5eab msg 2023-05-05 21:30:32 +08:00
wangchuxiao b00bd8bc35 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-05 12:20:48 +08:00
wangchuxiao 6b612ec345 pull msg 2023-05-05 12:19:04 +08:00
withchao 66757099f6 Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-05 12:03:44 +08:00
withchao d03e8634fb notification 2023-05-05 12:03:32 +08:00
Gordon 137751e5a9 pb update 2023-05-05 10:53:36 +08:00
Gordon e24d89ce52 pb update 2023-05-05 10:43:32 +08:00
Gordon 455aa79dad pb update 2023-05-04 21:03:11 +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 cfa543802e commonMsgDatabase 2023-05-04 16:51:50 +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 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 45ad252a44 msg 2023-04-28 10:26:27 +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