wangchuxiao
|
960e3d34eb
|
dtm
|
2 years ago |
|
wangchuxiao
|
cbb127ff38
|
Merge branch 'dtm' into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
db1a043261
|
dtm
|
2 years ago |
|
wangchuxiao
|
f9eee19cbe
|
dtm
|
2 years ago |
|
wangchuxiao
|
eb1aeefc8c
|
Merge branch 'dtm' into v2.3.0release
# Conflicts:
# internal/rpc/group/group.go
|
2 years ago |
skiffer-git
|
f383d6c636
|
rename
|
2 years ago |
|
skiffer-git
|
53eebb0638
|
rename
|
2 years ago |
|
skiffer-git
|
4546e77d5b
|
rename
|
2 years ago |
|
skiffer-git
|
7d2eb31f05
|
rename
|
2 years ago |
|
skiffer-git
|
7c15a53a62
|
rename
|
2 years ago |
|
wangchuxiao
|
1531db0a35
|
departmentcache
|
2 years ago |
|
wangchuxiao
|
6d91f766e7
|
docker-compose fix
|
2 years ago |
|
wangchuxiao
|
bf5bce9e64
|
rocks cache
|
2 years ago |
|
wangchuxiao
|
5afa3380a6
|
docker-compose fix
|
2 years ago |
|
wangchuxiao
|
85f5c59781
|
docker-compose fix
|
2 years ago |
|
wangchuxiao
|
8ee4ca0357
|
docker-compose fix
|
2 years ago |
|
wangchuxiao
|
656241c23f
|
docker-compose fix
|
2 years ago |
|
skiffer-git
|
5936492f76
|
Filter out disbanded groups
|
2 years ago |
|
wangchuxiao
|
abe06b8753
|
docker-compose fix
|
2 years ago |
|
wangchuxiao
|
1b4b2b9bb1
|
docker-compose fix
|
2 years ago |
|
skiffer-git
|
ad1d759840
|
Application for joining the group: JoinSource && InviterUserID
|
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
|
a01156feb6
|
fix bug
|
2 years ago |
|
skiffer-git
|
af1d8fa834
|
fix bug
|
2 years ago |
|
skiffer-git
|
0234795200
|
fix bug
|
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
|
95630c6d61
|
group add field
|
2 years ago |
|
Gordon
|
adb7da7aaf
|
group add field
|
2 years ago |
|
Gordon
|
504e4cc6a3
|
add super delete
|
2 years ago |
|
skiffer-git
|
ec5177342e
|
Set friend remark to empty
|
2 years ago |
|
wangchuxiao
|
9e0e2fe124
|
fix bug
|
2 years ago |
|
Gordon
|
9cfbd8107e
|
add redis username
|
2 years ago |
|
Gordon
|
b70a4070f2
|
add redis username
|
2 years ago |
|
Gordon
|
d3b302ce66
|
add redis username
|
2 years ago |
|
Gordon
|
5a423f88dd
|
add redis username
|
2 years ago |
|
Gordon
|
f89c1edadf
|
add redis username
|
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
|
4035f037d2
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
Gordon
|
2b6f861f3b
|
test group file
|
2 years ago |
|
Gordon
|
9a813030a3
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
04b7dd719c
|
test group
|
2 years ago |
|
wangchuxiao
|
3ad3b30d97
|
demo
|
2 years ago |
|
wangchuxiao
|
d0e7147911
|
demo
|
2 years ago |
|
skiffer-git
|
d7ce455f2f
|
Super code can be disabled
|
2 years ago |
|
wangchuxiao
|
088f9dae9b
|
demo
|
2 years ago |
|
wangchuxiao
|
8849cd46c9
|
callback
|
2 years ago |
|
wangchuxiao
|
f51fbecfee
|
callback
|
2 years ago |
|
wangchuxiao
|
2907cac50f
|
swagger
|
2 years ago |
|
wangchuxiao
|
4eeef63724
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
# Conflicts:
# internal/api/group/group.go
|
2 years ago |
|
wangchuxiao
|
0c7f57d55d
|
swagger docs
|
2 years ago |
|
skiffer-git
|
d17d7a792a
|
fix bug
|
2 years ago |
|
skiffer-git
|
dc9f7dc294
|
fix bug
|
2 years ago |
|
skiffer-git
|
3e630a3882
|
fix bug
|
2 years ago |
|
wangchuxiao
|
20f78d214f
|
swagger
|
2 years ago |
|
wangchuxiao
|
5207e268de
|
swagger doc
|
2 years ago |
|
Gordon
|
d8717bd0b4
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
cfcc5c1095
|
test
|
2 years ago |
|
wangchuxiao
|
189a7d09a1
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
99062805ec
|
add swagger demo
|
2 years ago |
|
wenxu12345
|
87dbdc07d1
|
verification joining group chat
|
2 years ago |
|
wenxu12345
|
db7ef3ac4b
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
wenxu12345
|
5b8ef3a17c
|
verification gor joining group chat
|
2 years ago |
|
Gordon
|
ddddbf6987
|
remove old redis module
|
2 years ago |
|
Gordon
|
2f2f72fe4b
|
test
|
2 years ago |
|
Gordon
|
34fe9596a9
|
test
|
2 years ago |
|
Gordon
|
e4d35c2a86
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
af7dde61d6
|
model update
|
2 years ago |
|
wenxu12345
|
a62388759a
|
Handling token exceptions
|
2 years ago |
|
wenxu12345
|
9337d150b9
|
Handling token exceptions
|
2 years ago |
|
wenxu12345
|
910876f323
|
Handling token exceptions
|
2 years ago |
|
wenxu12345
|
af152aa9b9
|
Handling token exceptions
|
2 years ago |
|
wenxu12345
|
f34fedd822
|
Handling token exceptions
|
2 years ago |
|
wenxu12345
|
ac7c0015db
|
Handling token exceptions
|
2 years ago |
|
wenxu12345
|
1a3b5d018a
|
Handling token exceptions
|
2 years ago |
|
wenxu12345
|
d99d7ac63c
|
debug
|
2 years ago |
|
wenxu12345
|
c2686beb9b
|
debug
|
2 years ago |
|
wenxu12345
|
1bfae7627e
|
debug
|
2 years ago |
|
wenxu12345
|
06c523ea81
|
debug
|
2 years ago |
|
wenxu12345
|
7f4e21d4ba
|
debug
|
2 years ago |
|
wenxu12345
|
c993bb2f5e
|
debug
|
2 years ago |
|
wenxu12345
|
5527f7c78a
|
debug
|
2 years ago |
|
wenxu12345
|
8e9ad57173
|
debug
|
2 years ago |
|
wangchuxiao
|
b5c20f5be9
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
59a53c7c73
|
fix bug
|
2 years ago |
|
Gordon
|
b242aac7cd
|
jpush add config for ios env mode
|
2 years ago |
|
skiffer-git
|
127ad802ff
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
f42a2c9434
|
kickoff
|
2 years ago |
|
wangchuxiao
|
2e52867df4
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
c5eb8a3f9b
|
入职流程
|
2 years ago |
|
skiffer-git
|
cacde08e99
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
9443ed5d49
|
log for etcd
|
2 years ago |
|
Gordon
|
92cb2e7eab
|
config file update
|
2 years ago |
|
Gordon
|
04136d5b9d
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
fd256a6c28
|
config file update
|
2 years ago |
|
wangchuxiao
|
e64b8841c5
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
52ae2c3655
|
fix bug
|
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 |
|
wangchuxiao
|
3892883470
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
d1049b8022
|
fix bug
|
2 years ago |
|
Gordon
|
903c39206f
|
msg transfer handle change
|
2 years ago |
|
Gordon
|
29dbb36961
|
user proto modify
|
2 years ago |
|
wangchuxiao
|
20851f2a96
|
fix bug
|
2 years ago |
|
wangchuxiao
|
7bbf2b200b
|
fix bug
|
2 years ago |
|
Gordon
|
e9ac9faa49
|
user proto modify
|
2 years ago |
|
wangchuxiao
|
a15e644a51
|
fix bug
|
2 years ago |
|
Gordon
|
479679a1c6
|
user proto modify
|
2 years ago |
|
Gordon
|
a50001364f
|
user proto modify
|
2 years ago |
|
Gordon
|
57d96b85f1
|
add global recv opt
|
2 years ago |
|
wangchuxiao
|
dd4817a65a
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
b3dcff2d76
|
redis interface
|
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 |
|
wangchuxiao
|
96d3ae86cc
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
Gordon
|
7e6e214f08
|
add global recv opt
|
2 years ago |
|
Gordon
|
5e51eebe8a
|
msg handle
|
2 years ago |
|
skiffer-git
|
310997f978
|
update chat.pb
|
2 years ago |
|
wangchuxiao
|
1b1f4464ee
|
GlobalRecvMsgOpt
|
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
|
1a6a0d3592
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
0d2c0e91c8
|
use sarama v1.29.0
|
2 years ago |
|
Gordon
|
2e7e278ba4
|
redis restore
|
2 years ago |
|
Gordon
|
afa93aaf9e
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
d74bea25aa
|
redis replace to go_redis
|
2 years ago |
|
skiffer-git
|
f4f6ea681e
|
Optimization for log
|
2 years ago |
|
Gordon
|
f96e12a8b3
|
redis replace to go_redis
|
2 years ago |
|
Gordon
|
eef47017a3
|
redis replace to go_redis
|
2 years ago |
|
Gordon
|
4315d9dfbb
|
redis replace to go_redis
|
2 years ago |
|
Gordon
|
d7961bf226
|
redis replace to go_redis
|
2 years ago |
|
wangchuxiao
|
1aee41e7e7
|
go-redis
|
2 years ago |
|
wangchuxiao
|
f4cdbe985e
|
alter rtc timeout
|
2 years ago |
|
Gordon
|
d3279694b7
|
add global msg recv opt
|
2 years ago |
|
Gordon
|
8fe6231ebc
|
add global msg recv opt
|
2 years ago |
|
Gordon
|
6f0860d954
|
add global msg recv opt
|
2 years ago |
|
wangchuxiao
|
956d745034
|
alter rtc timeout
|
2 years ago |
|
Gordon
|
ccc69ac2d0
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
# Conflicts:
# pkg/proto/sdk_ws/ws.pb.go
|
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
|
cfcccd0240
|
user add global set message recv opt
|
2 years ago |
|
wangchuxiao
|
d190616d34
|
rtc
|
2 years ago |
|
wangchuxiao
|
d7884f89f5
|
rtc
|
2 years ago |
|
Gordon
|
d8ce122254
|
redis model update
|
2 years ago |
|
wangchuxiao
|
9c1ca78fed
|
rtc
|
2 years ago |
