135 Commits

Author SHA1 Message Date
wangchuxiao
276328e0fd fix bug 2022-06-08 15:05:57 +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
Gordon
f106664952 kick 2022-06-07 16:27:11 +08:00
Gordon
89f40fe3de kick 2022-06-07 16:17:08 +08:00
wangchuxiao
1fffd36054 singal offline push 2022-06-02 20:06:14 +08:00
wenxu12345
2b4df5be16 Clear personal chat history 2022-05-31 19:16:29 +08:00
wenxu12345
591b292fbf super group 2022-05-30 18:23:12 +08:00
wangchuxiao
0b9e6d52b4 superGroup 2022-05-30 15:11:13 +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
wenxu12345
ae30b4359f super group 2022-05-30 12:12:09 +08:00
Gordon
7285e2b2c9 add super group 2022-05-28 18:10:08 +08:00
wangchuxiao
bbe8c46df9 callback 2022-05-27 16:13:44 +08:00
wangchuxiao
b4da35a0ab ingress 2022-05-26 18:02:00 +08:00
Gordon
b8641258d6 message update 2022-05-25 15:21:53 +08:00
Gordon
355b64fda4 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-18 18:37:52 +08:00
Gordon
c1632f8e65 tag message sender not notification 2022-05-18 18:37:42 +08:00
skiffer-git
313cf858f0 Statistics 2022-05-18 11:52:15 +08:00
wangchuxiao
bb5991b111 organization 2022-05-12 19:00:48 +08:00
Gordon
74b582369a log change 2022-05-10 11:00:15 +08:00
Gordon
c49b5f78bf test 2022-05-09 18:45:44 +08:00
Gordon
e2cacd9c4b test 2022-05-09 18:23:06 +08:00
Gordon
3247d84b6b add modify conversation api 2022-04-24 17:27:26 +08:00
Gordon
150af5ff8b @ people update 2022-04-24 15:55:19 +08:00
Gordon
159a9e00c8 conversation update 2022-04-22 15:12:10 +08:00
wangchuxiao
071dd46a4c workMoments 2022-04-20 16:25:33 +08:00
wangchuxiao
3625befc0b Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
#	pkg/common/constant/constant.go
2022-04-18 19:26:26 +08:00
wangchuxiao
6e6508aafd workMoments 2022-04-18 19:24:36 +08:00
skiffer-git
f6b30ed0c6 organization 2022-04-18 15:45:44 +08:00
skiffer-git
248de7f1f2 set groupmember nickname 2022-04-18 11:52:17 +08:00
wangchuxiao
4efdabc1ff getui 2022-04-08 15:40:07 +08:00
wangchuxiao
929c5e7a5b Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-31 14:50:17 +08:00
wangchuxiao
d600042110 tag and set private tips 2022-03-31 14:50:02 +08:00
wenxu12345
ecd2f0e2bf Merge log files 2022-03-31 11:15:06 +08:00
skiffer-git
fe4b534b78 mute group 2022-03-29 16:04:15 +08:00
skiffer-git
1aeff25316 mute group 2022-03-29 11:48:17 +08:00
skiffer-git
391e525fc5 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-28 19:27:23 +08:00
skiffer-git
afc32b1cfa mute group 2022-03-28 19:27:05 +08:00
Gordon
7827749453 tag notification 2022-03-28 17:37:30 +08:00
Gordon
d1c0205d77 add oa notification 2022-03-28 15:55:55 +08:00
skiffer-git
9d29d49ada group dismissed 2022-03-24 15:33:30 +08:00
wangchuxiao
e7b95892ff minio upload api 2022-03-23 17:40:51 +08:00
wangchuxiao
e6c36411cb mongo 2022-03-23 15:44:34 +08:00
wangchuxiao
d77894c8fe rtc add 2022-03-17 20:55:47 +08:00
wangchuxiao
366f7621fa rtc add 2022-03-17 19:00:05 +08:00
Gordon
965dac5ff9 constant 2022-03-14 15:14:14 +08:00
Gordon
edc81534c4 ws modify 2022-03-11 17:29:20 +08:00
wangchuxiao
bcae7720e1 add callback 2022-03-04 14:27:54 +08:00
wangchuxiao
9cec4b0c8e alter callback fg 2022-03-03 16:41:17 +08:00
wangchuxiao
0bed7ee669 merge code 2022-02-28 17:57:03 +08:00