IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-04-28 14:29:19 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,812 Commits 35 Branches 142 Tags
c993bb2f5e042b9941ec96e91bcd1ded125f565e
Commit Graph

2812 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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