Commit Graph

44 Commits

Author SHA1 Message Date
wangchuxiao 0e97285e0a errcode 2023-02-10 15:46:29 +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 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
wangchuxiao 8a1702fcf7 errcode 2023-02-09 16:15:18 +08:00
wangchuxiao ccc7e6b3c8 errcode 2023-02-09 16:11:18 +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
Gordon 3b4c227519 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	pkg/common/db/cache/conversation.go
#	pkg/common/db/relation/conversation_model.go
2023-02-03 15:54:23 +08:00
wangchuxiao b637a29348 errcode 2023-02-03 12:16:48 +08:00
Gordon e167d80469 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	pkg/common/db/cache/conversation.go
#	pkg/common/db/relation/conversation_model.go
2023-02-03 10:26:26 +08:00
Gordon 730be9db47 conversation update 2023-02-02 19:47:21 +08:00
wangchuxiao 01f7262d3a errcode 2023-02-02 19:43:51 +08:00
wangchuxiao 47b725ac69 errcode 2023-02-02 19:40:54 +08:00
wangchuxiao f6cc91d7db errcode 2023-02-02 16:11:24 +08:00
wangchuxiao c2fbcd1f22 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	pkg/common/db/relation/friend_model_k.go
2023-02-01 17:13:06 +08:00
withchao 0f3691893e 1 2023-02-01 17:07:56 +08:00
wangchuxiao 40470bc320 errcode 2023-02-01 11:23:01 +08:00
wangchuxiao 4c931fba5c errcode 2023-01-31 18:55:22 +08:00
wangchuxiao 26ed14d1d3 errcode 2023-01-30 11:14:18 +08:00
wangchuxiao 21a1e7dff2 errcode 2023-01-30 11:10:26 +08:00
wangchuxiao 15166f53b0 errcode 2023-01-29 11:37:11 +08:00
wangchuxiao 68d595b558 errcode 2023-01-29 10:31:01 +08:00
wangchuxiao d9becad8e9 errCode 2023-01-28 13:19:36 +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 f538a86e10 remove notification limit 2023-01-17 17:26:58 +08:00
wangchuxiao 727bf623b3 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/db/model/group.go
2023-01-17 17:05:34 +08:00
wangchuxiao 3751e633e4 groupdb 2023-01-17 16:36:34 +08:00
wangchuxiao a55e27c581 groupdb 2023-01-17 14:40:20 +08:00
wangchuxiao 822db2a63e groupdb 2023-01-16 20:14:26 +08:00