4687 Commits

Author SHA1 Message Date
withchao
dec0c8cc47 1 2023-02-02 18:45:43 +08:00
withchao
b7f0e2e6f3 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-02 17:54:21 +08:00
withchao
e8a24ab59e 1 2023-02-02 17:54:02 +08:00
skiffer-git
0e5f3dacd6
Update config.yaml 2023-02-02 17:51:59 +08:00
withchao
778e3e5cd2 1 2023-02-02 17:49:19 +08:00
skiffer-git
082a3b7e65
Update config.yaml 2023-02-02 17:34:11 +08:00
skiffer-git
348cb921eb
Update config.yaml 2023-02-02 17:25:09 +08:00
skiffer-git
e175ef2b4e Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-02 16:39:45 +08:00
skiffer-git
5402d33519 Error code standardization 2023-02-02 16:39:29 +08:00
wangchuxiao
174c3e5fae Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-02-02 16:11:33 +08:00
wangchuxiao
f6cc91d7db errcode 2023-02-02 16:11:24 +08:00
withchao
94b0e60e83 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-02 16:08:19 +08:00
withchao
0eb77e9b35 1 2023-02-02 16:08:08 +08:00
withchao
c3f6a0fa15 1 2023-02-02 15:42:14 +08:00
Gordon
eb810f8dca Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-02 12:06:55 +08:00
Gordon
645b8dc0a9 pb file 2023-02-02 12:06:36 +08:00
Gordon
a9151868b0 pb file 2023-02-02 12:06:25 +08:00
withchao
c1af64854c 1 2023-02-02 12:00:18 +08:00
withchao
dab552aed4 1 2023-02-02 11:55:48 +08:00
withchao
26b5ed72df 1 2023-02-02 11:52:00 +08:00
withchao
eb3bb7948f 1 2023-02-02 11:47:27 +08:00
withchao
c55785783d 1 2023-02-02 11:24:03 +08:00
withchao
7ed60bd8f9 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-02 10:47:46 +08:00
withchao
4649ce5354 1 2023-02-02 10:47:19 +08:00
wangchuxiao
848e861304 errcode 2023-02-02 10:28:52 +08:00
wangchuxiao
803ecd3f92 errcode 2023-02-01 19:31:39 +08:00
wangchuxiao
5bb731f884 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	pkg/common/db/relation/black.go
2023-02-01 18:42:38 +08:00
wangchuxiao
cd6c056e73 errcode 2023-02-01 18:42:04 +08:00
skiffer-git
6658566144 Error code standardization 2023-02-01 17:54:16 +08:00
skiffer-git
a5a1cbb077 Error code standardization 2023-02-01 17:45:47 +08:00
skiffer-git
2e19e3109e Error code standardization 2023-02-01 17:39:08 +08:00
withchao
2b1868f558 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-01 17:22:50 +08:00
withchao
3651274d68 1 2023-02-01 17:22:42 +08:00
skiffer-git
1d42c220af Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	pkg/common/db/table/table.go
2023-02-01 17:21:30 +08:00
skiffer-git
cbe68507f3 Error code standardization 2023-02-01 17:20:55 +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
d67515f53f Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	pkg/common/db/table/table.go
2023-02-01 17:12:00 +08:00
wangchuxiao
d4952ebc16 errcode 2023-02-01 17:11:44 +08:00
withchao
0f3691893e 1 2023-02-01 17:07:56 +08:00
skiffer-git
fb436e7713 Error code standardization 2023-02-01 16:44:50 +08:00
Gordon
aafe17a0f3 friend update 2023-02-01 16:22:13 +08:00
Gordon
80bde864c1 friend update 2023-02-01 16:19:44 +08:00
Gordon
7c92de7899 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-01 15:58:14 +08:00
Gordon
e550c9a874 friend update 2023-02-01 15:56:17 +08:00
withchao
4bea4252ff Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-01 15:44:47 +08:00
withchao
ef475cb9d9 1 2023-02-01 15:42:27 +08:00
skiffer-git
abd957a459 Error code standardization 2023-02-01 12:16:14 +08:00
skiffer-git
39463e68e3 Error code standardization 2023-02-01 12:12:51 +08:00
withchao
01d3977766 1 2023-02-01 12:01:05 +08:00
withchao
26e130122c 1 2023-02-01 12:00:29 +08:00