2890 Commits

Author SHA1 Message Date
Gordon
c27560ed44 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-23 10:18:58 +08:00
Gordon
ddddbf6987 remove old redis module 2022-06-23 10:18:44 +08:00
wenxu12345
2f5d8dfb80 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-23 09:24:20 +08:00
wenxu12345
218340e138 Rpc Register IP 2022-06-23 09:24:05 +08:00
wangchuxiao
c4ea10d0af fix bug 2022-06-22 20:23:04 +08:00
wangchuxiao
bb8dcd8b61 fix bug 2022-06-22 20:19:37 +08:00
wangchuxiao
2372340e0d fix bug 2022-06-22 20:13:26 +08:00
wangchuxiao
f78f7e97ee Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-22 19:48:49 +08:00
wangchuxiao
6b78b75638 fix bug 2022-06-22 19:48:35 +08:00
Gordon
2f2f72fe4b test 2022-06-21 21:27:00 +08:00
Gordon
34fe9596a9 test 2022-06-21 21:22:35 +08:00
Gordon
e4d35c2a86 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-21 21:13:36 +08:00
Gordon
af7dde61d6 model update 2022-06-21 21:13:27 +08:00
wenxu12345
a62388759a Handling token exceptions 2022-06-21 20:29:20 +08:00
wenxu12345
9337d150b9 Handling token exceptions 2022-06-21 20:25:34 +08:00
wenxu12345
910876f323 Handling token exceptions 2022-06-21 20:25:13 +08:00
wenxu12345
af152aa9b9 Handling token exceptions 2022-06-21 20:16:01 +08:00
wenxu12345
f34fedd822 Handling token exceptions 2022-06-21 20:13:19 +08:00
wenxu12345
ac7c0015db Handling token exceptions 2022-06-21 20:00:03 +08:00
wenxu12345
1a3b5d018a Handling token exceptions 2022-06-21 19:57:48 +08:00
wenxu12345
86c26793b7 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-21 19:48:47 +08:00
wenxu12345
d99d7ac63c debug 2022-06-21 19:48:26 +08:00
Gordon
5646db52a9 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-21 19:47:11 +08:00
Gordon
0fe838d588 compose limit memory 2022-06-21 19:46:58 +08:00
wenxu12345
c2686beb9b debug 2022-06-21 19:44:02 +08:00
wenxu12345
1bfae7627e debug 2022-06-21 19:39:46 +08:00
wenxu12345
06c523ea81 debug 2022-06-21 19:38:13 +08:00
wenxu12345
7f4e21d4ba debug 2022-06-21 19:24:09 +08:00
wenxu12345
c993bb2f5e debug 2022-06-21 18:58:57 +08:00
wenxu12345
5527f7c78a debug 2022-06-21 18:49:01 +08:00
wenxu12345
8e9ad57173 debug 2022-06-21 18:36:34 +08:00
wenxu12345
30ae608863 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-21 18:15:38 +08:00
wenxu12345
68e611794b debug 2022-06-21 18:15:22 +08:00
wangchuxiao
b5c20f5be9 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-21 17:37:30 +08:00
wangchuxiao
59a53c7c73 fix bug 2022-06-21 17:37:22 +08:00
wenxu12345
9b76eb6b55 debug 2022-06-21 17:15:24 +08:00
wenxu12345
08d9551230 debug 2022-06-21 16:50:18 +08:00
wenxu12345
c3bdd2f288 debug 2022-06-21 16:36:34 +08:00
wenxu12345
fae881c080 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-21 14:54:58 +08:00
wenxu12345
49797ce6ab super group notification 2022-06-21 14:54:42 +08:00
Gordon
7783e5b7cf jpush add config for ios env mode 2022-06-21 11:28:02 +08:00
Gordon
b242aac7cd jpush add config for ios env mode 2022-06-21 11:27:39 +08:00
skiffer-git
127ad802ff Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-20 18:13:13 +08:00
skiffer-git
f42a2c9434 kickoff 2022-06-20 18:12:02 +08:00
wangchuxiao
b80f510de5 quit superGroup add notification 2022-06-20 11:57:53 +08:00
wangchuxiao
134087c672 v2.1.0 v2.1.0 2022-06-17 17:11:59 +08:00
wangchuxiao
91a2406827 Merge branch 'tuoyun'
# Conflicts:
#	internal/api/manage/management_chat.go
2022-06-17 17:08:11 +08:00
wangchuxiao
f82f9567c2 merge super 2 tuoyun 2022-06-17 15:56:19 +08:00
wangchuxiao
0a2951c2eb Merge branch 'superGroup' into tuoyun
# Conflicts:
#	internal/push/logic/push_to_client.go
2022-06-17 15:54:57 +08:00
Gordon
5601212f58 config file update 2022-06-17 15:48:40 +08:00