Commit Graph

17 Commits

Author SHA1 Message Date
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 d6d6afb788 group update batch 2023-02-09 19:40:45 +08:00
wangchuxiao 414915eb3b errcode 2023-02-09 14:40:49 +08:00
wangchuxiao 62f0d1043d Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	internal/rpc/group/group.go
	pkg/common/db/cache/conversation.go
	pkg/common/db/cache/group.go
	pkg/common/db/controller/group.go
2023-02-09 10:57:57 +08:00
wangchuxiao 4826810c2a errcode 2023-02-09 10:55:21 +08:00
withchao f20e9e71b7 group complete 2023-02-08 20:08:22 +08:00
withchao b3ae69ce94 conversation.go 2023-02-08 19:18:11 +08:00
wangchuxiao db51bc87e2 errcode 2023-02-08 18:29:11 +08:00
wangchuxiao 84c59cecfb errcode 2023-02-07 18:46:19 +08:00
wangchuxiao 8fc54a7379 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	pkg/common/db/cache/conversation.go
2023-02-07 18:45:54 +08:00
wangchuxiao f4baf847ca errcode 2023-02-07 18:43:43 +08:00
withchao a2c4bccdb6 1 2023-02-03 16:10:51 +08:00
wangchuxiao b637a29348 errcode 2023-02-03 12:16:48 +08:00
Gordon 730be9db47 conversation update 2023-02-02 19:47:21 +08:00
wangchuxiao 47b725ac69 errcode 2023-02-02 19:40:54 +08:00
wangchuxiao f6cc91d7db errcode 2023-02-02 16:11:24 +08:00