wangchuxiao
|
5f42748e1b
|
Merge branch 'tuoyun' into superGroup
# Conflicts:
# internal/msg_gateway/gate/callback.go
# internal/msg_transfer/logic/online_history_msg_handler.go
# internal/push/logic/callback.go
# internal/push/logic/push_to_client.go
# pkg/common/db/model.go
# pkg/common/db/newRedisModel.go
# pkg/proto/group/group.pb.go
# pkg/proto/group/group.proto
|
2 years ago |
|
wangchuxiao
|
f3fc452904
|
group set memberInfo
|
2 years ago |
Gordon
|
78298e1284
|
pb file
|
2 years ago |
|
Gordon
|
2f9c8dbb33
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
8bd5db431b
|
add function
|
2 years ago |
skiffer-git
|
5754510d7a
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
797e2fea1e
|
group info set
|
2 years ago |
|
wangchuxiao
|
16d33b1c1f
|
singal offline push
|
2 years ago |
|
Gordon
|
0a260a67d5
|
ws and push update
|
2 years ago |
|
Gordon
|
14bfd78f63
|
ws and push update
|
2 years ago |
|
Gordon
|
a18dcfce9e
|
ws and push update
|
2 years ago |
|
wenxu12345
|
2b4df5be16
|
Clear personal chat history
|
3 years ago |
|
wangchuxiao
|
653c0faa18
|
superGroup
|
3 years ago |
|
wangchuxiao
|
a85f6b8287
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
3 years ago |
|
wangchuxiao
|
fe9f86b432
|
superGroup
|
3 years ago |
|
Gordon
|
e9bf26e0ca
|
pb file
|
3 years ago |
|
wenxu12345
|
1bfefbd083
|
super group
|
3 years ago |
|
Gordon
|
e9a515ac34
|
message update
|
3 years ago |
|
Gordon
|
f8bed154ce
|
pb file
|
3 years ago |
|
Gordon
|
8ee3f7ab66
|
pb file
|
3 years ago |
|
wangchuxiao
|
be10e6a9de
|
organization
|
3 years ago |
|
wangchuxiao
|
bb5991b111
|
organization
|
3 years ago |
|
wangchuxiao
|
3a06617a7d
|
office
|
3 years ago |
|
wangchuxiao
|
d75eb456dc
|
office
|
3 years ago |
|
wangchuxiao
|
91e03f7cfd
|
cache
|
3 years ago |
|
wangchuxiao
|
59468eb162
|
fix work moments bug
|
3 years ago |
|
wangchuxiao
|
f662defcf9
|
cache rpc
|
3 years ago |
|
wangchuxiao
|
8f07f8e9e1
|
cache rpc
|
3 years ago |
|
wangchuxiao
|
7e44f7f110
|
cache rpc
|
3 years ago |
|
skiffer-git
|
b211a66e99
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wangchuxiao
|
9f9ebd838a
|
cache rpc
|
3 years ago |
|
wangchuxiao
|
a03f89fb68
|
cache rpc
|
3 years ago |
|
wangchuxiao
|
03b35721a2
|
work_moments
|
3 years ago |
|
wangchuxiao
|
db9762c5b2
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
d1ebcde725
|
work_moments
|
3 years ago |
|
Gordon
|
150af5ff8b
|
@ people update
|
3 years ago |
|
Gordon
|
df17dd749f
|
add rpc conversation
|
3 years ago |
|
Gordon
|
91303acdbe
|
conversation update
|
3 years ago |
|
Gordon
|
e682b408f3
|
conversation update
|
3 years ago |
|
skiffer-git
|
0a0c206998
|
add cache
|
3 years ago |
|
Gordon
|
159a9e00c8
|
conversation update
|
3 years ago |
|
wangchuxiao
|
a243da8b1e
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
62e605a443
|
workMoments
|
3 years ago |
|
Gordon
|
d44d5711cb
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
54cb13ba62
|
pb file
|
3 years ago |
|
Gordon
|
c32f5dd951
|
pb file
|
3 years ago |
|
wangchuxiao
|
9df4a79827
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
071dd46a4c
|
workMoments
|
3 years ago |
|
skiffer-git
|
88e9dd54b2
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
f53f34559a
|
organization
|
3 years ago |
|
wangchuxiao
|
3f287eb148
|
workMoments
|
3 years ago |
|
wangchuxiao
|
957e11eff0
|
workMoments
|
3 years ago |
|
wangchuxiao
|
3625befc0b
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
# pkg/common/constant/constant.go
|
3 years ago |
|
wangchuxiao
|
6e6508aafd
|
workMoments
|
3 years ago |
|
skiffer-git
|
b1c66997ca
|
organization
|
3 years ago |
|
skiffer-git
|
f6b30ed0c6
|
organization
|
3 years ago |
|
skiffer-git
|
248de7f1f2
|
set groupmember nickname
|
3 years ago |
|
skiffer-git
|
0d5132f710
|
organization
|
3 years ago |
|
skiffer-git
|
cc405b83e2
|
organization
|
3 years ago |
|
skiffer-git
|
c65f5b7279
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
c216340120
|
organization
|
3 years ago |
|
wangchuxiao
|
dbc5bd96f3
|
getui
|
3 years ago |
|
wangchuxiao
|
1bb634bc6f
|
merge code
|
3 years ago |
|
skiffer-git
|
bc06ba54b9
|
organization && department
|
3 years ago |
|
wangchuxiao
|
26f8172b1a
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
f4921d1317
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
bb267ccae7
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
4390302384
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
d600042110
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
7eeb67be28
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
7ed6ee5075
|
tag
|
3 years ago |
|
wenxu12345
|
d3c8215e15
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
30bc6c274e
|
mute group
|
3 years ago |
|
skiffer-git
|
ecb1068f0b
|
mute group
|
3 years ago |
|
wenxu12345
|
f6eef21b45
|
mute group
|
3 years ago |
|
skiffer-git
|
764bc3fead
|
mute group
|
3 years ago |
|
skiffer-git
|
391e525fc5
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
afc32b1cfa
|
mute group
|
3 years ago |
|
wangchuxiao
|
e95400988e
|
tag
|
3 years ago |
|
wangchuxiao
|
169665da32
|
tag
|
3 years ago |
|
wangchuxiao
|
8197ae6aa7
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
6d20eddd43
|
mongo
|
3 years ago |
|
skiffer-git
|
9d29d49ada
|
group dismissed
|
3 years ago |
|
wangchuxiao
|
e6c36411cb
|
mongo
|
3 years ago |
|
wangchuxiao
|
f02fb7ba15
|
rtc add
|
3 years ago |
|
wangchuxiao
|
a0e3488af0
|
rtc proto modify
|
3 years ago |
|
wangchuxiao
|
8fef1f975a
|
rtc add
|
3 years ago |
|
wangchuxiao
|
17fad47ca1
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
b0aa168c9a
|
rtc add
|
3 years ago |
|
wenxu12345
|
11c65e6b90
|
signaling add participant
|
3 years ago |
|
wenxu12345
|
e9699ed8cc
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
812362338e
|
signaling add participant
|
3 years ago |
|
wangchuxiao
|
fa21ae6161
|
rtc add
|
3 years ago |
|
wenxu12345
|
27c6a187a2
|
signaling
|
3 years ago |
|
wenxu12345
|
5f37414fee
|
delete msg from server
|
3 years ago |
|
wenxu12345
|
ab4aee93c1
|
delete msg from server
|
3 years ago |
|
wenxu12345
|
e0a86a8016
|
delete msg from server
|
3 years ago |
|
wenxu12345
|
204b27ca5d
|
pb platformID
|
3 years ago |
|
Gordon
|
dde8f427af
|
pb modify
|
3 years ago |
|
wenxu12345
|
b4c16002ff
|
signaling
|
3 years ago |
|
Gordon
|
ca23c76426
|
pb modify
|
3 years ago |
|
wenxu12345
|
185f3c05fb
|
signaling
|
3 years ago |
|
Gordon
|
bde88ecc79
|
server modify
|
3 years ago |
|
wenxu12345
|
83fffe717e
|
signaling
|
3 years ago |
|
Gordon
|
9b61fb1f85
|
ws modify
|
3 years ago |
|
wenxu12345
|
fa53530055
|
signaling
|
3 years ago |
|
Gordon
|
02d0b4c99b
|
ws.proto
|
3 years ago |
|
wangchuxiao
|
347b1dd31c
|
livekit
|
3 years ago |
|
wangchuxiao
|
d90b31c5df
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wenxu12345
|
564f77bcdc
|
signaling
|
3 years ago |
|
Gordon
|
6136ac4116
|
ws proto modify
|
3 years ago |
|
Gordon
|
bba84b4d11
|
ws proto modify
|
3 years ago |
|
wenxu12345
|
b52317f56b
|
signaling
|
3 years ago |
|
wenxu12345
|
98f2806be6
|
signaling
|
3 years ago |
|
wangchuxiao
|
3693d2e93d
|
conversation table
|
3 years ago |
|
wenxu12345
|
9ab9ae0408
|
signal
|
3 years ago |
|
wenxu12345
|
94a579e7d3
|
signal
|
3 years ago |
|
wangchuxiao
|
51c2f845d8
|
opt
|
3 years ago |
|
wenxu12345
|
b10ba999cd
|
join time
|
3 years ago |
|
wenxu12345
|
0e575a9366
|
keepalive ttl * 3
add user.ex
|
3 years ago |
|
wangchuxiao
|
0bed7ee669
|
merge code
|
3 years ago |
|
wangchuxiao
|
737ce2c2e7
|
fix bug
|
3 years ago |
|
wangchuxiao
|
648a852ba7
|
conversation opt
|
3 years ago |
|
wangchuxiao
|
8cdea2bfeb
|
cms dev
|
3 years ago |
|
wangchuxiao
|
22bfb6be4b
|
merge code
|
3 years ago |
|
wangchuxiao
|
52579c5fab
|
add
|
3 years ago |
|
wenxu12345
|
af330d7f8a
|
Refactor code
|
3 years ago |
|
wenxu12345
|
bf6efc3530
|
Refactor code
|
3 years ago |
|
wangchuxiao
|
192ac0e013
|
api
|
3 years ago |
|
wangchuxiao
|
6de61cb214
|
cms dev
|
3 years ago |
|
wangchuxiao
|
43a9bba96f
|
msg cms
|
3 years ago |
|
wangchuxiao
|
02aad295f9
|
group
|
3 years ago |
|
Gordon
|
ac09da9efc
|
push msg specify receiver
|
3 years ago |
|
Gordon
|
dc1ad8fb2d
|
push msg specify receiver
|
3 years ago |
|
Gordon
|
ba5d178ba0
|
push msg specify receiver
|
3 years ago |
|
wangchuxiao
|
e94dbe4965
|
cms dev
|
3 years ago |
|
wangchuxiao
|
a7f9faf868
|
statistics
|
3 years ago |
|
wangchuxiao
|
fb396d9cf0
|
add
|
3 years ago |
|
wangchuxiao
|
0ed393b1a5
|
group
|
3 years ago |
|
wangchuxiao
|
b992faa468
|
group rpc
|
3 years ago |
|
wangchuxiao
|
79d097c903
|
group pb
|
3 years ago |
|
wangchuxiao
|
cdc2428aca
|
cms
|
3 years ago |
|
wangchuxiao
|
82c8ace8df
|
cms dev
|
3 years ago |
|
wangchuxiao
|
1607853393
|
cms
|
3 years ago |
|
wangchuxiao
|
d58bcd136a
|
pb api
|
3 years ago |
|
Gordon
|
e7c7784fec
|
protocol modify
|
3 years ago |
|
Gordon
|
184f0900fb
|
protocol modify
|
3 years ago |
|
Gordon
|
8b3df83e7e
|
ws proto
|
3 years ago |
|
wenxu12345
|
db80d8f56f
|
Refactor code
|
3 years ago |
|
wenxu12345
|
ae09d73257
|
Refactor code
|
3 years ago |
|
Gordon
|
0ed5f8081a
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
7416fa3a4c
|
ws send msg modify
|
3 years ago |
|
wenxu12345
|
5d8e972ac7
|
Refactor code
|
3 years ago |
|
wenxu12345
|
31a6797fc3
|
Refactor code
|
3 years ago |
|
wenxu12345
|
b9b0e9cf43
|
Refactor code
|
3 years ago |
|
wenxu12345
|
7f4eb5624b
|
Refactor code
|
3 years ago |
|
wenxu12345
|
92a6c7b89e
|
Refactor code
|
3 years ago |
|
wenxu12345
|
a583a31220
|
Refactor code
|
3 years ago |
|
wenxu12345
|
87f14be30c
|
Refactor code
|
3 years ago |
|
wenxu12345
|
17b96dd7c1
|
Refactor code
|
3 years ago |
|
wenxu12345
|
b2c2c1247b
|
Refactor code
|
3 years ago |
|
wenxu12345
|
e4b6b18712
|
Refactor code
|
3 years ago |
|
wenxu12345
|
4601633605
|
Refactor code
|
3 years ago |
|
wenxu12345
|
839123408b
|
Refactor code
|
3 years ago |
|
Gordon
|
0db2c271a0
|
proto json tag modify
|
3 years ago |
|
wenxu12345
|
03fc008dfc
|
Refactor code
|
3 years ago |
|
wenxu12345
|
fa330c766f
|
Refactor code
|
3 years ago |
|
wenxu12345
|
d6133c325a
|
Refactor code
|
3 years ago |
|
wenxu12345
|
aafbee2a28
|
Refactor code
|
3 years ago |
|
wenxu12345
|
5c9dc62015
|
Refactor code
|
3 years ago |
|
wenxu12345
|
887028a1b4
|
Refactor code
|
3 years ago |
|
wenxu12345
|
816ceab057
|
Refactor code
|
3 years ago |
|
wenxu12345
|
ef67aa9e48
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
4623b5d5db
|
Refactor code
|
3 years ago |
|
Gordon
|
0b0173f155
|
nil return modify
|
3 years ago |
|
wenxu12345
|
4e4bab2bf0
|
Refactor code
|
3 years ago |
|
Gordon
|
cd6bb1b98f
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
03f491ab5a
|
nil return modify
|
3 years ago |
|
wenxu12345
|
5b32e0db6f
|
Refactor code
|
3 years ago |
|
wenxu12345
|
20aa2bdc6e
|
Refactor code
|
3 years ago |
|
Gordon
|
6a37072b9a
|
conversation update
|
3 years ago |
|
Gordon
|
e80c5c89e0
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
8cfc5925da
|
management modify
|
3 years ago |
|
wenxu12345
|
f4c3c86dd1
|
tidy code
|
3 years ago |
|
wenxu12345
|
c0db257e9b
|
tidy code
|
3 years ago |
|
wenxu12345
|
6b1f4e1686
|
tidy code
|
3 years ago |
|
wenxu12345
|
e439ef4ddd
|
tidy code
|
3 years ago |
|
wenxu12345
|
3d4e0a0479
|
tidy code
|
3 years ago |
|
wenxu12345
|
e64bc40ca9
|
notification
|
3 years ago |
|
wenxu12345
|
d40e1e47fd
|
notification
|
3 years ago |
|
Gordon
|
1be993801f
|
send msg file modify
|
3 years ago |
|
Gordon
|
b76aa03d3a
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
# pkg/proto/sdk_ws/ws.pb.go
|
3 years ago |
|
Gordon
|
743715fa73
|
send msg file modify
|
3 years ago |
|
Gordon
|
5f09d6a26f
|
send msg file modify
|
3 years ago |
|
wenxu12345
|
27fd4f444b
|
notification
|
3 years ago |
|
wenxu12345
|
1efe753a04
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
a8e80a44e6
|
notification
|
3 years ago |
|
Gordon
|
cf94122406
|
proto file
|
3 years ago |
|
wenxu12345
|
a5518eb492
|
OpUserID
|
3 years ago |
|
Gordon
|
6bdfc570a8
|
proto file
|
3 years ago |
