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
4,987 Commits 40 Branches 130 Tags
Commit Graph

1596 Commits

Author SHA1 Message Date
skiffer-git
795a90a194 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-03 16:12:07 +08:00
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
 2023-02-03 16:11:29 +08:00
withchao
a2c4bccdb6 1 2023-02-03 16:10:51 +08:00
skiffer-git
3320f81c8f Error code standardization 2023-02-03 16:10:33 +08:00
Gordon
3b4c227519 Merge remote-tracking branch 'origin/errcode' into errcode 
# Conflicts:
#	pkg/common/db/cache/conversation.go
#	pkg/common/db/relation/conversation_model.go
 2023-02-03 15:54:23 +08:00
withchao
4d4a451926 1 2023-02-03 14:26:54 +08:00
withchao
adfcfac711 Merge remote-tracking branch 'origin/errcode' into errcode 
# Conflicts:
#	pkg/common/db/table/relation.go
 2023-02-03 14:24:57 +08:00
withchao
8e49d7e567 1 2023-02-03 14:23:29 +08:00
wangchuxiao
b637a29348 errcode 2023-02-03 12:16:48 +08:00
Gordon
e167d80469 Merge remote-tracking branch 'origin/errcode' into errcode 
# Conflicts:
#	pkg/common/db/cache/conversation.go
#	pkg/common/db/relation/conversation_model.go
 2023-02-03 10:26:26 +08:00
Gordon
730be9db47 conversation update 2023-02-02 19:47:21 +08:00
wangchuxiao
01f7262d3a errcode 2023-02-02 19:43:51 +08:00
wangchuxiao
83eba5a9ea Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-02-02 19:41:11 +08:00
wangchuxiao
47b725ac69 errcode 2023-02-02 19:40:54 +08:00
skiffer-git
5402d33519 Error code standardization 2023-02-02 16:39:29 +08:00
wangchuxiao
174c3e5fae Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-02-02 16:11:33 +08:00
wangchuxiao
f6cc91d7db errcode 2023-02-02 16:11:24 +08:00
withchao
c55785783d 1 2023-02-02 11:24:03 +08:00
wangchuxiao
803ecd3f92 errcode 2023-02-01 19:31:39 +08:00
wangchuxiao
5bb731f884 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
 Conflicts:
	pkg/common/db/relation/black.go
 2023-02-01 18:42:38 +08:00
skiffer-git
6658566144 Error code standardization 2023-02-01 17:54:16 +08:00
skiffer-git
2e19e3109e Error code standardization 2023-02-01 17:39:08 +08:00
withchao
2b1868f558 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-01 17:22:50 +08:00
withchao
3651274d68 1 2023-02-01 17:22:42 +08:00
skiffer-git
1d42c220af Merge remote-tracking branch 'origin/errcode' into errcode 
# Conflicts:
#	pkg/common/db/table/table.go
 2023-02-01 17:21:30 +08:00
skiffer-git
cbe68507f3 Error code standardization 2023-02-01 17:20:55 +08:00
wangchuxiao
c2fbcd1f22 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
 Conflicts:
	pkg/common/db/relation/friend_model_k.go
 2023-02-01 17:13:06 +08:00
withchao
d67515f53f Merge remote-tracking branch 'origin/errcode' into errcode 
# Conflicts:
#	pkg/common/db/table/table.go
 2023-02-01 17:12:00 +08:00
wangchuxiao
d4952ebc16 errcode 2023-02-01 17:11:44 +08:00
withchao
0f3691893e 1 2023-02-01 17:07:56 +08:00
skiffer-git
fb436e7713 Error code standardization 2023-02-01 16:44:50 +08:00
Gordon
aafe17a0f3 friend update 2023-02-01 16:22:13 +08:00
Gordon
80bde864c1 friend update 2023-02-01 16:19:44 +08:00
Gordon
7c92de7899 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-01 15:58:14 +08:00
Gordon
e550c9a874 friend update 2023-02-01 15:56:17 +08:00
withchao
4bea4252ff Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-01 15:44:47 +08:00
skiffer-git
39463e68e3 Error code standardization 2023-02-01 12:12:51 +08:00
withchao
26e130122c 1 2023-02-01 12:00:29 +08:00
wangchuxiao
4ad6b74d75 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
 Conflicts:
	pkg/common/db/relation/friend_model_k.go
 2023-02-01 11:23:35 +08:00
wangchuxiao
40470bc320 errcode 2023-02-01 11:23:01 +08:00
skiffer-git
d44c286ff3 Error code standardization 2023-01-31 20:41:45 +08:00
skiffer-git
bac9ba000e Error code standardization 2023-01-31 20:36:25 +08:00
skiffer-git
00bd22041b Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-31 20:33:48 +08:00
skiffer-git
b3e141a3ce Error code standardization 2023-01-31 20:33:33 +08:00
wangchuxiao
e0d05e1fa8 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-31 18:56:23 +08:00
wangchuxiao
4c931fba5c errcode 2023-01-31 18:55:22 +08:00
skiffer-git
954e01c951 Error code standardization 2023-01-31 16:49:35 +08:00
skiffer-git
4e580cb848 Error code standardization 2023-01-31 15:45:24 +08:00
skiffer-git
618ff03cbe Error code standardization 2023-01-31 13:38:39 +08:00
skiffer-git
b18fb5cd31 Error code standardization 2023-01-31 13:37:35 +08:00