Gordon
|
d1293dd047
|
log
|
2 years ago |
|
Gordon
|
715e8a5000
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
2 years ago |
|
Gordon
|
a7a69008d8
|
log
|
2 years ago |
skiffer-git
|
553b56d094
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
2 years ago |
|
skiffer-git
|
fec57c4ed7
|
log
|
2 years ago |
|
Gordon
|
b46f106a91
|
log
|
2 years ago |
|
Gordon
|
0214419446
|
log
|
2 years ago |
|
Gordon
|
d587d14f86
|
log
|
2 years ago |
wangchuxiao
|
a115151616
|
fix bug
|
2 years ago |
|
wangchuxiao
|
26771ee7d0
|
organization
|
2 years ago |
|
Gordon
|
731263638b
|
log
|
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
|
1bcd091330
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
# Conflicts:
# pkg/proto/sdk_ws/ws.pb.go
|
2 years ago |
|
Gordon
|
536d7e2957
|
ws pb
|
2 years ago |
|
Gordon
|
55e774344a
|
ws pb
|
2 years ago |
|
Gordon
|
7d0c8b0c5f
|
super group add notification
|
2 years ago |
|
Gordon
|
88c4cff50c
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
cfe01bb820
|
super group push
|
2 years ago |
|
wangchuxiao
|
4f1bd4e509
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
Gordon
|
88544a89b7
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
a87e41eecd
|
super group push
|
2 years ago |
|
wangchuxiao
|
e52639d1d4
|
fix bug
|
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 |
|
skiffer-git
|
2b150e3c1c
|
KickUserOffline
|
2 years ago |
|
skiffer-git
|
f7c17ac7e7
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
3f2638efaf
|
KickUserOffline
|
2 years ago |
|
Gordon
|
f106664952
|
kick
|
2 years ago |
|
skiffer-git
|
afe8dcc1ff
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
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 |
|
Gordon
|
89f40fe3de
|
kick
|
2 years ago |
|
Gordon
|
f8962beca6
|
kick
|
2 years ago |
|
skiffer-git
|
dae1569f0e
|
debug userid == ""
|
2 years ago |
|
skiffer-git
|
dd76c268c5
|
debug userid == ""
|
2 years ago |
|
skiffer-git
|
52c52f23d3
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
# internal/msg_transfer/logic/online_history_msg_handler.go
|
2 years ago |
|
skiffer-git
|
3adcb9f164
|
debug userid == ""
|
2 years ago |
