2410 Commits

Author SHA1 Message Date
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
Gordon
95705cc95a log 2022-06-07 12:28:36 +08:00
wangchuxiao
07b652c1d4 singal offline push 2022-06-07 12:08:53 +08:00
Gordon
6ec65965a4 log 2022-06-07 11:50:05 +08:00
Gordon
31e12f682d Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-06-07 11:24:37 +08:00
Gordon
ae52f85502 log 2022-06-07 11:24:27 +08:00
skiffer-git
fcda79eb3c fix bug: v.MsgData == nil 2022-06-07 11:10:49 +08:00
skiffer-git
385f371c06 fix bug: v.MsgData == nil 2022-06-07 10:52:52 +08:00
skiffer-git
6efb1a6705 fix bug: v.MsgData == nil 2022-06-07 10:40:19 +08:00
wangchuxiao
34c091f232 signal 2022-06-06 23:27:16 +08:00
wangchuxiao
f8b4cbcc13 singal offline push 2022-06-06 21:04:11 +08:00
wangchuxiao
538656fcc7 singal offline push 2022-06-06 19:58:31 +08:00
wangchuxiao
0f66fa528d singal offline push 2022-06-06 19:48:59 +08:00
wangchuxiao
1a42f6dded singal offline push 2022-06-06 19:36:25 +08:00
wangchuxiao
4efdd342d6 singal offline push 2022-06-06 19:20:12 +08:00
wangchuxiao
f15684a562 singal offline push 2022-06-06 19:02:35 +08:00
wangchuxiao
78dfba8771 singal offline push 2022-06-06 18:52:17 +08:00
wangchuxiao
e428e186f0 singal offline push 2022-06-06 18:23:08 +08:00
wangchuxiao
ebf07eddfb singal offline push 2022-06-06 18:18:30 +08:00
wangchuxiao
d3abc44976 singal offline push 2022-06-06 18:15:32 +08:00
wangchuxiao
dc7c10014d singal offline push 2022-06-06 10:45:04 +08:00