blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-05-05 17:56:50 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,309 Commits 40 Branches 130 Tags
Commit Graph

1809 Commits

Author SHA1 Message Date
Gordon
26de3bd859 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-20 10:43:31 +08:00
Gordon
eec9446abe msg update 2023-03-20 10:43:02 +08:00
wangchuxiao
13adde5223 group 2023-03-17 19:41:44 +08:00
wangchuxiao
7c8c809fb8 errcode 2023-03-17 16:01:56 +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
a765160ee3 friend 2023-03-17 14:19:53 +08:00
wangchuxiao
40da937c4c friend 2023-03-17 13:44:30 +08:00
wangchuxiao
91e2f3caeb err 2023-03-17 12:41:04 +08:00
wangchuxiao
befd5c8636 err 2023-03-17 12:36:26 +08:00
wangchuxiao
1921e5b030 err 2023-03-17 12:32:26 +08:00
wangchuxiao
506a417b0b err 2023-03-17 12:29:19 +08:00
wangchuxiao
9716d478bd freind 2023-03-17 12:23:49 +08:00
wangchuxiao
553606d2a8 err 2023-03-17 12:18:33 +08:00
wangchuxiao
7fd9a84271 error 2023-03-17 12:12:32 +08:00
withchao
26341a5187 Merge branch 'errcode' of https://github.com/OpenIMSDK/Open-IM-Server into errcode 
# Conflicts:
#	internal/rpc/friend/friend.go
 2023-03-17 11:33:40 +08:00
withchao
2ce1bc84f2 pkg 2023-03-17 11:27:34 +08:00
wangchuxiao
67e1faefd8 friend db 2023-03-17 11:26:34 +08:00
withchao
835cd6d14a pkg 2023-03-17 11:14:14 +08:00
wangchuxiao
ea9c9a496b friend 2023-03-17 11:02:54 +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
d2cd3618e0 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-16 19:02:21 +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
5c38ffa15e user update 2023-03-16 18:18:59 +08:00
Gordon
a60dc3189c user update 2023-03-16 18:11:03 +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
57c082c545 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-16 17:01:31 +08:00
wangchuxiao
5a886f6837 db 2023-03-16 17:01:17 +08:00
Gordon
f3937499fa user update 2023-03-16 17:00:10 +08:00
withchao
0fd1e785fe Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-16 16:33:33 +08:00
withchao
1f935531f6 code error 2023-03-16 16:32:42 +08:00
wangchuxiao
d725b9538f db 2023-03-16 16:23:56 +08:00
Gordon
ce87ef0a04 conversation update 2023-03-16 15:10:23 +08:00
Gordon
1f03ebdbe7 user update 2023-03-16 12:53:29 +08:00
Gordon
6ce1c6c048 user update 2023-03-16 12:42:34 +08:00
Gordon
9a0f9c2270 user update 2023-03-16 12:32:25 +08:00
Gordon
baae7875aa Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-16 12:07:57 +08:00
Gordon
e99753f188 user update 2023-03-16 12:07:21 +08:00
wangchuxiao
a8dd306196 db 2023-03-16 12:00:14 +08:00
wangchuxiao
642743957e db 2023-03-16 11:43:08 +08:00
wangchuxiao
be847d5d5e db 2023-03-16 11:41:38 +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
wangchuxiao
63f5169dbe db 2023-03-16 11:03:14 +08:00
withchao
a529ba4f5b packet name pb 2023-03-16 10:52:50 +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