Commit Graph

2121 Commits

Author SHA1 Message Date
skiffer-git 64b4e5570c Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/rpc/friend/friend.go
#	pkg/common/db/mysql_model/im_mysql_model/user_black_list_model.go
2023-01-04 17:23:27 +08:00
skiffer-git 86bf207e02 Error code standardization 2023-01-04 17:22:55 +08:00
wangchuxiao 2d8a538798 errCode 2023-01-04 17:21:33 +08:00
skiffer-git 5a2a57c706 Error code standardization 2023-01-04 15:51:02 +08:00
skiffer-git c076f16793 Error code standardization 2023-01-04 11:54:49 +08:00
wangchuxiao 58bb3fe3f1 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-04 11:32:30 +08:00
wangchuxiao 491501c618 errCode 2023-01-04 11:31:52 +08:00
wangchuxiao cbe7dcebea errCode 2023-01-04 11:28:52 +08:00
skiffer-git 108685e8d0 Error code standardization 2023-01-04 11:24:11 +08:00
skiffer-git 1d5e4a0f8a Error code standardization 2023-01-04 11:06:28 +08:00
skiffer-git 89a4fe96b5 Error code standardization 2023-01-04 10:12:20 +08:00
withchao b2ce96eb67 operationID 2023-01-03 16:47:11 +08:00
skiffer-git 84df63e249 Error code standardization 2023-01-03 16:42:48 +08:00
skiffer-git b2dd39887d Error code standardization 2023-01-03 16:35:40 +08:00
skiffer-git 2888236e02 Error code standardization 2023-01-03 15:49:34 +08:00
skiffer-git 304474a5e1 Error code standardization 2023-01-03 15:46:28 +08:00
skiffer-git 6e4a17764e Error code standardization 2023-01-03 15:42:59 +08:00
skiffer-git a76e93626d Error code standardization 2023-01-03 15:17:33 +08:00
skiffer-git 20d56aefa8 Error code standardization 2022-12-30 19:52:12 +08:00
skiffer-git 32d7846139 Error code standardization 2022-12-30 18:46:02 +08:00
wangchuxiao eb49b27e16 Merge branch 'v2.3.0release' of https://github.com/OpenIMSDK/Open-IM-Server into v2.3.0release 2022-12-26 10:25:53 +08:00
wangchuxiao 4fd31e4367 getui 2022-12-26 10:25:42 +08:00
Gordon 1026a6b2b6 Merge remote-tracking branch 'origin/modify' into v2.3.0release
# Conflicts:
#	config/config.yaml
#	pkg/common/constant/constant.go
#	pkg/proto/sdk_ws/ws.pb.go
#	pkg/proto/sdk_ws/ws.proto
2022-12-23 16:16:28 +08:00
Gordon f5ed0be023 callback update 2022-12-23 16:09:59 +08:00
Gordon a7f44b6ce7 callback update 2022-12-23 16:05:51 +08:00
wangchuxiao 481f12af5e Merge branch 'v2.3.0release' of https://github.com/OpenIMSDK/Open-IM-Server into v2.3.0release 2022-12-23 10:51:00 +08:00
Gordon 16a7bc63f2 callback update 2022-12-22 17:37:34 +08:00
wangchuxiao e8dc5ce085 push 2022-12-22 17:35:09 +08:00
Gordon 98ce12d74e Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-12-22 17:25:29 +08:00
Gordon edb09f2081 callback update 2022-12-22 17:25:14 +08:00
Gordon 86fc0e4101 reaction message update 2022-12-22 17:23:14 +08:00
wangchuxiao fb72f4b1ae push 2022-12-22 17:17:28 +08:00
wangchuxiao 6bf0a3a804 push 2022-12-22 16:28:36 +08:00
wangchuxiao 4bcaa5eaca push 2022-12-22 15:42:16 +08:00
wangchuxiao 8ca6584299 push 2022-12-22 15:23:46 +08:00
wangchuxiao e86e8820f3 push 2022-12-22 11:30:19 +08:00
wangchuxiao 07c300f35f push 2022-12-22 11:10:19 +08:00
wangchuxiao b08936c27e push 2022-12-21 19:56:25 +08:00
wangchuxiao 0b4b408552 push 2022-12-21 18:58:36 +08:00
wangchuxiao 36e37052e0 push 2022-12-21 18:37:58 +08:00
wangchuxiao 9a3373a43d push 2022-12-21 18:29:31 +08:00
wangchuxiao 428e5a7a4e push 2022-12-21 18:15:25 +08:00
wangchuxiao 7445b84756 push 2022-12-21 18:03:39 +08:00
wangchuxiao fa5be03fc3 push 2022-12-21 17:41:35 +08:00
wangchuxiao 49b21fb577 push 2022-12-21 17:39:48 +08:00
wangchuxiao 1f7e788585 push 2022-12-21 17:30:49 +08:00
wangchuxiao e80afa610d getui 2022-12-21 16:46:16 +08:00
Gordon 20a2cb3d3c reaction message update 2022-12-19 11:18:23 +08:00
Gordon fc8523da46 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-12-16 17:23:01 +08:00
Gordon b67ad01d97 platform update 2022-12-16 17:22:40 +08:00