Gordon
|
99504eec2e
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/db/cache/conversation.go
|
2 years ago |
skiffer-git
|
795a90a194
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
1aa3ac9399
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/db/controller/friend.go
# pkg/common/db/relation/friend_model_k.go
# pkg/common/db/relation/friend_request_model.go
|
2 years ago |
withchao
|
a2c4bccdb6
|
1
|
2 years ago |
|
skiffer-git
|
3320f81c8f
|
Error code standardization
|
2 years ago |
|
withchao
|
64dee9f989
|
1
|
2 years ago |
|
Gordon
|
3b4c227519
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/db/cache/conversation.go
# pkg/common/db/relation/conversation_model.go
|
2 years ago |
|
withchao
|
f98d894a4b
|
1
|
2 years ago |
|
withchao
|
4d4a451926
|
1
|
2 years ago |
|
withchao
|
adfcfac711
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/db/table/relation.go
|
2 years ago |
|
withchao
|
8e49d7e567
|
1
|
2 years ago |
wangchuxiao
|
2243e8194d
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
b637a29348
|
errcode
|
2 years ago |
|
withchao
|
d5a9647902
|
1
|
2 years ago |
|
Gordon
|
e167d80469
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/db/cache/conversation.go
# pkg/common/db/relation/conversation_model.go
|
2 years ago |
|
Gordon
|
730be9db47
|
conversation update
|
2 years ago |
|
wangchuxiao
|
01f7262d3a
|
errcode
|
2 years ago |
|
wangchuxiao
|
83eba5a9ea
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
47b725ac69
|
errcode
|
2 years ago |
|
withchao
|
dec0c8cc47
|
1
|
2 years ago |
|
withchao
|
b7f0e2e6f3
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
e8a24ab59e
|
1
|
2 years ago |
|
withchao
|
778e3e5cd2
|
1
|
2 years ago |
|
skiffer-git
|
e175ef2b4e
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
5402d33519
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
174c3e5fae
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
f6cc91d7db
|
errcode
|
2 years ago |
|
withchao
|
94b0e60e83
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
0eb77e9b35
|
1
|
2 years ago |
|
withchao
|
c3f6a0fa15
|
1
|
2 years ago |
|
Gordon
|
eb810f8dca
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
Gordon
|
645b8dc0a9
|
pb file
|
2 years ago |
|
Gordon
|
a9151868b0
|
pb file
|
2 years ago |
|
withchao
|
c1af64854c
|
1
|
2 years ago |
|
withchao
|
dab552aed4
|
1
|
2 years ago |
|
withchao
|
26b5ed72df
|
1
|
2 years ago |
|
withchao
|
eb3bb7948f
|
1
|
2 years ago |
|
withchao
|
c55785783d
|
1
|
2 years ago |
|
withchao
|
7ed60bd8f9
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
4649ce5354
|
1
|
2 years ago |
|
wangchuxiao
|
803ecd3f92
|
errcode
|
2 years ago |
|
wangchuxiao
|
5bb731f884
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
pkg/common/db/relation/black.go
|
2 years ago |
|
wangchuxiao
|
cd6c056e73
|
errcode
|
2 years ago |
|
skiffer-git
|
6658566144
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
2e19e3109e
|
Error code standardization
|
2 years ago |
|
withchao
|
2b1868f558
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
3651274d68
|
1
|
2 years ago |
|
skiffer-git
|
1d42c220af
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/db/table/table.go
|
2 years ago |
|
skiffer-git
|
cbe68507f3
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
c2fbcd1f22
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
pkg/common/db/relation/friend_model_k.go
|
2 years ago |
|
withchao
|
d67515f53f
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/common/db/table/table.go
|
2 years ago |
|
wangchuxiao
|
d4952ebc16
|
errcode
|
2 years ago |
|
withchao
|
0f3691893e
|
1
|
2 years ago |
|
skiffer-git
|
fb436e7713
|
Error code standardization
|
2 years ago |
|
Gordon
|
aafe17a0f3
|
friend update
|
2 years ago |
|
Gordon
|
80bde864c1
|
friend update
|
2 years ago |
|
Gordon
|
7c92de7899
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
Gordon
|
e550c9a874
|
friend update
|
2 years ago |
|
withchao
|
4bea4252ff
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
abd957a459
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
39463e68e3
|
Error code standardization
|
2 years ago |
|
withchao
|
26e130122c
|
1
|
2 years ago |
|
wangchuxiao
|
4ad6b74d75
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
pkg/common/db/relation/friend_model_k.go
|
2 years ago |
|
wangchuxiao
|
40470bc320
|
errcode
|
2 years ago |
|
skiffer-git
|
839af18f49
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
d44c286ff3
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
bac9ba000e
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
00bd22041b
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
b3e141a3ce
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
e0d05e1fa8
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
4c931fba5c
|
errcode
|
2 years ago |
|
skiffer-git
|
d6b5a5278e
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
954e01c951
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
8ecdcbfc0a
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
4e580cb848
|
Error code standardization
|
2 years ago |
|
withchao
|
83c782df9f
|
1
|
2 years ago |
|
skiffer-git
|
618ff03cbe
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
b18fb5cd31
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
6aa4974e29
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
026649f875
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
6bce40535e
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
82c1b2352c
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
fa45eb1fa8
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
29321b4e09
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
d50248ffd2
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
b881924144
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
1693359010
|
errcode
|
2 years ago |
|
wangchuxiao
|
1e3e243a7f
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
c1d6f5809b
|
errcode
|
2 years ago |
|
wangchuxiao
|
1b4f6054ae
|
errcode
|
2 years ago |
|
wangchuxiao
|
1ba5cde076
|
errcode
|
2 years ago |
|
withchao
|
5c99bdf14f
|
1
|
2 years ago |
|
wangchuxiao
|
79b5d4b8bd
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
internal/rpc/friend/friend.go
|
2 years ago |
|
wangchuxiao
|
67c082ab7b
|
errcode
|
2 years ago |
|
skiffer-git
|
ec23d22d6d
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
d9eb55d9df
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
f38dc3b1f1
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
26ed14d1d3
|
errcode
|
2 years ago |
|
wangchuxiao
|
5b8f66404c
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
internal/rpc/group/group.go
pkg/common/db/relation/user_model_k.go
|
2 years ago |
|
wangchuxiao
|
21a1e7dff2
|
errcode
|
2 years ago |
|
skiffer-git
|
2a76dc3ac8
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
007daaa014
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
8e1f524f68
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
0bec6eeb57
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
d49022c16a
|
Error code standardization
|
2 years ago |
|
withchao
|
4c6e02f805
|
1
|
2 years ago |
|
withchao
|
f76afd3185
|
1
|
2 years ago |
|
withchao
|
b83260ca30
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
25f0173c10
|
1
|
2 years ago |
|
withchao
|
0a81dd040f
|
1
|
2 years ago |
|
skiffer-git
|
c7237a64bb
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
1d25a5e53f
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
d6edb4aa8c
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
pkg/common/db/controller/group.go
|
2 years ago |
|
wangchuxiao
|
704b18d900
|
errcode
|
2 years ago |
|
withchao
|
16fa05f76e
|
1
|
2 years ago |
|
withchao
|
6a87d26420
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
8eee04e7be
|
1
|
2 years ago |
|
skiffer-git
|
00b4538b0a
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
b162909147
|
Error code standardization
|
2 years ago |
|
withchao
|
1e92e0ab28
|
1
|
2 years ago |
|
withchao
|
0e1982083e
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# pkg/proto/sdk_ws/ws.proto
|
2 years ago |
|
withchao
|
29a78c469d
|
1
|
2 years ago |
|
withchao
|
cf4499e958
|
1
|
2 years ago |
|
skiffer-git
|
e241c65a9c
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
a218bc1daa
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
4688767c51
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
dc5ee4436e
|
errcode
|
2 years ago |
|
skiffer-git
|
17d3ef2469
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
skiffer-git
|
3e340f345d
|
Error code standardization
|
2 years ago |
|
withchao
|
399e1520d6
|
1
|
2 years ago |
|
withchao
|
56a89ad33b
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
f65cd2aefc
|
1
|
2 years ago |
|
skiffer-git
|
7b0eeb3049
|
Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
# internal/utils/convert.go
|
2 years ago |
|
skiffer-git
|
39fc655b1a
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
069b978b23
|
errcode
|
2 years ago |
|
wangchuxiao
|
15166f53b0
|
errcode
|
2 years ago |
|
wangchuxiao
|
b021089360
|
errcode
|
2 years ago |
|
wangchuxiao
|
52ceb7682d
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
internal/rpc/group/group.go
pkg/common/db/controller/group.go
pkg/common/db/relation/group_member_model_k.go
|
2 years ago |
|
withchao
|
4e10b361ed
|
1
|
2 years ago |
|
wangchuxiao
|
eebf7ca893
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
|
2 years ago |
|
wangchuxiao
|
945449108d
|
errcode
|
2 years ago |
|
withchao
|
ebd329558c
|
1
|
2 years ago |
|
wangchuxiao
|
5e4e960524
|
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts:
pkg/common/db/controller/group.go
pkg/common/db/relation/group_model_k.go
|
2 years ago |
|
wangchuxiao
|
68d595b558
|
errcode
|
2 years ago |
|
withchao
|
5bf8f6728e
|
1
|
2 years ago |
|
withchao
|
c760b520ff
|
1
|
2 years ago |
|
withchao
|
601fac7a04
|
1
|
2 years ago |
|
withchao
|
891e631b91
|
1
|
2 years ago |
|
wangchuxiao
|
87e61046cb
|
errcode
|
2 years ago |
|
wangchuxiao
|
7fc279a329
|
errcode
|
2 years ago |
