372 Commits

Author SHA1 Message Date
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
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
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
3adcb9f164 debug userid == "" 2022-06-07 13:44:52 +08:00
skiffer-git
797e2fea1e group info set 2022-06-06 20:39:45 +08:00
wenxu12345
da1df91f49 Clear msg 2022-06-01 15:54:40 +08:00
wenxu12345
b2df6e6d41 Clear msg 2022-06-01 15:53:14 +08:00
wenxu12345
2b4df5be16 Clear personal chat history 2022-05-31 19:16:29 +08:00
wangchuxiao
110f5e02f4 superGroup 2022-05-30 15:27:23 +08:00
wangchuxiao
ecf0a4f299 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-05-30 15:10:32 +08:00
wangchuxiao
d3fe5cdf34 superGroup 2022-05-30 15:10:26 +08:00
Gordon
839f3e52ef pull message update 2022-05-30 11:56:32 +08:00
Gordon
7285e2b2c9 add super group 2022-05-28 18:10:08 +08:00
wangchuxiao
884b410dce callback 2022-05-27 12:49:26 +08:00
wangchuxiao
e5945fa720 callback 2022-05-27 11:49:38 +08:00
wangchuxiao
b155a9908b callback 2022-05-27 11:34:10 +08:00
wangchuxiao
d67e4a3491 callback 2022-05-27 11:08:27 +08:00
wangchuxiao
f5befcc95f callback 2022-05-27 10:26:44 +08:00
wangchuxiao
b4da35a0ab ingress 2022-05-26 18:02:00 +08:00
wangchuxiao
5957e4b264 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
#	internal/rpc/msg/rpcChat.go
2022-05-25 16:25:16 +08:00
wangchuxiao
4d8708a5ee Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
#	internal/rpc/msg/rpcChat.go
2022-05-25 16:10:05 +08:00
wangchuxiao
9eb1870196 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
#	internal/rpc/msg/rpcChat.go
2022-05-25 16:01:34 +08:00
wangchuxiao
841566a5d1 del msg 2022-05-25 15:56:39 +08:00
wangchuxiao
6022aff965 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-25 15:09:25 +08:00
wangchuxiao
18eaae80ec del msg 2022-05-25 15:09:17 +08:00
Gordon
a4e41462c7 message update 2022-05-25 14:55:14 +08:00
Gordon
d58f7fd089 redis add get message 2022-05-24 17:36:11 +08:00
wangchuxiao
ce15c26b59 k8s deploy 2022-05-23 16:07:52 +08:00
wangchuxiao
8c64538207 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-23 14:32:37 +08:00
wangchuxiao
d1cb176b31 del msg sync 2022-05-23 10:14:10 +08:00
Gordon
767131a117 message handle 2022-05-23 09:54:43 +08:00
skiffer-git
1f20024b91 log 2022-05-23 08:44:20 +08:00
skiffer-git
f5c7197dda log 2022-05-23 08:42:50 +08:00
skiffer-git
04a9788bc0 log 2022-05-22 18:47:16 +08:00
skiffer-git
883e7f96ee log 2022-05-22 18:42:08 +08:00
skiffer-git
d276be9594 Reduce memory copies 2022-05-22 18:28:51 +08:00
skiffer-git
2fc6b0a8cb log 2022-05-22 15:57:02 +08:00
skiffer-git
9f295d8399 log 2022-05-22 15:15:55 +08:00
skiffer-git
024f454702 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-22 15:09:49 +08:00
skiffer-git
821ad4de2e log 2022-05-22 15:09:21 +08:00
Gordon
b864f9c6a9 message 2022-05-21 19:17:31 +08:00
skiffer-git
5b9e5f904b log 2022-05-21 15:01:01 +08:00
skiffer-git
17b4a0525d log 2022-05-21 10:59:44 +08:00
Gordon
c1632f8e65 tag message sender not notification 2022-05-18 18:37:42 +08:00