2430 Commits

Author SHA1 Message Date
wangchuxiao
805b7705b2 rtc 2022-06-14 10:52:23 +08:00
wangchuxiao
ae649a0e31 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-06-14 10:42:56 +08:00
wangchuxiao
d797d7b47a rtc 2022-06-14 10:41:52 +08:00
skiffer-git
2ab1f3749c Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-06-13 21:08:53 +08:00
skiffer-git
52199fb5d3 config 2022-06-13 21:08:25 +08:00
wangchuxiao
ad497b7386 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-06-13 20:11:59 +08:00
wangchuxiao
257e98edb2 group 2022-06-13 20:11:43 +08:00
skiffer-git
25310d5e88 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-06-13 17:20:13 +08:00
skiffer-git
4bc9da3910 set groupID 2022-06-13 17:19:48 +08:00
wangchuxiao
6dfba3c7b8 group 2022-06-13 16:25:03 +08:00
wangchuxiao
94ec584dc3 signal 2022-06-13 15:42:48 +08:00
wangchuxiao
d881ab5fea signal 2022-06-13 15:04:36 +08:00
wangchuxiao
52d8ab5389 singal 2022-06-13 11:53:12 +08:00
Gordon
7c90baf7bf remove online offline split 2022-06-12 18:27:01 +08:00
skiffer-git
67807a3aa7 remove kick 2022-06-11 20:47:25 +08:00
skiffer-git
dca39d6eae set time out 2022-06-11 20:41:23 +08:00
skiffer-git
768d139789 set time out 2022-06-11 20:40:13 +08:00
skiffer-git
a84c8bd273 SetWriteTimeoutWriteMsg 2022-06-11 09:19:06 +08:00
skiffer-git
2d3d351e26 log 2022-06-11 08:26:32 +08:00
skiffer-git
e375188889 log 2022-06-11 08:24:02 +08:00
skiffer-git
5860f1fa7a add send msg timeout 2022-06-10 22:59:45 +08:00
skiffer-git
6a149c74d1 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-06-10 22:54:43 +08:00
skiffer-git
6ae71dba4f add send msg timeout 2022-06-10 22:54:15 +08:00
wangchuxiao
25f9e28230 fix signal 2022-06-10 17:33:36 +08:00
wangchuxiao
1687b70bde fix signal 2022-06-10 17:31:30 +08:00
wangchuxiao
891738747a fix word 2022-06-09 19:36:51 +08:00
wangchuxiao
dbcfcafdfc fix word 2022-06-09 18:16:23 +08:00
wangchuxiao
2b596e226a Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-06-09 15:44:31 +08:00
skiffer-git
11e619d1b3 log 2022-06-09 14:26:18 +08:00
skiffer-git
0dfa224aeb config for msg read receipt 2022-06-09 14:00:18 +08:00
skiffer-git
32565dd188 config for msg read receipt 2022-06-09 13:57:10 +08:00
skiffer-git
96f09c45f5 batch push 2022-06-09 13:12:46 +08:00
Gordon
d1293dd047 log 2022-06-08 17:34:39 +08:00
Gordon
715e8a5000 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-06-08 17:24:31 +08:00
Gordon
a7a69008d8 log 2022-06-08 17:24:22 +08:00
skiffer-git
553b56d094 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-06-08 17:21:11 +08:00
skiffer-git
fec57c4ed7 log 2022-06-08 17:20:39 +08:00
Gordon
b46f106a91 log 2022-06-08 17:19:37 +08:00
Gordon
0214419446 log 2022-06-08 17:17:55 +08:00
Gordon
d587d14f86 log 2022-06-08 17:11:17 +08:00
Gordon
731263638b log 2022-06-08 16:53:58 +08:00
wangchuxiao
269df23851 set group memberInfo 2022-06-07 17:06:47 +08:00
wangchuxiao
c40dc64bd0 set group memberInfo 2022-06-07 16:59:05 +08:00
wangchuxiao
8f1e439381 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-06-07 16:18:32 +08:00
wangchuxiao
f3fc452904 group set memberInfo 2022-06-07 16:18:18 +08:00
skiffer-git
dae1569f0e debug userid == "" 2022-06-07 14:02:11 +08:00
skiffer-git
dd76c268c5 debug userid == "" 2022-06-07 13:50:35 +08:00
skiffer-git
52c52f23d3 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
#	internal/msg_transfer/logic/online_history_msg_handler.go
2022-06-07 13:47:11 +08:00
skiffer-git
3adcb9f164 debug userid == "" 2022-06-07 13:44:52 +08:00
Gordon
0f1a061afe Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-06-07 12:28:48 +08:00