IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-01 07:35:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,484 Commits 35 Branches 142 Tags
21a1e7dff2a532686cccef8fdfeda613f8f9d32f
Commit Graph

403 Commits

Author SHA1 Message Date
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
withchao 16fa05f76e 1 2023-01-29 16:47:38 +08:00
withchao 8eee04e7be 1 2023-01-29 16:33:11 +08:00
withchao 1e92e0ab28 1 2023-01-29 16:29:14 +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 e241c65a9c Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-29 15:03:51 +08:00
skiffer-git a218bc1daa Error code standardization 2023-01-29 15:03:39 +08:00
wangchuxiao 4688767c51 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-29 15:01:27 +08:00
wangchuxiao dc5ee4436e errcode 2023-01-29 15:01:11 +08:00
skiffer-git 3e340f345d Error code standardization 2023-01-29 14:56:25 +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
skiffer-git 7a34a4e5aa Error code standardization 2023-01-17 10:08:30 +08:00
skiffer-git a6f6915336 Error code standardization 2023-01-16 21:32:06 +08:00
withchao 07d3467b7a 1 2023-01-16 18:48:40 +08:00
withchao 99bcc50eb8 1 2023-01-16 16:02:56 +08:00
withchao 8a6435ddf6 1 2023-01-16 15:59:30 +08:00
skiffer-git a30162df52 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-13 20:58:22 +08:00
skiffer-git 87ce1895e3 Error code standardization 2023-01-13 20:58:06 +08:00
wangchuxiao 80b22e0e0e Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-13 19:08:01 +08:00
wangchuxiao 51529eece3 del files 2023-01-13 18:00:18 +08:00
skiffer-git 16c9f670cf Error code standardization 2023-01-13 17:00:43 +08:00
skiffer-git 12cf665d42 Error code standardization 2023-01-13 16:59:40 +08:00
skiffer-git f78304602c Error code standardization 2023-01-13 16:56:46 +08:00
skiffer-git 6c3e710223 Error code standardization 2023-01-12 19:55:51 +08:00
wangchuxiao 6e8a2232a9 group rpc 2023-01-09 17:04:43 +08:00
skiffer-git b76751ec79 Error code standardization 2023-01-05 17:09:35 +08:00
skiffer-git 45aa8293e5 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-05 15:45:46 +08:00
skiffer-git f3a3477811 Error code standardization 2023-01-05 15:45:21 +08:00
wangchuxiao 297f3c16a8 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
# Conflicts:
#	pkg/common/db/mysql_model/im_mysql_model/group_model_k.go
 2023-01-05 15:30:33 +08:00
wangchuxiao cbe7dcebea errCode 2023-01-04 11:28:52 +08:00
Gordon aaad0c03a6 callback update 2022-12-23 16:31:37 +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 a7f44b6ce7 callback update 2022-12-23 16:05:51 +08:00
Gordon 86fc0e4101 reaction message update 2022-12-22 17:23:14 +08:00
wangchuxiao 43ac9de714 getui 2022-12-21 16:55:44 +08:00
Gordon 26b3f742ce pb 2022-12-18 13:16:26 +08:00
Gordon 2ccbade642 pb 2022-12-18 12:29:39 +08:00
wangchuxiao 386c837f1a pb 2022-12-14 16:14:56 +08:00
wangchuxiao be8c544da3 proto 2022-12-14 16:14:12 +08:00
skiffer-git a98f89a4e7 Update group application list for group administrator 2022-12-13 14:43:09 +08:00
wangchuxiao a662414b7f Merge branch 'modify' of github.com:OpenIMSDK/Open-IM-Server into modify 
# Conflicts:
#	pkg/proto/msg/msg.pb.go
 2022-12-12 19:53:04 +08:00
wangchuxiao 112ce9b450 Merge branch 'modify' of github.com:OpenIMSDK/Open-IM-Server into modify 
# Conflicts:
#	pkg/proto/msg/msg.pb.go
 2022-12-12 19:24:53 +08:00
wangchuxiao 0f1208dba9 mongo operation 2022-12-12 19:22:50 +08:00
Gordon 21dcb55c82 reaction message add expiration 2022-12-12 19:15:42 +08:00
Gordon 25871aea49 reaction message add expiration 2022-12-12 19:15:31 +08:00