Commit Graph

72 Commits

Author SHA1 Message Date
withchao 4f96cc9b1b group rpc 2023-02-06 18:33:33 +08:00
withchao 210d04d488 rpc GroupApplicationResponse 2023-02-06 15:32:20 +08:00
skiffer-git d59c4367fb Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-03 16:51:57 +08:00
skiffer-git 22c63ecdbd Error code standardization 2023-02-03 16:51:35 +08:00
Gordon 99504eec2e Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	pkg/common/db/cache/conversation.go
2023-02-03 16:23:47 +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
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
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 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
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
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 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
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 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
skiffer-git 6aa4974e29 Error code standardization 2023-01-31 11:34:30 +08:00
skiffer-git 026649f875 Error code standardization 2023-01-31 10:48:02 +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
withchao 5c99bdf14f 1 2023-01-30 15:41:30 +08:00
skiffer-git ec23d22d6d Error code standardization 2023-01-30 15:26:39 +08:00
skiffer-git f38dc3b1f1 Error code standardization 2023-01-30 11:34:07 +08:00
withchao 4c6e02f805 1 2023-01-29 18:37:38 +08:00
withchao b83260ca30 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-29 18:26:47 +08:00
withchao 0a81dd040f 1 2023-01-29 18:13:02 +08:00