171 Commits

Author SHA1 Message Date
wangchuxiao
70758c306a sg notification 2023-05-18 15:41:08 +08:00
withchao
ea8e5b241e group 2023-05-15 19:20:35 +08:00
withchao
fbb9014fa6 group 2023-05-15 19:11:17 +08:00
wangchuxiao
b6f20d1772 group 2023-05-09 18:40:35 +08:00
wangchuxiao
17e747049c group 2023-05-09 18:23:28 +08:00
wangchuxiao
573b39f248 ConversationType 2023-04-28 18:33:33 +08:00
wangchuxiao
9ec692585d page 1 2023-04-21 19:26:07 +08:00
wangchuxiao
8ad343e97c conversationID 2023-04-21 14:51:57 +08:00
wangchuxiao
2bd22b42b7 conversation 2023-04-21 11:26:48 +08:00
wangchuxiao
e1d2c52519 conversation 2023-04-20 16:31:36 +08:00
wangchuxiao
5bf165d2c3 Updates 2023-04-20 16:28:02 +08:00
wangchuxiao
934e531840 conversation 2023-04-20 16:23:41 +08:00
withchao
e860991f06 group 2023-04-18 14:48:06 +08:00
wangchuxiao
b4e228c33e groupMember 2023-03-29 14:30:38 +08:00
wangchuxiao
01f4a206c7 group 2023-03-27 19:24:16 +08:00
wangchuxiao
a999b9d0c4 GROUP 2023-03-27 11:03:50 +08:00
wangchuxiao
2baf208c02 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-23 19:05:20 +08:00
wangchuxiao
132e1b987c cache 2023-03-23 19:02:20 +08:00
withchao
762d6516a5 db 2023-03-20 15:11:00 +08:00
wangchuxiao
c8fd03a693 friend 2023-03-17 15:04:01 +08:00
wangchuxiao
40333d62e3 friend 2023-03-17 14:59:32 +08:00
wangchuxiao
67e1faefd8 friend db 2023-03-17 11:26:34 +08:00
wangchuxiao
2966afca6b friend 2023-03-16 20:35:55 +08:00
wangchuxiao
47637175d7 friend 2023-03-16 20:32:58 +08:00
wangchuxiao
3f65376a35 fix friend 2023-03-16 20:30:28 +08:00
wangchuxiao
ba6dddf986 fix add friend 2023-03-16 20:21:10 +08:00
wangchuxiao
e7b1377444 black bug 2023-03-16 19:01:15 +08:00
wangchuxiao
73e6fbbe91 black bug 2023-03-16 19:00:17 +08:00
Gordon
007e0cff26 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-16 17:44:03 +08:00
Gordon
1117488eec user update 2023-03-16 17:43:30 +08:00
wangchuxiao
5a886f6837 db 2023-03-16 17:01:17 +08:00
wangchuxiao
d725b9538f db 2023-03-16 16:23:56 +08:00
Gordon
9a0f9c2270 user update 2023-03-16 12:32:25 +08:00
Gordon
e99753f188 user update 2023-03-16 12:07:21 +08:00
wangchuxiao
690a2195da Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	pkg/common/db/controller/friend.go
2023-03-16 11:03:57 +08:00
withchao
1680b96b65 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	cmd/api/main.go
#	internal/api/a2r/api2rpc.go
#	internal/apiresp/resp.go
#	internal/msgtransfer/online_history_msg_handler.go
#	internal/push/consumer_init.go
#	pkg/common/db/controller/conversation.go
#	pkg/common/mw/gin.go
#	pkg/statistics/statistics.go
2023-03-16 10:51:00 +08:00
withchao
17de3e7927 packet name pb 2023-03-16 10:46:06 +08:00
wangchuxiao
a0f3307fe3 db 2023-03-16 10:45:56 +08:00
wangchuxiao
e888910f3c db 2023-03-15 18:41:22 +08:00
wangchuxiao
74d1d760aa db 2023-03-15 18:35:06 +08:00
wangchuxiao
42c9cc61ab Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
2023-03-15 16:51:29 +08:00
wangchuxiao
d75d1f57e4 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
2023-03-15 16:45:17 +08:00
wangchuxiao
becd3eb8f1 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
2023-03-15 16:30:10 +08:00
wangchuxiao
8dea2cacf4 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
2023-03-15 16:29:04 +08:00
wangchuxiao
d5b721be30 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
2023-03-15 16:10:34 +08:00
wangchuxiao
14e3e561ea Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
2023-03-15 15:56:37 +08:00
wangchuxiao
4866e88eab Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
2023-03-15 15:56:13 +08:00
wangchuxiao
fab8277086 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
2023-03-15 15:40:19 +08:00
wangchuxiao
6c1525bd62 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-15 15:27:01 +08:00
wangchuxiao
15d48fb0ad Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
2023-03-15 15:26:37 +08:00