Commit Graph

2318 Commits

Author SHA1 Message Date
withchao 4bea4252ff Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-01 15:44:47 +08:00
withchao ef475cb9d9 1 2023-02-01 15:42:27 +08:00
withchao 01d3977766 1 2023-02-01 12:01:05 +08:00
withchao 26e130122c 1 2023-02-01 12:00:29 +08:00
skiffer-git 839af18f49 Error code standardization 2023-02-01 11:15:39 +08:00
skiffer-git e7eee16cf1 Error code standardization 2023-02-01 10:49:30 +08:00
skiffer-git 4067d7e4b9 Error code standardization 2023-01-31 21:06:04 +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 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 467d44adc6 Error code standardization 2023-01-31 10:03:10 +08:00
skiffer-git 6bce40535e Error code standardization 2023-01-31 09:59:15 +08:00
skiffer-git 82c1b2352c Error code standardization 2023-01-31 09:35:00 +08:00
skiffer-git fa45eb1fa8 Error code standardization 2023-01-30 21:57:39 +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
wangchuxiao 1ba5cde076 errcode 2023-01-30 16:45:40 +08:00
wangchuxiao 79b5d4b8bd Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	internal/rpc/friend/friend.go
2023-01-30 15:30:37 +08:00
wangchuxiao 67c082ab7b errcode 2023-01-30 15:28:46 +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 2a76dc3ac8 Error code standardization 2023-01-30 10:40:27 +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
skiffer-git d2d8b9c41c Error code standardization 2023-01-29 17:54:01 +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 00b4538b0a Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-29 16:30:48 +08:00
skiffer-git b162909147 Error code standardization 2023-01-29 16:30:33 +08:00
withchao 0e1982083e Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	pkg/proto/sdk_ws/ws.proto
2023-01-29 16:13:45 +08:00
withchao 29a78c469d 1 2023-01-29 16:10:30 +08:00
withchao cf4499e958 1 2023-01-29 15:23:14 +08:00
skiffer-git a218bc1daa Error code standardization 2023-01-29 15:03:39 +08:00
withchao 56a89ad33b Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-29 14:52:05 +08:00
withchao f65cd2aefc 1 2023-01-29 14:51:59 +08:00