937 Commits

Author SHA1 Message Date
Gordon
4e3ab62f6c log 2023-01-16 16:24:41 +08:00
Gordon
85cb95602d Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2023-01-16 16:00:49 +08:00
Gordon
ff917466eb log 2023-01-16 16:00:11 +08:00
wangchuxiao
ea5039d2ae Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
#	internal/rpc/user/user.go
2023-01-16 14:53:29 +08:00
wangchuxiao
8f2e9f5261 sg recv opt 2023-01-16 14:52:12 +08:00
Gordon
e1147aff9e user update 2023-01-16 13:26:14 +08:00
wangchuxiao
f9b39e91ee Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2023-01-13 19:47:47 +08:00
wangchuxiao
4bf73b0a47 sg recv opt 2023-01-13 19:47:32 +08:00
Gordon
f0976c9ade reaction message update 2023-01-13 17:04:52 +08:00
Gordon
1ab7660f0d remove extend msg limit 2023-01-13 13:57:24 +08:00
Gordon
85e3a81419 super group remove unread message 2023-01-11 14:33:33 +08:00
wangchuxiao
4f322254b0 fix Pb2String 2023-01-09 19:11:50 +08:00
Gordon
a6ba349cb6 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2023-01-06 16:13:35 +08:00
Gordon
3e3818d4b5 reaction message update 2023-01-06 16:11:49 +08:00
withchao
6661c5baac group member cache 2023-01-05 16:11:20 +08:00
Gordon
e813016402 del msg 2023-01-04 17:14:30 +08:00
wangchuxiao
4400423fca add group proto 2023-01-03 18:08:59 +08:00
Gordon
d53507b7b6 callback update 2022-12-30 12:04:48 +08:00
Gordon
787bfccc2c Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-12-30 11:44:30 +08:00
Gordon
955bfe3f40 callback update 2022-12-30 11:44:17 +08:00
wangchuxiao
bbde362570 Merge branch 'v2.3.0release' of https://github.com/OpenIMSDK/Open-IM-Server into v2.3.0release 2022-12-29 11:01:25 +08:00
wangchuxiao
972dd5f531 fix bug 2022-12-29 11:00:41 +08:00
withchao
1e2a60c802 join group 2022-12-28 17:56:13 +08:00
withchao
4618bf990d invite user to group 2022-12-28 16:17:54 +08:00
withchao
e420871e1f agree user join group 2022-12-28 15:38:27 +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
Gordon
20a2cb3d3c reaction message update 2022-12-19 11:18:23 +08:00
wangchuxiao
920a7cfdac set groupMemberInfo callback 2022-12-16 16:54:18 +08:00
Gordon
25aa6a4345 message reaction 2022-12-16 15:52:30 +08:00
Gordon
e4964b050b reaction message add expiration 2022-12-13 15:19:33 +08:00
skiffer-git
a98f89a4e7 Update group application list for group administrator 2022-12-13 14:43:09 +08:00
Gordon
915118140f reaction message add expiration 2022-12-12 20:41:40 +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
2b0a997573 reaction message add expiration 2022-12-12 16:52:36 +08:00
Gordon
acee47e861 reaction message add expiration 2022-12-12 15:34:49 +08:00
skiffer-git
2dab70697c set group member ex == "" if ex == nil 2022-12-12 14:46:49 +08:00
Gordon
b3f5c2f185 reaction message add expiration 2022-12-12 12:12:53 +08:00
skiffer-git
25a848c4e4 Merge branch 'v2.3.0release' of https://github.com/OpenIMSDK/Open-IM-Server into v2.3.0release 2022-12-12 11:43:56 +08:00
Gordon
ac55951c74 message reaction 2022-12-11 13:16:24 +08:00
Gordon
a0520ce5d8 log 2022-12-10 20:12:13 +08:00
Gordon
6f20cdd905 reaction message 2022-12-09 20:53:13 +08:00
wangchuxiao
24288aa597 modify msg 2022-12-09 18:03:40 +08:00
skiffer-git
1d78b68831 set group member ex == "" if ex == nil 2022-12-09 13:18:36 +08:00
wangchuxiao
4d56dfdfa2 modify 2022-12-09 12:13:14 +08:00
wangchuxiao
53cd4205e8 modify 2022-12-09 10:45:51 +08:00
wangchuxiao
0e726a20ba modify 2022-12-08 12:54:39 +08:00
wangchuxiao
be01c4da0c dek jinzhu 2022-12-07 21:12:48 +08:00