blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,494 Commits 40 Branches 130 Tags
Commit Graph

2494 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wangchuxiao
4f1bd4e509 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-07 18:40:41 +08:00
Gordon
88544a89b7 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-07 18:39:52 +08:00
Gordon
a87e41eecd super group push 2022-06-07 18:39:43 +08:00
wangchuxiao
e52639d1d4 fix bug 2022-06-07 18:36:06 +08:00
skiffer-git
0463f5e83d fix bug 2022-06-07 18:25:08 +08:00
skiffer-git
eb90314b38 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-07 18:10:02 +08:00
skiffer-git
6ce1d60ebb log 2022-06-07 18:09:11 +08:00
wangchuxiao
5fa62c9fbd Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-07 17:46:53 +08:00
Gordon
ef93a1f42e add conversation sync 2022-06-07 17:45:07 +08:00
wangchuxiao
5f42748e1b Merge branch 'tuoyun' into superGroup 
# Conflicts:
#	internal/msg_gateway/gate/callback.go
#	internal/msg_transfer/logic/online_history_msg_handler.go
#	internal/push/logic/callback.go
#	internal/push/logic/push_to_client.go
#	pkg/common/db/model.go
#	pkg/common/db/newRedisModel.go
#	pkg/proto/group/group.pb.go
#	pkg/proto/group/group.proto
 2022-06-07 17:42:24 +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
skiffer-git
2b150e3c1c KickUserOffline 2022-06-07 16:38:42 +08:00
skiffer-git
f7c17ac7e7 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-07 16:29:31 +08:00
skiffer-git
3f2638efaf KickUserOffline 2022-06-07 16:28:51 +08:00
Gordon
f106664952 kick 2022-06-07 16:27:11 +08:00
skiffer-git
afe8dcc1ff Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-07 16:19:15 +08:00
wangchuxiao
8f1e439381 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-06-07 16:18:32 +08:00
skiffer-git
4418d031e1 log 2022-06-07 16:18:23 +08:00
wangchuxiao
f3fc452904 group set memberInfo 2022-06-07 16:18:18 +08:00
Gordon
89f40fe3de kick 2022-06-07 16:17:08 +08:00
Gordon
f8962beca6 kick 2022-06-07 16:05:59 +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
skiffer-git
eac137a9a9 ForceLogout 2022-06-07 11:50:37 +08:00
Gordon
6ec65965a4 log 2022-06-07 11:50:05 +08:00
skiffer-git
290ae774e0 ForceLogout 2022-06-07 11:42:15 +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
Gordon
4695ef3208 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-07 10:38:10 +08:00
Gordon
34e8b79e7e pb file 2022-06-07 10:38:01 +08:00
skiffer-git
3639f943bf group administrator access 2022-06-07 10:20:56 +08:00
skiffer-git
d373369649 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-07 10:14:21 +08:00
skiffer-git
9106e70b37 group administrator access 2022-06-07 10:13:19 +08:00
Gordon
4678189ed4 pb file 2022-06-07 10:12:15 +08:00
Gordon
78298e1284 pb file 2022-06-07 10:11:49 +08:00
wangchuxiao
34c091f232 signal 2022-06-06 23:27:16 +08:00
skiffer-git
064b650fac group administrator access 2022-06-06 23:19:07 +08:00
wangchuxiao
f8b4cbcc13 singal offline push 2022-06-06 21:04:11 +08:00
Gordon
2f9c8dbb33 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-06 20:55:02 +08:00
Gordon
8bd5db431b add function 2022-06-06 20:54:53 +08:00
skiffer-git
5754510d7a Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-06 20:42:41 +08:00