wangchuxiao
|
00b58068dc
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
7be5208daf
|
update app
|
3 years ago |
wenxu12345
|
7ad555a41b
|
add ParseToken
|
3 years ago |
|
wenxu12345
|
872f70a418
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
c37d2e78d2
|
add ParseToken
|
3 years ago |
|
wangchuxiao
|
b606d066fc
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
d4608eec26
|
update app
|
3 years ago |
|
wenxu12345
|
2dab5e4a78
|
add ParseToken
|
3 years ago |
|
wenxu12345
|
74cea2b41c
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wangchuxiao
|
46f9a00b75
|
update app
|
3 years ago |
|
wenxu12345
|
450d8c21cf
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
2073bc77c8
|
add ParseToken
|
3 years ago |
|
wangchuxiao
|
e27b98cdc1
|
update app
|
3 years ago |
|
wangchuxiao
|
30fc4c28b7
|
cache
|
3 years ago |
Gordon
|
74b582369a
|
log change
|
3 years ago |
|
Gordon
|
c9ab2b507b
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
2b479319c1
|
log change
|
3 years ago |
|
wangchuxiao
|
3a3ac012bb
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
00265a7e8e
|
cache
|
3 years ago |
|
wenxu12345
|
6226f65e20
|
add ParseToken
|
3 years ago |
|
wenxu12345
|
7de29c29e9
|
add ParseToken
|
3 years ago |
|
wenxu12345
|
c234e2ca3d
|
log
|
3 years ago |
|
wenxu12345
|
98d5f5ee3e
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
ba16fceeb8
|
log
|
3 years ago |
|
Gordon
|
c49b5f78bf
|
test
|
3 years ago |
|
Gordon
|
e2cacd9c4b
|
test
|
3 years ago |
|
skiffer-git
|
a251d521a1
|
set api ip in config
|
3 years ago |
|
skiffer-git
|
dca16e83d3
|
rpc register ip
|
3 years ago |
|
skiffer-git
|
e122349f9e
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
bb07c3ab45
|
add err log
|
3 years ago |
|
wangchuxiao
|
bbc3f5c19a
|
cache
|
3 years ago |
|
skiffer-git
|
a9ce8a3b2e
|
upgrade etcd & grpc
|
3 years ago |
|
wangchuxiao
|
7914e7bc14
|
office
|
3 years ago |
|
wangchuxiao
|
ed8716510b
|
office
|
3 years ago |
|
wangchuxiao
|
efd2ae59f5
|
office
|
3 years ago |
|
wangchuxiao
|
1923d0b809
|
office
|
3 years ago |
|
wangchuxiao
|
99f6752590
|
office
|
3 years ago |
|
wangchuxiao
|
131746f94e
|
office
|
3 years ago |
|
wangchuxiao
|
f0ed6973c8
|
office
|
3 years ago |
|
wangchuxiao
|
2cf070a26c
|
office
|
3 years ago |
|
wangchuxiao
|
3c68ecb7f1
|
office
|
3 years ago |
|
wangchuxiao
|
e26f9c58fa
|
office
|
3 years ago |
|
wangchuxiao
|
3a06617a7d
|
office
|
3 years ago |
|
wangchuxiao
|
d75eb456dc
|
office
|
3 years ago |
|
skiffer-git
|
185e0dce6e
|
delete msg by index
|
3 years ago |
|
skiffer-git
|
d9e74a78f0
|
delete msg by index
|
3 years ago |
|
wangchuxiao
|
f1dbec122a
|
cache
|
3 years ago |
|
wangchuxiao
|
47cb54461f
|
cache
|
3 years ago |
|
wangchuxiao
|
91e03f7cfd
|
cache
|
3 years ago |
|
wenxu12345
|
8e17b3ff51
|
Revert "update etcd to v3.5.2 (#206)"
This reverts commit 766b6e9f
|
3 years ago |
|
wenxu12345
|
b932a659b6
|
etcd
|
3 years ago |
|
wenxu12345
|
80b2ed19e0
|
etcd
|
3 years ago |
|
wenxu12345
|
88000926f4
|
etcd
|
3 years ago |
|
wenxu12345
|
12245fefed
|
etcd
|
3 years ago |
|
wenxu12345
|
c5b0e31d36
|
config
|
3 years ago |
|
wenxu12345
|
e68086e149
|
config
|
3 years ago |
|
wenxu12345
|
16a2d80801
|
config
|
3 years ago |
|
wenxu12345
|
d5e5659a2c
|
config
|
3 years ago |
|
wenxu12345
|
3c2e8dcf87
|
config
|
3 years ago |
|
Gordon
|
bcbade3729
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
bf154eb8c3
|
Merge branch 'main' into tuoyun
# Conflicts:
# script/sdk_svr_start.sh
|
3 years ago |
yiippee
|
766b6e9fef
|
update etcd to v3.5.2 (#206)
Co-authored-by: lizhanbin <lizhanbin@52tt.com>
|
3 years ago |
|
wangchuxiao
|
d24a7d7b22
|
cache & workMoments
|
3 years ago |
|
wangchuxiao
|
88d4a670d4
|
cache
|
3 years ago |
|
wangchuxiao
|
ea0b6c5ee5
|
cache
|
3 years ago |
|
wangchuxiao
|
20f61042fc
|
cache
|
3 years ago |
|
wangchuxiao
|
93057870a7
|
cache
|
3 years ago |
|
wangchuxiao
|
b72787f5bb
|
cache
|
3 years ago |
|
wangchuxiao
|
0793b2ab38
|
cache
|
3 years ago |
|
wangchuxiao
|
604ed3e3e1
|
cache
|
3 years ago |
|
wangchuxiao
|
65f02e5139
|
cache
|
3 years ago |
|
wangchuxiao
|
59468eb162
|
fix work moments bug
|
3 years ago |
|
wangchuxiao
|
17f6b8eb2a
|
work moments
|
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
|
bd7266653f
|
cache rpc
|
3 years ago |
|
wangchuxiao
|
08f968dced
|
cache rpc
|
3 years ago |
|
wangchuxiao
|
9f9ebd838a
|
cache rpc
|
3 years ago |
|
wangchuxiao
|
a03f89fb68
|
cache rpc
|
3 years ago |
|
Gordon
|
9a9f26c435
|
conversation update
|
3 years ago |
|
Gordon
|
eebe9cbd5f
|
conversation update
|
3 years ago |
|
Gordon
|
b3077fc15d
|
conversation update
|
3 years ago |
|
wangchuxiao
|
bccaf16343
|
work_moments
|
3 years ago |
|
wangchuxiao
|
30df45ef2e
|
work_moments
|
3 years ago |
|
wangchuxiao
|
6500ba48a7
|
work_moments
|
3 years ago |
|
wangchuxiao
|
03b35721a2
|
work_moments
|
3 years ago |
|
wangchuxiao
|
1b968903e2
|
work_moments
|
3 years ago |
|
wangchuxiao
|
010f24e5c3
|
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
|
3247d84b6b
|
add modify conversation api
|
3 years ago |
|
Gordon
|
e73f0a916a
|
add modify conversation api
|
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 |
|
wangchuxiao
|
f779ed7628
|
workMoments
|
3 years ago |
|
wangchuxiao
|
f2fdb74f23
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
4ba87e3349
|
workMoments
|
3 years ago |
|
Gordon
|
159a9e00c8
|
conversation update
|
3 years ago |
|
Gordon
|
17d8a124cd
|
kick group invite group update
|
3 years ago |
|
Gordon
|
67010e20d7
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
704604f6fe
|
kick group invite group update
|
3 years ago |
|
wangchuxiao
|
ff85575e98
|
workMoments
|
3 years ago |
|
wangchuxiao
|
5eef365baf
|
workMoments
|
3 years ago |
|
wangchuxiao
|
937ff63af9
|
workMoments
|
3 years ago |
|
wangchuxiao
|
33211bfb27
|
workMoments
|
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 |
|
skiffer-git
|
2bdaaa5a33
|
log
|
3 years ago |
|
Gordon
|
b865f5d6e7
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
00664822ec
|
conversation add fields
|
3 years ago |
|
skiffer-git
|
4594c15de7
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
2b6ec1672c
|
Organization
|
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
|
030d619910
|
Organization
|
3 years ago |
|
skiffer-git
|
51c3a753a9
|
Organization
|
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
|
3e5d9a394f
|
workMoments
|
3 years ago |
|
wangchuxiao
|
3f287eb148
|
workMoments
|
3 years ago |
|
wangchuxiao
|
dfe854a236
|
workMoments
|
3 years ago |
|
wangchuxiao
|
01c066419d
|
workMoments
|
3 years ago |
|
wangchuxiao
|
040b1d9bc8
|
workMoments
|
3 years ago |
|
wangchuxiao
|
b5c11ece57
|
workMoments
|
3 years ago |
|
wangchuxiao
|
50696d2e88
|
workMoments
|
3 years ago |
|
wangchuxiao
|
e7661fd4be
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
957e11eff0
|
workMoments
|
3 years ago |
|
skiffer-git
|
97fd107f47
|
add operationID when ws connecting
|
3 years ago |
|
skiffer-git
|
fc688dca99
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
fe3bd2a1f1
|
add operationID when ws connecting
|
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
|
ad1770ec95
|
organization
|
3 years ago |
|
skiffer-git
|
c11094a11e
|
organization
|
3 years ago |
|
skiffer-git
|
f6b30ed0c6
|
organization
|
3 years ago |
|
skiffer-git
|
248de7f1f2
|
set groupmember nickname
|
3 years ago |
|
skiffer-git
|
3bbf84861e
|
organization
|
3 years ago |
|
skiffer-git
|
803d0c2ae2
|
organization
|
3 years ago |
|
skiffer-git
|
06e44cc649
|
organization
|
3 years ago |
|
skiffer-git
|
ecc47dcfbb
|
organization
|
3 years ago |
|
skiffer-git
|
b6e06dfdc2
|
organization
|
3 years ago |
|
skiffer-git
|
80ba371296
|
organization
|
3 years ago |
|
skiffer-git
|
6787563efe
|
organization
|
3 years ago |
|
skiffer-git
|
9def85f9ba
|
organization
|
3 years ago |
|
skiffer-git
|
6184eaa30e
|
organization
|
3 years ago |
|
skiffer-git
|
bbcb3e9403
|
organization
|
3 years ago |
|
skiffer-git
|
3d690b7c72
|
organization
|
3 years ago |
|
skiffer-git
|
b4ab2c69ae
|
organization
|
3 years ago |
|
skiffer-git
|
9e18bcaeb8
|
organization
|
3 years ago |
|
skiffer-git
|
af5ee45206
|
organization
|
3 years ago |
|
skiffer-git
|
42af55a740
|
organization
|
3 years ago |
|
skiffer-git
|
3c1e6d0e5c
|
organization
|
3 years ago |
|
skiffer-git
|
edf7df368e
|
organization
|
3 years ago |
|
skiffer-git
|
cde38e012f
|
organization
|
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
|
27cba5ba31
|
getui
|
3 years ago |
|
wangchuxiao
|
9976b8132f
|
getui
|
3 years ago |
|
wangchuxiao
|
dbc5bd96f3
|
getui
|
3 years ago |
|
wangchuxiao
|
9489ab862b
|
getui
|
3 years ago |
|
wangchuxiao
|
1bb634bc6f
|
merge code
|
3 years ago |
|
wangchuxiao
|
07b5c7fef4
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
4a7cfab543
|
getui
|
3 years ago |
|
Gordon
|
4f8fcd2d3d
|
push update
|
3 years ago |
|
wangchuxiao
|
d670356388
|
getui
|
3 years ago |
|
skiffer-git
|
659c3bc1cf
|
add department db
|
3 years ago |
|
skiffer-git
|
f5684f2c45
|
add department db
|
3 years ago |
|
skiffer-git
|
bc06ba54b9
|
organization && department
|
3 years ago |
|
wangchuxiao
|
4a8d37bde1
|
getui
|
3 years ago |
|
wangchuxiao
|
4264cd8830
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
edcc215774
|
getui
|
3 years ago |
|
skiffer-git
|
3085fffb49
|
add department db
|
3 years ago |
|
Gordon
|
2a0f8f5ce3
|
note
|
3 years ago |
|
wangchuxiao
|
06370a763c
|
getui
|
3 years ago |
|
wangchuxiao
|
cbe3abeab0
|
getui
|
3 years ago |
|
wangchuxiao
|
3d5e3ce6cf
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
# internal/rpc/msg/tag_send_msg.go
|
3 years ago |
|
wangchuxiao
|
4efdabc1ff
|
getui
|
3 years ago |
|
wenxu12345
|
42225dd35e
|
log
|
3 years ago |
|
Gordon
|
59cc45eaab
|
replace log
|
3 years ago |
|
wenxu12345
|
0232f52281
|
log
|
3 years ago |
|
wenxu12345
|
6efe13d142
|
log
|
3 years ago |
|
wangchuxiao
|
146aa497f9
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
26f8172b1a
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
f4921d1317
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
b82ff7b88d
|
tips info
|
3 years ago |
|
wangchuxiao
|
0e27b302bc
|
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
|
929c5e7a5b
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
d600042110
|
tag and set private tips
|
3 years ago |
|
Gordon
|
0a58e7433e
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
5639c985df
|
OA tag fields modify
|
3 years ago |
|
wenxu12345
|
9fbfbfb23b
|
Merge log files
|
3 years ago |
|
wenxu12345
|
ecd2f0e2bf
|
Merge log files
|
3 years ago |
|
Gordon
|
60418276bd
|
oa notification add
|
3 years ago |
|
Gordon
|
6744745152
|
token add operationID
|
3 years ago |
|
skiffer-git
|
009ae6a235
|
mute group
|
3 years ago |
|
skiffer-git
|
bf5f72c00b
|
mute group
|
3 years ago |
|
skiffer-git
|
84aca5b9e1
|
mute group
|
3 years ago |
|
wangchuxiao
|
29a268d476
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
18d7aab703
|
tag
|
3 years ago |
|
skiffer-git
|
373e6b6c8e
|
mute group
|
3 years ago |
|
Gordon
|
e8517e954d
|
group add
|
3 years ago |
|
Gordon
|
bc260fffde
|
group add
|
3 years ago |
|
Gordon
|
acca147ff2
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
d53da0e422
|
group add
|
3 years ago |
|
wangchuxiao
|
1bd8154ac4
|
tag
|
3 years ago |
|
wangchuxiao
|
d2fa0e7852
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
f2b324abc2
|
tag
|
3 years ago |
|
skiffer-git
|
d2225dd841
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
8d26aa86b9
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wangchuxiao
|
7e937d7d29
|
tag
|
3 years ago |
|
skiffer-git
|
fe4b534b78
|
mute group
|
3 years ago |
|
wangchuxiao
|
d0a65c7c68
|
tag
|
3 years ago |
|
wangchuxiao
|
416f87f4bb
|
tag
|
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
|
1aeff25316
|
mute group
|
3 years ago |
|
skiffer-git
|
6de569537f
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
764bc3fead
|
mute group
|
3 years ago |
|
Gordon
|
c5828aba91
|
Merge branch 'tuoyun'
# Conflicts:
# cmd/open_im_api/main.go
# config/config.yaml
# go.sum
# pkg/common/config/config.go
# pkg/common/db/model.go
|
3 years ago |
|
skiffer-git
|
1286f9dcb6
|
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
|
0797181967
|
tag
|
3 years ago |
|
wangchuxiao
|
14c5e631ff
|
tag
|
3 years ago |
|
wangchuxiao
|
5cdb039c33
|
tag
|
3 years ago |
|
wangchuxiao
|
a11c4fcb58
|
tag
|
3 years ago |
|
wangchuxiao
|
e95400988e
|
tag
|
3 years ago |
|
wangchuxiao
|
d92ac8f588
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
169665da32
|
tag
|
3 years ago |
|
Gordon
|
c4d80b4844
|
auto migrate test
|
3 years ago |
|
Gordon
|
7827749453
|
tag notification
|
3 years ago |
|
wangchuxiao
|
e9ea117985
|
tag
|
3 years ago |
|
wangchuxiao
|
b9ddb0140f
|
tag
|
3 years ago |
