Commit Graph

373 Commits

Author SHA1 Message Date
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
Gordon 63d75bb68b reaction message add expiration 2022-12-12 17:36:12 +08:00
Gordon 8e95e8c4f8 reaction message add expiration 2022-12-12 16:52:52 +08:00
Gordon 2b0a997573 reaction message add expiration 2022-12-12 16:52:36 +08:00
Gordon 1acf21371b reaction message add expiration 2022-12-12 15:35:02 +08:00
Gordon acee47e861 reaction message add expiration 2022-12-12 15:34:49 +08:00
wangchuxiao 66f49feebb modify msg 2022-12-09 17:29:18 +08:00
wangchuxiao b77bbe6a66 modify msg 2022-12-09 16:55:01 +08:00
wangchuxiao 7f449aed5b modify msg 2022-12-09 16:42:43 +08:00
wangchuxiao a4e2e23fbe modify 2022-12-08 19:50:28 +08:00
wangchuxiao be01c4da0c dek jinzhu 2022-12-07 21:12:48 +08:00
wangchuxiao 4c9859a1ac ws backgroundStatus 2022-12-06 14:24:29 +08:00
wangchuxiao c24b0e1425 ws connID 2022-12-06 10:37:16 +08:00
wangchuxiao 71c836ae1a ws 2022-12-05 14:53:16 +08:00
wangchuxiao 1be16380da conn 2022-11-28 19:09:38 +08:00
wangchuxiao 9be70d640e api 2022-11-23 11:08:44 +08:00
wangchuxiao 3f5dd5bad8 read after burn time 2022-11-16 11:54:24 +08:00
skiffer-git 029c020fe0 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-11-08 11:12:00 +08:00
skiffer-git a9b60b8052 encryption 2022-11-04 15:00:42 +08:00
wangchuxiao 2433e27eb5 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-10-28 15:43:18 +08:00
wangchuxiao 2610a27894 add birthStr field 2022-10-28 15:42:37 +08:00
Gordon eba25f1bb8 ws add logout remove push token 2022-10-27 17:15:06 +08:00
wangchuxiao 55a873d0ef singal 2022-10-08 15:23:34 +08:00
wangchuxiao 0561f3e398 singal 2022-10-08 15:17:58 +08:00
wangchuxiao 68d587e484 singal 2022-10-08 11:37:11 +08:00
wangchuxiao c026754a68 singal 2022-10-08 11:04:34 +08:00
wangchuxiao a705f6a8b7 proto 2022-09-30 17:32:06 +08:00
wangchuxiao 5758f1701d proto 2022-09-30 11:05:32 +08:00
Gordon ed63b9f3cc Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-29 17:58:14 +08:00
Gordon ef3f41bb69 revoke message 2022-09-29 17:57:40 +08:00
Gordon 4d9ed1a6cb revoke message 2022-09-29 17:57:26 +08:00