blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-05-04 09:09:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,809 Commits 40 Branches 130 Tags
Commit Graph

2493 Commits

Author SHA1 Message Date
wangchuxiao
79b5d4b8bd Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
 Conflicts:
	internal/rpc/friend/friend.go
 2023-01-30 15:30:37 +08:00
wangchuxiao
67c082ab7b errcode 2023-01-30 15:28:46 +08:00
skiffer-git
ec23d22d6d Error code standardization 2023-01-30 15:26:39 +08:00
skiffer-git
d9eb55d9df Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-30 11:35:06 +08:00
skiffer-git
f38dc3b1f1 Error code standardization 2023-01-30 11:34:07 +08:00
wangchuxiao
26ed14d1d3 errcode 2023-01-30 11:14:18 +08:00
wangchuxiao
5b8f66404c Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
 Conflicts:
	internal/rpc/group/group.go
	pkg/common/db/relation/user_model_k.go
 2023-01-30 11:12:35 +08:00
wangchuxiao
21a1e7dff2 errcode 2023-01-30 11:10:26 +08:00
skiffer-git
2a76dc3ac8 Error code standardization 2023-01-30 10:40:27 +08:00
withchao
4c6e02f805 1 2023-01-29 18:37:38 +08:00
withchao
b83260ca30 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-29 18:26:47 +08:00
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
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
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
a218bc1daa Error code standardization 2023-01-29 15:03:39 +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
87e61046cb errcode 2023-01-28 17:09:20 +08:00
wangchuxiao
c90d4330df errcode 2023-01-28 15:55:04 +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
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
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
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
skiffer-git
3f52c03b1d Error code standardization 2023-01-17 16:25:18 +08:00
skiffer-git
87d0e296c1 Error code standardization 2023-01-17 15:28:25 +08:00
skiffer-git
ffd306f25c Error code standardization 2023-01-17 15:03:47 +08:00
withchao
58866c1b41 1 2023-01-17 14:54:08 +08:00