Commit Graph

2496 Commits

Author SHA1 Message Date
Gordon eec9446abe msg update 2023-03-20 10:43:02 +08:00
withchao 54e6299dc4 pb 2023-03-17 17:27:12 +08:00
withchao 3519cfb3ab pb 2023-03-17 17:26:58 +08:00
wangchuxiao 8e8270b090 pb 2023-03-17 17:18:50 +08:00
wangchuxiao 2f6aa39824 friend 2023-03-17 17:04:27 +08:00
wangchuxiao d1c07f2e5c Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-17 16:24:53 +08:00
wangchuxiao fd19cd89a3 friend 2023-03-17 16:24:47 +08:00
withchao 58206f983e Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-17 16:08:21 +08:00
withchao 2e24846e15 wrap 2023-03-17 16:08:13 +08:00
wangchuxiao 7c8c809fb8 errcode 2023-03-17 16:01:56 +08:00
wangchuxiao c9fd336812 friend 2023-03-17 15:54:54 +08:00
wangchuxiao 04347bcc0d friend 2023-03-17 15:48:48 +08:00
wangchuxiao 19f5354721 page 2023-03-17 15:24:07 +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