IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-04-28 22:39:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,521 Commits 35 Branches 142 Tags
bbdcb34ab648db5bb9be3b1acae0cc4e13565bc5
Commit Graph

2521 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wangchuxiao bbdcb34ab6 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-09 12:39:42 +08:00
wangchuxiao 6525d63459 fix bug 2022-06-09 12:39:28 +08:00
skiffer-git 0babf89aa5 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-08 20:26:41 +08:00
skiffer-git 317e6f81bb batch push 2022-06-08 20:26:08 +08:00
wangchuxiao ae684d6d39 fix bug 2022-06-08 19:39:36 +08:00
wangchuxiao d9710ac244 fix bug 2022-06-08 19:27:04 +08:00
wangchuxiao dff7a28094 fix bug 2022-06-08 19:14:25 +08:00
wangchuxiao da18950b3d fix bug 2022-06-08 19:06:22 +08:00
wangchuxiao 6055ce9b6b fix bug 2022-06-08 18:44:21 +08:00
wangchuxiao bd14739a9e fix bug 2022-06-08 18:40:07 +08:00
wangchuxiao 843cbe4f80 organization 2022-06-08 18:24:20 +08:00
wangchuxiao f650e73d5c fix bug 2022-06-08 17:36:24 +08:00
wangchuxiao a115151616 fix bug 2022-06-08 17:08:47 +08:00
wangchuxiao 26771ee7d0 organization 2022-06-08 17:07:16 +08:00
wangchuxiao a4f69351ce fix bug 2022-06-08 16:46:21 +08:00
wangchuxiao fa5f234a38 fix bug 2022-06-08 15:40:33 +08:00
wangchuxiao 5d2c981368 fix bug 2022-06-08 15:27:50 +08:00
wangchuxiao 4a55842724 fix bug 2022-06-08 15:26:31 +08:00
wangchuxiao e9655ed05e fix bug 2022-06-08 15:15:56 +08:00
wangchuxiao ed7d2bbdd7 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-08 15:07:19 +08:00
wangchuxiao 276328e0fd fix bug 2022-06-08 15:05:57 +08:00
Gordon 1bcd091330 Merge remote-tracking branch 'origin/superGroup' into superGroup 
# Conflicts:
#	pkg/proto/sdk_ws/ws.pb.go
 2022-06-08 11:43:11 +08:00
Gordon 536d7e2957 ws pb 2022-06-08 11:42:39 +08:00
Gordon 55e774344a ws pb 2022-06-08 10:32:21 +08:00
Gordon 7d0c8b0c5f super group add notification 2022-06-07 19:02:19 +08:00
Gordon 88c4cff50c Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-07 18:45:09 +08:00
Gordon cfe01bb820 super group push 2022-06-07 18:45:00 +08:00
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