Gordon
|
f3a9c47c2a
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
wangchuxiao
|
3d184c95ba
|
Merge branch 'shichuang' of https://github.com/OpenIMSDK/Open-IM-Server into shichuang
|
2 years ago |
|
wangchuxiao
|
6754fdb580
|
getui
|
2 years ago |
|
wangchuxiao
|
9842e5624e
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
d00b265347
|
prome
|
2 years ago |
|
Gordon
|
c72f898238
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
4a2a9eb997
|
fcm push modify
|
2 years ago |
skiffer-git
|
5b399d0d06
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
8edacbff2f
|
log
|
2 years ago |
|
wangchuxiao
|
156e9e2fc7
|
cms
|
2 years ago |
|
wangchuxiao
|
4682abf4c1
|
cms
|
2 years ago |
|
wangchuxiao
|
099461dbbf
|
cms
|
2 years ago |
|
wangchuxiao
|
5233e4c097
|
fix bug
|
2 years ago |
|
wangchuxiao
|
70e8811d5c
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
7208dd6b2a
|
cms
|
2 years ago |
|
Gordon
|
44af6740c7
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
8d1dd92df7
|
opid add
|
2 years ago |
|
wangchuxiao
|
a5cacaceda
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
821e704b5b
|
cms
|
2 years ago |
|
Gordon
|
bde0adfbd0
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
# Conflicts:
# pkg/proto/sdk_ws/ws.pb.go
|
2 years ago |
|
Gordon
|
6c8b115479
|
conversation unread modify
|
2 years ago |
|
wangchuxiao
|
82a8f18e88
|
merge cms into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
bdae1f10d4
|
merge cms into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
05b5a0ada3
|
add
|
2 years ago |
|
Gordon
|
f6137dfc34
|
fcm ios push badge
|
2 years ago |
|
wangchuxiao
|
6dfbb90b80
|
fix signal
|
2 years ago |
|
Gordon
|
72aff32024
|
fcm ios push badge
|
2 years ago |
|
wangchuxiao
|
9f4c367249
|
cms
|
2 years ago |
|
Gordon
|
3f87958328
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
a0e689c437
|
fcm ios push badge
|
2 years ago |
|
wangchuxiao
|
49f05d334d
|
cms
|
2 years ago |
|
wangchuxiao
|
06e48516bb
|
cms
|
2 years ago |
|
wangchuxiao
|
a317ebd8e7
|
cms
|
2 years ago |
|
wangchuxiao
|
6774a8594f
|
cms
|
2 years ago |
|
wangchuxiao
|
56fb579da2
|
Merge branch 'shichuang' of github.com:OpenIMSDK/Open-IM-Server into shichuang
|
2 years ago |
|
wangchuxiao
|
b401917c19
|
cache
|
2 years ago |
|
skiffer-git
|
e990118475
|
fix bug :pushMsg.MsgData.OfflinePushInfo==nil
|
2 years ago |
|
wangchuxiao
|
ac2cc154b4
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
99ec0ed8df
|
del key
|
2 years ago |
|
Gordon
|
67e5e3b56b
|
fcm ios push badge
|
2 years ago |
|
Gordon
|
15ef064fc3
|
user conn map copy
|
2 years ago |
|
wangchuxiao
|
c7d544685e
|
cms
|
2 years ago |
|
wangchuxiao
|
d622f1df3d
|
fcm
|
2 years ago |
|
wangchuxiao
|
c7e1302377
|
add
|
2 years ago |
|
wangchuxiao
|
caea072f7d
|
fcm
|
2 years ago |
|
wangchuxiao
|
04b22c1a76
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
26d9d7630c
|
fcm
|
2 years ago |
|
skiffer-git
|
4529047349
|
log for msg_gateway cluster
|
2 years ago |
|
wangchuxiao
|
af110f75d6
|
add
|
2 years ago |
|
wangchuxiao
|
c2831e6676
|
cms
|
2 years ago |
|
skiffer-git
|
e5a7810d6e
|
add group member cache in msg rpc
|
2 years ago |
|
skiffer-git
|
99e913637a
|
add group member cache in push
|
2 years ago |
|
skiffer-git
|
67319031ea
|
log
|
2 years ago |
|
wangchuxiao
|
5134faeefd
|
cms
|
2 years ago |
|
wangchuxiao
|
77327f59b9
|
cms
|
2 years ago |
|
wangchuxiao
|
54c56037e7
|
cms
|
2 years ago |
|
wangchuxiao
|
87dfdb2ddc
|
cms
|
2 years ago |
|
wangchuxiao
|
2c2d3e4641
|
cms
|
2 years ago |
|
wangchuxiao
|
2a8b19d319
|
cms
|
2 years ago |
|
wangchuxiao
|
f43c042223
|
cms
|
2 years ago |
|
wangchuxiao
|
b75b46f415
|
cms
|
2 years ago |
|
wangchuxiao
|
a4767bc7e3
|
cms
|
2 years ago |
|
wangchuxiao
|
8d4e5ad3f1
|
cms
|
2 years ago |
|
skiffer-git
|
49a127d97d
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
8cfb604a0d
|
set mysql connection
|
2 years ago |
|
wangchuxiao
|
da9918b655
|
cms
|
2 years ago |
|
wangchuxiao
|
c41464b974
|
cms
|
2 years ago |
|
wangchuxiao
|
5657f617e7
|
merge
|
2 years ago |
|
wangchuxiao
|
bc1cfed389
|
xms
|
2 years ago |
|
wangchuxiao
|
9b5e1465c3
|
add
|
2 years ago |
|
wangchuxiao
|
7f5b12d4d2
|
cms
|
2 years ago |
|
wangchuxiao
|
c3d3f0986e
|
join groups
|
2 years ago |
|
skiffer-git
|
8c21d0360f
|
log
|
2 years ago |
|
wangchuxiao
|
650141a498
|
fix org
|
2 years ago |
|
skiffer-git
|
6ff8fc7f87
|
merge code : Filter push data by time
|
2 years ago |
|
skiffer-git
|
0f0e99b42e
|
merge code : Filter push data by time
|
2 years ago |
|
skiffer-git
|
96814109dc
|
fix bug: GetSelfUserInfo for no result
|
2 years ago |
|
skiffer-git
|
39720d401f
|
fix bug: msg_gateway/gate/ws_server.go:138
|
2 years ago |
|
wangchuxiao
|
5e6e30a5b3
|
fix bug
|
2 years ago |
|
wangchuxiao
|
a92c0ffac3
|
fix bug
|
2 years ago |
|
wangchuxiao
|
43f7ecc75a
|
fix bug
|
2 years ago |
|
wangchuxiao
|
d598ec1852
|
fix bug
|
2 years ago |
|
wangchuxiao
|
fad61a0a2a
|
fix bug
|
2 years ago |
|
wangchuxiao
|
3886d49b0a
|
admin cms
|
2 years ago |
|
Gordon
|
93f8ed223e
|
group file update
|
2 years ago |
|
Gordon
|
96e0851563
|
group file update
|
2 years ago |
|
Gordon
|
aa2d07ca8d
|
callback add ex field and sdk server shell update
|
2 years ago |
|
wangchuxiao
|
9590d2865a
|
conversation
|
2 years ago |
|
wangchuxiao
|
d542cdd898
|
conversation
|
2 years ago |
|
wangchuxiao
|
1d0d063a6c
|
add
|
2 years ago |
|
skiffer-git
|
f0ebc151db
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
f0a9c63cd3
|
log for remote ip
|
2 years ago |
|
Gordon
|
ec0cd9a348
|
conversation update
|
2 years ago |
|
Gordon
|
b5afd304d0
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
4bd4e0863c
|
conversation update
|
2 years ago |
|
skiffer-git
|
463a5451e1
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
cb881e81a8
|
log for cost time
|
2 years ago |
|
wangchuxiao
|
3d5876a8c0
|
Merge branch 'v2.3.0release' of https://github.com/OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
7d04f06f7d
|
conversation fix
|
2 years ago |
|
Gordon
|
24137bffdd
|
conversation update
|
2 years ago |
|
Gordon
|
621051cfb9
|
pb update
|
2 years ago |
|
Gordon
|
2c21bf3e0e
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
c1a2dee0e9
|
pb update
|
2 years ago |
|
wangchuxiao
|
782ad07940
|
fix bug
|
2 years ago |
|
wangchuxiao
|
1f8c2ba8c5
|
fix bug
|
2 years ago |
|
wangchuxiao
|
b176701e51
|
fix bug
|
2 years ago |
|
wangchuxiao
|
7dd6869cd1
|
fix bug
|
2 years ago |
|
wangchuxiao
|
33886f106c
|
fix bug
|
2 years ago |
|
wangchuxiao
|
94ed160eee
|
fix bug
|
2 years ago |
|
wangchuxiao
|
066eeb6ba6
|
fix bug
|
2 years ago |
|
wangchuxiao
|
402b3f5535
|
fix bug
|
2 years ago |
|
wangchuxiao
|
6553ada66f
|
add set client init
|
2 years ago |
|
Gordon
|
c0b49ff219
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
d20c89ba21
|
merge shichuang 2 v2.3.0release
|
2 years ago |
|
wangchuxiao
|
ee577cae4c
|
add conversationCache
|
2 years ago |
|
Gordon
|
ed5b215bbb
|
pc terminal can login at same time
|
2 years ago |
|
skiffer-git
|
9f002172db
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
5d661f2fc6
|
add user register IP
|
2 years ago |
|
Gordon
|
9a82dd356c
|
callback add offline info
|
2 years ago |
|
skiffer-git
|
dd001ab0e7
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
30b55ce25e
|
GetSelfUserInfo: Handle the case where the user does not exist
|
2 years ago |
|
wangchuxiao
|
943a5b36e3
|
Merge branch 'del' into v2.3.0release
|
2 years ago |
|
Gordon
|
eee98c5175
|
revoke super group message and push message modify
|
2 years ago |
|
wangchuxiao
|
d0a200f652
|
etcd
|
2 years ago |
|
wangchuxiao
|
6f2451edd3
|
etcd
|
2 years ago |
|
Gordon
|
a38291fc17
|
notification
|
2 years ago |
|
wangchuxiao
|
bda96a2175
|
fix
|
2 years ago |
|
wangchuxiao
|
64e1361ef5
|
fix signal bug
|
2 years ago |
|
skiffer-git
|
2f6eb5969e
|
getui
|
2 years ago |
|
skiffer-git
|
125b6fa779
|
Merge remote-tracking branch 'origin/del' into del
|
2 years ago |
|
skiffer-git
|
5e78871c00
|
getui
|
2 years ago |
|
Gordon
|
487d9a6449
|
notification
|
2 years ago |
|
Gordon
|
97b1a774fb
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
12a4c12753
|
notification
|
2 years ago |
|
wangchuxiao
|
e8fdc454db
|
update orgnization after update user
|
2 years ago |
|
wangchuxiao
|
69da4410dc
|
update orgnization after update user
|
2 years ago |
|
wangchuxiao
|
5fc6f78555
|
Merge branch 'v2.3.0release' into del
|
2 years ago |
|
wangchuxiao
|
15e0a7aa38
|
update orgnization after update user
|
2 years ago |
|
wangchuxiao
|
a37d82e2dd
|
update orgnization after update user
|
2 years ago |
|
wangchuxiao
|
0a14c8b3e6
|
update orgnization after update user
|
2 years ago |
|
wangchuxiao
|
e779280428
|
Merge branch 'v2.3.0release' into del
|
2 years ago |
|
wangchuxiao
|
753cd95a18
|
update orgnization after update user
|
2 years ago |
|
wangchuxiao
|
5bd34f19fe
|
Merge branch 'v2.3.0release' into del
|
2 years ago |
|
wangchuxiao
|
0e5b17adcc
|
update orgnization after update user
|
2 years ago |
|
wangchuxiao
|
b23f10ecde
|
Merge branch 'v2.3.0release' into del
|
2 years ago |
|
wangchuxiao
|
08d6e142c3
|
update orgnization after update user
|
2 years ago |
|
wangchuxiao
|
2016a1656b
|
Merge branch 'v2.3.0release' into del
|
2 years ago |
|
wangchuxiao
|
5a44618289
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
338d7f0df6
|
update orgnization after update user
|
2 years ago |
|
wangchuxiao
|
6d19af02c9
|
Merge branch 'v2.3.0release' into del
|
2 years ago |
