wangchuxiao
|
8ee4ca0357
|
docker-compose fix
|
2 years ago |
skiffer-git
|
5936492f76
|
Filter out disbanded groups
|
2 years ago |
|
skiffer-git
|
ad1d759840
|
Application for joining the group: JoinSource && InviterUserID
|
2 years ago |
|
skiffer-git
|
a55134ae63
|
fix bug: two group owners
|
2 years ago |
|
wangchuxiao
|
67b20d073e
|
docker-compose fix
|
2 years ago |
|
wangchuxiao
|
8a8fce927e
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
# pkg/common/db/mysql_model/im_mysql_model/group_model.go
|
2 years ago |
|
skiffer-git
|
2b2ecad437
|
fix bug
|
2 years ago |
|
wangchuxiao
|
89406f1c57
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
# pkg/common/db/mysql_model/im_mysql_model/group_model.go
|
2 years ago |
|
wangchuxiao
|
ea93e97e79
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
# pkg/common/db/mysql_model/im_mysql_model/group_model.go
|
2 years ago |
|
wangchuxiao
|
1e6a93b4b6
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
# internal/rpc/group/group.go
# internal/rpc/user/user.go
# pkg/common/db/mysql_model/im_mysql_model/group_model.go
|
2 years ago |
|
skiffer-git
|
8ad22f8148
|
fix bug
|
2 years ago |
|
wangchuxiao
|
b064244907
|
rocks cache
|
2 years ago |
|
skiffer-git
|
58f4ebe411
|
Limit the number of members invited to join the group
|
2 years ago |
|
skiffer-git
|
d4e575f777
|
Show group notification editor
|
2 years ago |
|
skiffer-git
|
2d110deb09
|
Show group notification editor
|
2 years ago |
|
skiffer-git
|
fb4cef7ccb
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
3b6b88fd62
|
Source of joining the group
|
2 years ago |
Gordon
|
33222d59c2
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
adb7da7aaf
|
group add field
|
2 years ago |
|
skiffer-git
|
58847c7fb6
|
Update group member nickname when personal nickname is updated
|
2 years ago |
|
Gordon
|
1aa106ba4a
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
c638072902
|
super group add
|
2 years ago |
|
wangchuxiao
|
7ffe857f52
|
fix bug
|
2 years ago |
|
Gordon
|
f2b0f54c0b
|
test
|
2 years ago |
|
Gordon
|
a1025d8eee
|
test
|
2 years ago |
|
Gordon
|
b8cd9484dc
|
test
|
2 years ago |
|
Gordon
|
1650165f4b
|
group add verify
|
2 years ago |
|
wangchuxiao
|
f51fbecfee
|
callback
|
2 years ago |
|
skiffer-git
|
26bd3bf76d
|
fix bug
|
2 years ago |
|
skiffer-git
|
d17d7a792a
|
fix bug
|
2 years ago |
|
skiffer-git
|
722b5d0726
|
debug
|
2 years ago |
|
wenxu12345
|
5b8ef3a17c
|
verification gor joining group chat
|
2 years ago |
|
wenxu12345
|
2f5d8dfb80
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
wenxu12345
|
218340e138
|
Rpc Register IP
|
2 years ago |
|
wangchuxiao
|
6b78b75638
|
fix bug
|
2 years ago |
|
wenxu12345
|
49797ce6ab
|
super group notification
|
2 years ago |
|
wangchuxiao
|
b80f510de5
|
quit superGroup add notification
|
2 years ago |
|
wangchuxiao
|
007065b40e
|
入职流程
|
2 years ago |
|
wangchuxiao
|
c5eb8a3f9b
|
入职流程
|
2 years ago |
|
skiffer-git
|
f1b5f56294
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
ed3b62480c
|
log for etcd
|
2 years ago |
|
Gordon
|
29dbb36961
|
user proto modify
|
2 years ago |
|
wangchuxiao
|
20851f2a96
|
fix bug
|
2 years ago |
|
wangchuxiao
|
7ea7dffd4a
|
fix bug
|
2 years ago |
|
wangchuxiao
|
4e11c7a9e2
|
fix bug
|
2 years ago |
|
skiffer-git
|
3f455199eb
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
24f2ffe82d
|
Handling exception: getcdv3.GetConn == nil
|
2 years ago |
|
wangchuxiao
|
86c5d694e5
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
8c963c669b
|
redis interface
|
2 years ago |
|
skiffer-git
|
d058cacb38
|
Handling exception: getcdv3.GetConn == nil
|
2 years ago |
|
skiffer-git
|
98821c95b6
|
Handling exception: getcdv3.GetConn == nil
|
2 years ago |
|
skiffer-git
|
89aef130a5
|
Handling exception: getcdv3.GetConn == nil
|
2 years ago |
|
skiffer-git
|
90442e3e39
|
Handling exception: getcdv3.GetConn == nil
|
2 years ago |
|
skiffer-git
|
02c594d4ec
|
Handling exception: getcdv3.GetConn == nil
|
2 years ago |
|
skiffer-git
|
8c82f811cb
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
# Conflicts:
# internal/rpc/user/user.go
|
2 years ago |
|
skiffer-git
|
dbc2713495
|
Handling exception: getcdv3.GetConn == nil
|
2 years ago |
|
Gordon
|
0a44a8e78a
|
add global recv opt
|
2 years ago |
|
Gordon
|
7e6e214f08
|
add global recv opt
|
2 years ago |
|
wangchuxiao
|
f9a26e9195
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
ea76f20825
|
GlobalRecvMsgOpt
|
2 years ago |
|
skiffer-git
|
0d2c0e91c8
|
use sarama v1.29.0
|
2 years ago |
|
skiffer-git
|
f4f6ea681e
|
Optimization for log
|
2 years ago |
|
Gordon
|
f96e12a8b3
|
redis replace to go_redis
|
2 years ago |
|
wangchuxiao
|
7dbc8a4253
|
go-redis
|
2 years ago |
|
wangchuxiao
|
16641f0494
|
alter rtc timeout
|
2 years ago |
|
wangchuxiao
|
5965dcd029
|
alter rtc timeout
|
2 years ago |
|
wangchuxiao
|
e45ef5c49a
|
alter rtc timeout
|
2 years ago |
|
wangchuxiao
|
9eed6ce197
|
alter rtc timeout
|
2 years ago |
|
Gordon
|
1e62ddce73
|
super update
|
2 years ago |
|
wangchuxiao
|
a0581618a4
|
Merge branch 'tuoyun' into superGroup
# Conflicts:
# config/config.yaml
# internal/msg_gateway/gate/logic.go
# internal/msg_gateway/gate/ws_server.go
# internal/push/logic/push_to_client.go
# internal/rpc/group/group.go
# internal/rpc/msg/send_msg.go
# pkg/common/config/config.go
# pkg/proto/sdk_ws/ws.pb.go
|
2 years ago |
|
Gordon
|
38ded2c43d
|
send message remove online status split
|
2 years ago |
|
skiffer-git
|
4bc9da3910
|
set groupID
|
2 years ago |
|
Gordon
|
7c90baf7bf
|
remove online offline split
|
2 years ago |
|
skiffer-git
|
202811f3c6
|
groupID digitization
|
2 years ago |
|
wangchuxiao
|
2b596e226a
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
2 years ago |
|
skiffer-git
|
11e619d1b3
|
log
|
2 years ago |
|
skiffer-git
|
32565dd188
|
config for msg read receipt
|
2 years ago |
|
skiffer-git
|
96f09c45f5
|
batch push
|
2 years ago |
|
skiffer-git
|
d2474c8a72
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
9eb0dd5e70
|
batch push
|
2 years ago |
|
wangchuxiao
|
6525d63459
|
fix bug
|
2 years ago |
|
wangchuxiao
|
bd14739a9e
|
fix bug
|
2 years ago |
|
wangchuxiao
|
a115151616
|
fix bug
|
2 years ago |
|
wangchuxiao
|
26771ee7d0
|
organization
|
2 years ago |
|
wangchuxiao
|
a4f69351ce
|
fix bug
|
2 years ago |
|
wangchuxiao
|
fa5f234a38
|
fix bug
|
2 years ago |
|
wangchuxiao
|
5d2c981368
|
fix bug
|
2 years ago |
|
wangchuxiao
|
4a55842724
|
fix bug
|
2 years ago |
|
wangchuxiao
|
e9655ed05e
|
fix bug
|
2 years ago |
|
wangchuxiao
|
ed7d2bbdd7
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
276328e0fd
|
fix bug
|
2 years ago |
|
Gordon
|
7d0c8b0c5f
|
super group add notification
|
2 years ago |
|
skiffer-git
|
0463f5e83d
|
fix bug
|
2 years ago |
|
skiffer-git
|
eb90314b38
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
6ce1d60ebb
|
log
|
2 years ago |
|
wangchuxiao
|
5fa62c9fbd
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
Gordon
|
ef93a1f42e
|
add conversation sync
|
2 years ago |
|
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
|
269df23851
|
set group memberInfo
|
2 years ago |
|
wangchuxiao
|
c40dc64bd0
|
set group memberInfo
|
2 years ago |
|
wangchuxiao
|
8f1e439381
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
2 years ago |
|
skiffer-git
|
4418d031e1
|
log
|
2 years ago |
|
wangchuxiao
|
f3fc452904
|
group set memberInfo
|
2 years ago |
|
skiffer-git
|
dae1569f0e
|
debug userid == ""
|
2 years ago |
|
skiffer-git
|
dd76c268c5
|
debug userid == ""
|
2 years ago |
|
skiffer-git
|
3adcb9f164
|
debug userid == ""
|
2 years ago |
|
skiffer-git
|
eac137a9a9
|
ForceLogout
|
2 years ago |
|
skiffer-git
|
290ae774e0
|
ForceLogout
|
2 years ago |
|
skiffer-git
|
3639f943bf
|
group administrator access
|
2 years ago |
|
skiffer-git
|
d373369649
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
9106e70b37
|
group administrator access
|
2 years ago |
|
Gordon
|
4678189ed4
|
pb file
|
2 years ago |
|
skiffer-git
|
064b650fac
|
group administrator access
|
2 years ago |
|
skiffer-git
|
797e2fea1e
|
group info set
|
2 years ago |
|
wangchuxiao
|
16d33b1c1f
|
singal offline push
|
2 years ago |
|
Gordon
|
a18dcfce9e
|
ws and push update
|
2 years ago |
|
wenxu12345
|
da1df91f49
|
Clear msg
|
3 years ago |
|
wenxu12345
|
b2df6e6d41
|
Clear msg
|
3 years ago |
|
wenxu12345
|
2b4df5be16
|
Clear personal chat history
|
3 years ago |
|
wangchuxiao
|
f98da25fda
|
organization
|
3 years ago |
|
wangchuxiao
|
cf094a2048
|
superGroup
|
3 years ago |
|
wangchuxiao
|
653c0faa18
|
superGroup
|
3 years ago |
|
wangchuxiao
|
110f5e02f4
|
superGroup
|
3 years ago |
|
wangchuxiao
|
ecf0a4f299
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
3 years ago |
|
wangchuxiao
|
d3fe5cdf34
|
superGroup
|
3 years ago |
|
Gordon
|
bda1b0a304
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
3 years ago |
|
Gordon
|
839f3e52ef
|
pull message update
|
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 |
|
wangchuxiao
|
c0a3bdcf99
|
k8s
|
3 years ago |
|
Gordon
|
7285e2b2c9
|
add super group
|
3 years ago |
|
wangchuxiao
|
8cdcd7105a
|
superGroup
|
3 years ago |
|
wangchuxiao
|
cc6d8d28b5
|
superGroup
|
3 years ago |
|
wangchuxiao
|
b55e13dbeb
|
superGroup
|
3 years ago |
|
wangchuxiao
|
bbe8c46df9
|
callback
|
3 years ago |
|
wangchuxiao
|
884b410dce
|
callback
|
3 years ago |
|
wangchuxiao
|
e5945fa720
|
callback
|
3 years ago |
|
wangchuxiao
|
b155a9908b
|
callback
|
3 years ago |
|
wangchuxiao
|
d67e4a3491
|
callback
|
3 years ago |
|
wangchuxiao
|
f5befcc95f
|
callback
|
3 years ago |
|
wangchuxiao
|
b4da35a0ab
|
ingress
|
3 years ago |
|
wangchuxiao
|
d8c0a82411
|
ingress
|
3 years ago |
|
wangchuxiao
|
5957e4b264
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
# internal/rpc/msg/rpcChat.go
|
3 years ago |
|
wangchuxiao
|
4d8708a5ee
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
# internal/rpc/msg/rpcChat.go
|
3 years ago |
|
wangchuxiao
|
9eb1870196
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
# internal/rpc/msg/rpcChat.go
|
3 years ago |
|
wangchuxiao
|
841566a5d1
|
del msg
|
3 years ago |
|
wangchuxiao
|
6022aff965
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
18eaae80ec
|
del msg
|
3 years ago |
|
Gordon
|
a4e41462c7
|
message update
|
3 years ago |
|
wangchuxiao
|
f33937bc5d
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
