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
3,614 Commits 40 Branches 130 Tags
Commit Graph

3614 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wangchuxiao
d6dd99bb4a add 2022-08-17 15:34:07 +08:00
wangchuxiao
d0a200f652 etcd 2022-08-17 14:57:57 +08:00
wangchuxiao
9138f90843 etcd 2022-08-17 12:58:51 +08:00
wangchuxiao
766a8fa4dd Merge branch 'shichuang' of github.com:OpenIMSDK/Open-IM-Server into shichuang 2022-08-17 12:24:49 +08:00
wangchuxiao
6f2451edd3 etcd 2022-08-17 12:12:54 +08:00
skiffer-git
864fccbdb2 get grpc conn from config 2022-08-17 11:58:23 +08:00
wangchuxiao
8956df9599 etcd 2022-08-17 11:51:37 +08:00
skiffer-git
a3daaa55b5 get grpc conn from config 2022-08-17 11:46:11 +08:00
skiffer-git
85a52f5d6b get grpc conn from config 2022-08-17 11:42:12 +08:00
skiffer-git
92d7ecdf68 Merge remote-tracking branch 'origin/shichuang' into shichuang 
# Conflicts:
#	pkg/grpc-etcdv3/getcdv3/resolver.go
 2022-08-17 11:36:12 +08:00
skiffer-git
cdf09aa1bd get grpc conn from config 2022-08-17 11:35:33 +08:00
wangchuxiao
63a830cc95 Merge branch 'shichuang' of github.com:OpenIMSDK/Open-IM-Server into shichuang 2022-08-17 11:29:31 +08:00
wangchuxiao
3b9cc61669 update orgnization after update user 2022-08-17 11:27:56 +08:00
wangchuxiao
b5166acada update orgnization after update user 2022-08-17 10:42:17 +08:00
Gordon
a38291fc17 notification 2022-08-17 10:18:01 +08:00
skiffer-git
723e304ed8 set mysql max conn 2022-08-16 23:52:53 +08:00
wangchuxiao
63ac7738bb Merge branch 'shichuang' of https://github.com/OpenIMSDK/Open-IM-Server into shichuang 2022-08-16 23:45:45 +08:00
wangchuxiao
bda96a2175 fix 2022-08-16 23:45:32 +08:00
skiffer-git
5b06791a6c set max PlatformID = 9 2022-08-16 23:26:13 +08:00
wangchuxiao
64e1361ef5 fix signal bug 2022-08-16 23:08:16 +08:00
skiffer-git
2f6eb5969e getui 2022-08-16 21:21:29 +08:00
skiffer-git
125b6fa779 Merge remote-tracking branch 'origin/del' into del 2022-08-16 21:15:37 +08:00
skiffer-git
5e78871c00 getui 2022-08-16 21:15:20 +08:00
Gordon
487d9a6449 notification 2022-08-16 19:54:04 +08:00
Gordon
97b1a774fb Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-16 19:16:20 +08:00
Gordon
12a4c12753 notification 2022-08-16 19:15:54 +08:00
wangchuxiao
e8fdc454db update orgnization after update user 2022-08-16 15:08:12 +08:00
wangchuxiao
69da4410dc update orgnization after update user 2022-08-16 15:07:19 +08:00
wangchuxiao
5fc6f78555 Merge branch 'v2.3.0release' into del 2022-08-16 14:17:19 +08:00
wangchuxiao
15e0a7aa38 update orgnization after update user 2022-08-16 14:15:51 +08:00
wangchuxiao
0d62bfb0c6 Merge branch 'v2.3.0release' into del 2022-08-16 13:12:40 +08:00
wangchuxiao
a37d82e2dd update orgnization after update user 2022-08-16 13:12:21 +08:00
wangchuxiao
0a14c8b3e6 update orgnization after update user 2022-08-16 13:11:59 +08:00
wangchuxiao
e779280428 Merge branch 'v2.3.0release' into del 2022-08-16 13:06:08 +08:00
wangchuxiao
753cd95a18 update orgnization after update user 2022-08-16 13:05:47 +08:00
wangchuxiao
5bd34f19fe Merge branch 'v2.3.0release' into del 2022-08-16 13:01:42 +08:00
wangchuxiao
0e5b17adcc update orgnization after update user 2022-08-16 13:01:14 +08:00
wangchuxiao
b23f10ecde Merge branch 'v2.3.0release' into del 2022-08-16 12:57:28 +08:00
wangchuxiao
08d6e142c3 update orgnization after update user 2022-08-16 12:57:20 +08:00
wangchuxiao
2016a1656b Merge branch 'v2.3.0release' into del 2022-08-16 12:17:07 +08:00
wangchuxiao
5a44618289 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-16 12:16:32 +08:00
wangchuxiao
338d7f0df6 update orgnization after update user 2022-08-16 12:16:16 +08:00
wangchuxiao
fd19dd1a03 Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del 2022-08-16 12:01:20 +08:00
wangchuxiao
6d19af02c9 Merge branch 'v2.3.0release' into del 2022-08-16 12:01:04 +08:00
skiffer-git
1deb7e9f95 config 2022-08-16 11:59:00 +08:00
wangchuxiao
5a6f96f84b update orgnization after update user 2022-08-16 11:49:20 +08:00
wangchuxiao
3f74022142 Merge branch 'main' into del 2022-08-15 21:51:12 +08:00
wangchuxiao
ccd2ed8ac2 Merge branch 'v2.3.0release' into del 2022-08-15 21:51:06 +08:00
wangchuxiao
a72e422684 fix code 2022-08-15 21:51:00 +08:00
wangchuxiao
da8755fcb7 fix code 2022-08-15 21:37:38 +08:00