4687 Commits

Author SHA1 Message Date
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
withchao
16fa05f76e 1 2023-01-29 16:47:38 +08:00
withchao
6a87d26420 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-29 16:44:19 +08:00
withchao
8eee04e7be 1 2023-01-29 16:33:11 +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
1e92e0ab28 1 2023-01-29 16:29:14 +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
e241c65a9c Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-29 15:03:51 +08:00
skiffer-git
a218bc1daa Error code standardization 2023-01-29 15:03:39 +08:00
wangchuxiao
4688767c51 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-29 15:01:27 +08:00
wangchuxiao
dc5ee4436e errcode 2023-01-29 15:01:11 +08:00
skiffer-git
17d3ef2469 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-29 14:56:41 +08:00
skiffer-git
3e340f345d Error code standardization 2023-01-29 14:56:25 +08:00
withchao
399e1520d6 1 2023-01-29 14:53:31 +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
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
15166f53b0 errcode 2023-01-29 11:37:11 +08:00
wangchuxiao
b021089360 errcode 2023-01-29 11:30:12 +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
wangchuxiao
945449108d errcode 2023-01-29 11:15:16 +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
withchao
891e631b91 1 2023-01-28 18:01:33 +08:00
wangchuxiao
87e61046cb errcode 2023-01-28 17:09:20 +08:00
wangchuxiao
7fc279a329 errcode 2023-01-28 16:36:38 +08:00
wangchuxiao
c90d4330df errcode 2023-01-28 15:55:04 +08:00
wangchuxiao
19ae659e44 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-28 15:14:55 +08:00
wangchuxiao
870cc25beb errcode 2023-01-28 15:10:19 +08:00
Gordon
0b2854ddda group update 2023-01-28 14:42:46 +08:00
wangchuxiao
36e82d0a6d Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	internal/rpc/group/group.go
#	pkg/common/db/model/group.go
2023-01-28 13:23:34 +08:00
wangchuxiao
7e4bc249be errCode 2023-01-28 13:20:00 +08:00
wangchuxiao
d9becad8e9 errCode 2023-01-28 13:19:36 +08:00
Gordon
5af01e4da1 group update 2023-01-28 11:28:11 +08:00