234 Commits

Author SHA1 Message Date
Gordon
2ede9ef8ed add batch push 2022-06-09 18:24:32 +08:00
wangchuxiao
26771ee7d0 organization 2022-06-08 17:07:16 +08:00
Gordon
536d7e2957 ws pb 2022-06-08 11:42:39 +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
f3fc452904 group set memberInfo 2022-06-07 16:18:18 +08:00
Gordon
78298e1284 pb file 2022-06-07 10:11:49 +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
skiffer-git
797e2fea1e group info set 2022-06-06 20:39:45 +08:00
wangchuxiao
16d33b1c1f singal offline push 2022-06-02 18:17:11 +08:00
Gordon
0a260a67d5 ws and push update 2022-06-02 17:37:00 +08:00
Gordon
14bfd78f63 ws and push update 2022-06-02 16:47:48 +08:00
Gordon
a18dcfce9e ws and push update 2022-06-02 16:44:55 +08:00
wenxu12345
2b4df5be16 Clear personal chat history 2022-05-31 19:16:29 +08:00
wangchuxiao
653c0faa18 superGroup 2022-05-30 16:23:15 +08:00
wangchuxiao
a85f6b8287 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-05-30 11:55:45 +08:00
wangchuxiao
fe9f86b432 superGroup 2022-05-30 11:55:27 +08:00
Gordon
e9bf26e0ca pb file 2022-05-28 17:22:19 +08:00
wenxu12345
1bfefbd083 super group 2022-05-27 20:29:39 +08:00
Gordon
e9a515ac34 message update 2022-05-25 15:29:38 +08:00
Gordon
f8bed154ce pb file 2022-05-25 14:36:24 +08:00
Gordon
8ee3f7ab66 pb file 2022-05-25 14:22:39 +08:00
wangchuxiao
be10e6a9de organization 2022-05-12 19:07:26 +08:00
wangchuxiao
bb5991b111 organization 2022-05-12 19:00:48 +08:00
wangchuxiao
3a06617a7d office 2022-05-05 11:59:44 +08:00
wangchuxiao
d75eb456dc office 2022-05-05 11:58:48 +08:00
wangchuxiao
91e03f7cfd cache 2022-04-29 18:53:33 +08:00
wangchuxiao
59468eb162 fix work moments bug 2022-04-28 10:46:21 +08:00
wangchuxiao
f662defcf9 cache rpc 2022-04-26 11:19:21 +08:00
wangchuxiao
8f07f8e9e1 cache rpc 2022-04-26 11:19:14 +08:00
wangchuxiao
7e44f7f110 cache rpc 2022-04-26 10:33:49 +08:00
skiffer-git
b211a66e99 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-26 09:09:44 +08:00
wangchuxiao
9f9ebd838a cache rpc 2022-04-25 20:16:43 +08:00
wangchuxiao
a03f89fb68 cache rpc 2022-04-25 20:05:21 +08:00
wangchuxiao
03b35721a2 work_moments 2022-04-24 18:01:27 +08:00
wangchuxiao
db9762c5b2 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-04-24 17:44:10 +08:00
wangchuxiao
d1ebcde725 work_moments 2022-04-24 17:42:41 +08:00
Gordon
150af5ff8b @ people update 2022-04-24 15:55:19 +08:00
Gordon
df17dd749f add rpc conversation 2022-04-24 11:23:54 +08:00
Gordon
91303acdbe conversation update 2022-04-22 19:45:29 +08:00
Gordon
e682b408f3 conversation update 2022-04-22 19:44:58 +08:00
skiffer-git
0a0c206998 add cache 2022-04-22 18:56:39 +08:00
Gordon
159a9e00c8 conversation update 2022-04-22 15:12:10 +08:00
wangchuxiao
a243da8b1e Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-04-21 10:43:46 +08:00
wangchuxiao
62e605a443 workMoments 2022-04-21 10:43:31 +08:00
Gordon
d44d5711cb Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-20 18:06:53 +08:00
Gordon
54cb13ba62 pb file 2022-04-20 18:06:43 +08:00
Gordon
c32f5dd951 pb file 2022-04-20 18:06:24 +08:00
wangchuxiao
9df4a79827 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-04-20 16:25:48 +08:00