Commit Graph

4713 Commits

Author SHA1 Message Date
skiffer-git 452d9840bf Error code standardization 2023-02-10 22:10:37 +08:00
skiffer-git adc84b68e7 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/common/notification/conversation_notification.go
#	internal/common/notification/work_moments_notification.go
#	internal/rpc/conversation/conversaion.go
#	internal/rpc/group/callback.go
#	internal/rpc/group/group.go
#	internal/rpc/office/office.go
2023-02-10 21:05:49 +08:00
skiffer-git cba70e3196 Error code standardization 2023-02-10 21:04:22 +08:00
Gordon 0f5cfbb2dc Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-10 20:58:54 +08:00
Gordon a3593379f6 conversation update 2023-02-10 20:57:45 +08:00
withchao dbf41bf21f Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/rpc/group/callback.go
2023-02-10 19:18:29 +08:00
withchao 09c6fbdfe4 group 2023-02-10 19:17:33 +08:00
wangchuxiao 00e43cc955 errcode 2023-02-10 18:19:40 +08:00
wangchuxiao b7107edc71 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-10 18:14:19 +08:00
wangchuxiao a92dd54354 errcode 2023-02-10 18:13:58 +08:00
wangchuxiao 2e3bb941b0 errcode 2023-02-10 17:02:20 +08:00
skiffer-git f985689a39 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-10 16:19:35 +08:00
skiffer-git 7e1b69cc3c Error code standardization 2023-02-10 16:18:26 +08:00
wangchuxiao 4aaac8595a Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	pkg/common/db/controller/group.go
2023-02-10 15:47:02 +08:00
wangchuxiao 0e97285e0a errcode 2023-02-10 15:46:29 +08:00
withchao 4b3d965783 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-10 15:43:05 +08:00
withchao 1e1c6de56e group nickname 2023-02-10 15:36:25 +08:00
skiffer-git aff1c1f35e Error code standardization 2023-02-10 12:53:46 +08:00
wangchuxiao 79c30fdc69 errcode 2023-02-10 11:03:03 +08:00
withchao 5d7809624c group cache 2023-02-10 10:48:49 +08:00
wangchuxiao 6eb231aae4 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	internal/push/sdk/tpns-server-sdk-go/go/auth/auth.go
	pkg/proto/group/group.proto
2023-02-09 20:39:12 +08:00
wangchuxiao 759432794f errcode 2023-02-09 20:36:34 +08:00
withchao a15051bfde Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-09 19:42:16 +08:00
withchao d6d6afb788 group update batch 2023-02-09 19:40:45 +08:00
skiffer-git 0198a628da Error code standardization 2023-02-09 18:05:19 +08:00
skiffer-git bfc202f31f Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-09 17:57:02 +08:00
skiffer-git d26daa23f1 Error code standardization 2023-02-09 17:55:59 +08:00
withchao 5da1195274 group cache 2023-02-09 17:54:31 +08:00
withchao 29b05499df group rpc 2023-02-09 16:35:15 +08:00
withchao ab30c77836 group db 2023-02-09 16:33:40 +08:00
withchao fc2d07212d Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-09 16:28:58 +08:00
wangchuxiao 8a1702fcf7 errcode 2023-02-09 16:15:18 +08:00
wangchuxiao ccc7e6b3c8 errcode 2023-02-09 16:11:18 +08:00
withchao eecf8bb8ae api to rpc use generic paradigm 2023-02-09 15:38:50 +08:00
wangchuxiao 1075754458 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	internal/api/group/group.go
	internal/api/group/super_group.go
	pkg/common/db/controller/user.go
2023-02-09 14:49:17 +08:00
wangchuxiao 414915eb3b errcode 2023-02-09 14:40:49 +08:00
withchao 2f7b65730a api to rpc use generic paradigm 2023-02-09 14:39:58 +08:00
withchao b422b49c06 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-09 14:33:45 +08:00
withchao 00d64119fa api to rpc use generic paradigm 2023-02-09 14:33:35 +08:00
skiffer-git d46970f519 Error code standardization 2023-02-09 13:43:50 +08:00
skiffer-git 099bbbb5d3 Error code standardization 2023-02-09 13:36:37 +08:00
skiffer-git 772a46e041 Error code standardization 2023-02-09 13:06:22 +08:00
skiffer-git 22f4d8f66d Error code standardization 2023-02-09 13:05:12 +08:00
skiffer-git 96ef753c77 Error code standardization 2023-02-09 13:02:10 +08:00
skiffer-git ca6b704377 Error code standardization 2023-02-09 12:52:47 +08:00
skiffer-git ddb4e1e6ea Error code standardization 2023-02-09 12:21:58 +08:00
skiffer-git 8975f62433 Error code standardization 2023-02-09 11:35:46 +08:00
skiffer-git e2d61b3eb6 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-09 11:30:42 +08:00
skiffer-git 15cfe949bc Error code standardization 2023-02-09 11:30:31 +08:00
wangchuxiao 8c6c7ee21f errcode 2023-02-09 11:25:19 +08:00