Commit Graph

4471 Commits

Author SHA1 Message Date
wangchuxiao 704b18d900 errcode 2023-01-29 17:20:31 +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
wangchuxiao 8d029a7ab3 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	pkg/common/db/model/group.go
2023-01-18 11:46:56 +08:00
Gordon 0d3984233b db update 2023-01-18 11:18:05 +08:00
Gordon 640960a87b db update 2023-01-18 10:59:25 +08:00
wangchuxiao 46a7a76b43 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-18 10:23:45 +08:00
Gordon 6e26c0d986 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-17 20:18:34 +08:00
Gordon f83e8659be db update 2023-01-17 20:18:02 +08:00
skiffer-git 8b821ce32e Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-17 18:03:11 +08:00
skiffer-git 9067172424 Error code standardization 2023-01-17 18:02:57 +08:00
wangchuxiao da48b27ada groupModel 2023-01-17 17:50:25 +08:00
wangchuxiao f528535cfd groupModel 2023-01-17 17:49:29 +08:00
wangchuxiao adccfff581 model 2023-01-17 17:47:13 +08:00
Gordon 65cfb5c898 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-17 17:46:57 +08:00
Gordon 0a57d5a426 db update 2023-01-17 17:46:33 +08:00
withchao 8e47b55ab4 1 2023-01-17 17:43:30 +08:00
withchao 142b9386fc Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-17 17:31:35 +08:00
withchao 6ab9cff3c3 1 2023-01-17 17:31:22 +08:00