IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-01 07:35:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,544 Commits 35 Branches 142 Tags
fc5ab3572ef6bd21faf8dc0e9ae61397d4f4dbfd
Commit Graph

1214 Commits

Author SHA1 Message Date
wangchuxiao fc5ab3572e fix word 2022-06-10 10:16:18 +08:00
wangchuxiao 1c52e731e1 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-09 19:35:09 +08:00
wangchuxiao ee615fbadf fix word 2022-06-09 19:34:52 +08:00
Gordon 2ede9ef8ed add batch push 2022-06-09 18:24:32 +08:00
Gordon 7d63c82ddd Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-09 18:08:52 +08:00
Gordon 1d4dc81e55 add batch push 2022-06-09 18:08:42 +08:00
wangchuxiao 793996e047 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-09 17:19:56 +08:00
wangchuxiao ab76d46007 demo 2022-06-09 17:19:39 +08:00
skiffer-git ed1e22bac5 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-09 17:04:52 +08:00
skiffer-git e57ce28d2b batch push 2022-06-09 17:04:16 +08:00
wangchuxiao c46f574aa8 fix bug 2022-06-09 15:40:53 +08:00
wangchuxiao 3f129513bb fix bug 2022-06-09 15:33:28 +08:00
skiffer-git 60f8f93a02 batch push 2022-06-09 15:20:40 +08:00
skiffer-git 4f184a6723 batch push 2022-06-09 14:24:24 +08:00
skiffer-git 5fd91e808a batch push 2022-06-09 14:07:09 +08:00
skiffer-git d2474c8a72 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-09 12:49:54 +08:00
skiffer-git 9eb0dd5e70 batch push 2022-06-09 12:49:16 +08:00
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 d9710ac244 fix bug 2022-06-08 19:27:04 +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 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