blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,795 Commits 40 Branches 130 Tags
Commit Graph

2795 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
wangchuxiao
3451d22460 signal 2022-06-17 13:14:38 +08:00
wangchuxiao
0d5dc6bdd8 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-17 13:13:22 +08:00
Gordon
87e6aedb74 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-17 12:39:58 +08:00
Gordon
9b5bd47760 config file update 2022-06-17 12:39:26 +08:00
wangchuxiao
007065b40e 入职流程 2022-06-17 12:36:05 +08:00
wangchuxiao
2e52867df4 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-17 12:10:07 +08:00
wangchuxiao
c5eb8a3f9b 入职流程 2022-06-17 12:09:42 +08:00
skiffer-git
cacde08e99 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-17 11:50:13 +08:00
skiffer-git
9443ed5d49 log for etcd 2022-06-17 11:49:29 +08:00
wangchuxiao
e3c702aca1 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-17 11:09:54 +08:00
wangchuxiao
7fbdff391c fix bug 2022-06-17 11:09:48 +08:00
Gordon
92cb2e7eab config file update 2022-06-17 10:59:50 +08:00
Gordon
04136d5b9d Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-17 10:50:24 +08:00
Gordon
fd256a6c28 config file update 2022-06-17 10:50:15 +08:00
wangchuxiao
e64b8841c5 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-17 10:45:00 +08:00
wangchuxiao
52ae2c3655 fix bug 2022-06-17 10:44:23 +08:00
skiffer-git
f1b5f56294 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-17 10:43:44 +08:00
skiffer-git
ed3b62480c log for etcd 2022-06-17 10:43:24 +08:00
Gordon
365d282119 compose file update 2022-06-17 10:39:02 +08:00
Gordon
56d0c574f9 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-17 10:37:54 +08:00
Gordon
573937e1e5 msg transfer handle change 2022-06-17 10:37:43 +08:00
wangchuxiao
3892883470 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-17 10:37:03 +08:00
wangchuxiao
d1049b8022 fix bug 2022-06-17 10:36:46 +08:00
Gordon
8e3f090ffe msg transfer handle change 2022-06-16 21:15:24 +08:00
Gordon
903c39206f msg transfer handle change 2022-06-16 20:35:27 +08:00
Gordon
29dbb36961 user proto modify 2022-06-16 19:33:35 +08:00
wangchuxiao
20851f2a96 fix bug 2022-06-16 19:26:09 +08:00
wangchuxiao
7bbf2b200b fix bug 2022-06-16 19:18:17 +08:00
Gordon
e9ac9faa49 user proto modify 2022-06-16 19:12:50 +08:00
wangchuxiao
a15e644a51 fix bug 2022-06-16 19:09:13 +08:00
Gordon
479679a1c6 user proto modify 2022-06-16 19:02:08 +08:00
Gordon
a50001364f user proto modify 2022-06-16 18:59:17 +08:00
wangchuxiao
7ea7dffd4a fix bug 2022-06-16 17:57:44 +08:00
wangchuxiao
5ea620a4cd fix bug 2022-06-16 16:49:21 +08:00
wangchuxiao
4e11c7a9e2 fix bug 2022-06-16 16:44:12 +08:00
wangchuxiao
9503766a68 fix bug 2022-06-16 16:20:50 +08:00
skiffer-git
6b29d54b50 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-16 16:13:09 +08:00
skiffer-git
19bbd9b528 fix bug 2022-06-16 16:12:41 +08:00
Gordon
28721c7d20 add global recv opt 2022-06-16 15:34:58 +08:00
Gordon
7dbf0a3594 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-16 15:29:57 +08:00
Gordon
e2f7dd67a2 add global recv opt 2022-06-16 15:29:48 +08:00
skiffer-git
3f455199eb Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-16 15:22:14 +08:00
skiffer-git
24f2ffe82d Handling exception: getcdv3.GetConn == nil 2022-06-16 15:21:53 +08:00
wangchuxiao
86c5d694e5 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-16 15:21:52 +08:00
wangchuxiao
8c963c669b redis interface 2022-06-16 15:21:46 +08:00