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

153 Commits

Author SHA1 Message Date
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
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
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
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
f6cc91d7db errcode 2023-02-02 16:11:24 +08:00
wangchuxiao
803ecd3f92 errcode 2023-02-01 19:31:39 +08:00
skiffer-git
2e19e3109e Error code standardization 2023-02-01 17:39:08 +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
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
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
80bde864c1 friend update 2023-02-01 16:19:44 +08:00
Gordon
e550c9a874 friend update 2023-02-01 15:56:17 +08:00
skiffer-git
bac9ba000e Error code standardization 2023-01-31 20:36:25 +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
4e580cb848 Error code standardization 2023-01-31 15:45:24 +08:00
skiffer-git
d50248ffd2 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-30 21:47:38 +08:00
skiffer-git
b881924144 Error code standardization 2023-01-30 21:47:29 +08:00
wangchuxiao
1693359010 errcode 2023-01-30 19:49:18 +08:00
skiffer-git
ec23d22d6d Error code standardization 2023-01-30 15:26:39 +08:00
skiffer-git
d9eb55d9df Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-30 11:35:06 +08:00
skiffer-git
f38dc3b1f1 Error code standardization 2023-01-30 11:34:07 +08:00
wangchuxiao
26ed14d1d3 errcode 2023-01-30 11:14:18 +08:00
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
 2023-01-30 11:12:35 +08:00
wangchuxiao
21a1e7dff2 errcode 2023-01-30 11:10:26 +08:00
skiffer-git
c7237a64bb Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-29 17:46:37 +08:00
skiffer-git
1d25a5e53f Error code standardization 2023-01-29 17:46:11 +08:00
wangchuxiao
d6edb4aa8c Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
 Conflicts:
	pkg/common/db/controller/group.go
 2023-01-29 17:21:22 +08:00
wangchuxiao
704b18d900 errcode 2023-01-29 17:20:31 +08:00
skiffer-git
b162909147 Error code standardization 2023-01-29 16:30:33 +08:00
skiffer-git
7b0eeb3049 Merge remote-tracking branch 'origin/errcode' into errcode 
# Conflicts:
#	internal/utils/convert.go
 2023-01-29 14:48:05 +08:00
skiffer-git
39fc655b1a Error code standardization 2023-01-29 14:47:21 +08:00
wangchuxiao
069b978b23 errcode 2023-01-29 14:35:52 +08:00
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
 2023-01-29 11:26:03 +08:00
withchao
4e10b361ed 1 2023-01-29 11:22:37 +08:00
wangchuxiao
eebf7ca893 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-29 11:15:31 +08:00
withchao
ebd329558c 1 2023-01-29 10:42:58 +08:00
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
 2023-01-29 10:37:59 +08:00
wangchuxiao
68d595b558 errcode 2023-01-29 10:31:01 +08:00
withchao
5bf8f6728e 1 2023-01-28 18:49:36 +08:00
withchao
c760b520ff 1 2023-01-28 18:47:02 +08:00
withchao
601fac7a04 1 2023-01-28 18:46:42 +08:00
wangchuxiao
7fc279a329 errcode 2023-01-28 16:36:38 +08:00