skiffer-git
|
6184eaa30e
|
organization
|
3 years ago |
|
skiffer-git
|
a42b72e9ce
|
organization
|
3 years ago |
|
skiffer-git
|
f4dcae722c
|
organization
|
3 years ago |
|
skiffer-git
|
bbcb3e9403
|
organization
|
3 years ago |
|
skiffer-git
|
b4ab2c69ae
|
organization
|
3 years ago |
|
skiffer-git
|
4a7f406edb
|
organization
|
3 years ago |
|
skiffer-git
|
9abfe233bc
|
organization
|
3 years ago |
|
skiffer-git
|
3267958541
|
organization
|
3 years ago |
|
skiffer-git
|
af5ee45206
|
organization
|
3 years ago |
|
skiffer-git
|
300b72b9b8
|
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
|
9976b8132f
|
getui
|
3 years ago |
|
wangchuxiao
|
dbc5bd96f3
|
getui
|
3 years ago |
|
wangchuxiao
|
9489ab862b
|
getui
|
3 years ago |
|
wangchuxiao
|
1bb634bc6f
|
merge code
|
3 years ago |
Gordon
|
426ef5cb88
|
push update
|
3 years ago |
|
Gordon
|
5b86412407
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
4f8fcd2d3d
|
push update
|
3 years ago |
|
wangchuxiao
|
16c40aa51c
|
getui
|
3 years ago |
|
Gordon
|
6449c4a53d
|
push update
|
3 years ago |
|
wangchuxiao
|
fb4c8549dc
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
42dc5c1f0f
|
getui
|
3 years ago |
|
skiffer-git
|
1d2d2b1c9c
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
bc06ba54b9
|
organization && department
|
3 years ago |
|
wangchuxiao
|
9e4a2168c0
|
getui
|
3 years ago |
|
wangchuxiao
|
4d01aa3006
|
getui
|
3 years ago |
|
wangchuxiao
|
2c308af615
|
getui
|
3 years ago |
|
wangchuxiao
|
caf4ab60cd
|
minio add inner ip
|
3 years ago |
|
wangchuxiao
|
4a8d37bde1
|
getui
|
3 years ago |
|
wangchuxiao
|
13473eeb4d
|
getui
|
3 years ago |
|
wangchuxiao
|
edcc215774
|
getui
|
3 years ago |
|
wangchuxiao
|
81a6e4b46c
|
getui
|
3 years ago |
|
wangchuxiao
|
e0d612c92f
|
getui
|
3 years ago |
|
wangchuxiao
|
fadbb91287
|
getui
|
3 years ago |
|
wangchuxiao
|
72146c08ae
|
getui
|
3 years ago |
|
wangchuxiao
|
a879bbce59
|
getui
|
3 years ago |
|
wangchuxiao
|
f11f8b3e0e
|
getui
|
3 years ago |
|
wangchuxiao
|
4ae3ad7abd
|
getui
|
3 years ago |
|
wangchuxiao
|
a16025ca95
|
getui
|
3 years ago |
|
wangchuxiao
|
fdefe09187
|
getui
|
3 years ago |
|
wangchuxiao
|
691e2580e5
|
getui
|
3 years ago |
|
wangchuxiao
|
f40369d061
|
getui
|
3 years ago |
|
wangchuxiao
|
046c523880
|
getui
|
3 years ago |
|
wangchuxiao
|
b3b7ae26cf
|
getui
|
3 years ago |
|
wangchuxiao
|
49424b8b56
|
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 |
|
Gordon
|
69aba02c9a
|
send tag modify
|
3 years ago |
|
Gordon
|
f64c40e91f
|
tag msg
|
3 years ago |
|
wenxu12345
|
b0c518a0d6
|
log
|
3 years ago |
|
wenxu12345
|
aa673a3a5c
|
log
|
3 years ago |
|
wenxu12345
|
40d58f6bc2
|
log
|
3 years ago |
|
wenxu12345
|
7604b24ffc
|
log
|
3 years ago |
|
wenxu12345
|
a47c0c91a3
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
0232f52281
|
log
|
3 years ago |
|
Gordon
|
577a9249d1
|
test
|
3 years ago |
|
Gordon
|
f58c94146a
|
test
|
3 years ago |
|
wangchuxiao
|
6ba51fb338
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
e7bc82d152
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
26f8172b1a
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
634584400a
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
7d6be79ba8
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
cef208f6ef
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
f4921d1317
|
tag and set private tips
|
3 years ago |
|
Gordon
|
7f1a74b576
|
panic fix
|
3 years ago |
|
wangchuxiao
|
2b03b57b5c
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
77c6120014
|
null to empty slice
|
3 years ago |
|
wangchuxiao
|
a16a75230c
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
c369ab9b1c
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
bb267ccae7
|
tag and set private tips
|
3 years ago |
|
Gordon
|
efe24658a4
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
5cdf9e7551
|
OA tag fields modify
|
3 years ago |
|
wangchuxiao
|
4390302384
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
dab00e7fb2
|
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
|
170392f0bc
|
oa notification add
|
3 years ago |
|
Gordon
|
6744745152
|
token add operationID
|
3 years ago |
|
skiffer-git
|
bf5f72c00b
|
mute group
|
3 years ago |
|
skiffer-git
|
6164266870
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
cc9df9c586
|
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
|
de55c14a16
|
mute group
|
3 years ago |
|
skiffer-git
|
85cf7f26ce
|
mute group
|
3 years ago |
|
skiffer-git
|
11eaaab72d
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
475e64fc5b
|
mute group
|
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 |
|
skiffer-git
|
1aeff25316
|
mute group
|
3 years ago |
|
Gordon
|
fef33795d0
|
group add
|
3 years ago |
|
Gordon
|
d2c04b761d
|
ali cloud oss
|
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 |
|
wangchuxiao
|
a11c4fcb58
|
tag
|
3 years ago |
|
wangchuxiao
|
c67a937d40
|
tag
|
3 years ago |
|
wangchuxiao
|
03fa7137b9
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
e95400988e
|
tag
|
3 years ago |
|
Gordon
|
942c9c6a63
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
6c45665fde
|
add tag message conversation update
|
3 years ago |
|
wangchuxiao
|
169665da32
|
tag
|
3 years ago |
|
wangchuxiao
|
5e78697a69
|
tag
|
3 years ago |
|
wangchuxiao
|
a0e6a78496
|
tag
|
3 years ago |
|
wangchuxiao
|
af99a93536
|
tag
|
3 years ago |
|
Gordon
|
679c913f3a
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
03fb7947c3
|
add oa notification
|
3 years ago |
|
wangchuxiao
|
c39f5a27b2
|
tag
|
3 years ago |
|
wangchuxiao
|
dbdb516f3c
|
tag
|
3 years ago |
|
wangchuxiao
|
574c7600e0
|
tag
|
3 years ago |
|
wangchuxiao
|
13c29d2c1e
|
tag
|
3 years ago |
|
wangchuxiao
|
dc1a0f050e
|
tag
|
3 years ago |
|
wangchuxiao
|
9d619d520d
|
tag
|
3 years ago |
|
wangchuxiao
|
46605479e9
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into office_tag
|
3 years ago |
|
wangchuxiao
|
6d20eddd43
|
mongo
|
3 years ago |
|
skiffer-git
|
9d29d49ada
|
group dismissed
|
3 years ago |
|
wangchuxiao
|
e7b95892ff
|
minio upload api
|
3 years ago |
|
wangchuxiao
|
df4a75f4b0
|
mongo
|
3 years ago |
|
wangchuxiao
|
4bdb4cbbb5
|
mongo
|
3 years ago |
|
wangchuxiao
|
4cdcdee8e4
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
e6c36411cb
|
mongo
|
3 years ago |
|
Gordon
|
b5de638c0b
|
ws remove log
|
3 years ago |
|
Gordon
|
1d09ffa529
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
eef9d15aaa
|
ws remove log
|
3 years ago |
|
wangchuxiao
|
8034ddc413
|
mongo
|
3 years ago |
|
wangchuxiao
|
e75adb165a
|
mongo
|
3 years ago |
|
wangchuxiao
|
09ce0d5285
|
mongo
|
3 years ago |
|
wangchuxiao
|
cc1ad41e94
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
8a38646bc5
|
mongo
|
3 years ago |
|
Gordon
|
a2b65f52f6
|
fix group create bug
|
3 years ago |
jaonzyx
|
c16d8da784
|
管理员创建群组bug fix (#168)
|
3 years ago |
goubo
|
a55582a018
|
方便测试导入数据 (#148)
|
3 years ago |
|
Gordon
|
ea6d472002
|
pr modify and update
|
3 years ago |
|
Gordon
|
3dc4290f2a
|
pr modify and update
|
3 years ago |
hxnets
|
6c43f75f9f
|
新增阿里云OSS文件上传参数获取接口 (#115)
* configure update
* mongo:4.0
* open-im-server -> open_im_server
* sleep 15
* 0.0.0.0
* sleep 10 15
* Update config.yaml
* config
* Update docker-compose.yaml
* Update config.yaml
* Create ISSUE_TEMPLATE.md
* Update ISSUE_TEMPLATE.md
* Create ISSUE_TEMPLATE
* add issue template
* add issue template
* add issue template
* add issue template
* Update README.md
* script
* script
* script
* config
* script
* config update
* script update
* image: openim/open_im_server:v1.0.6
* script
* script
* script
* version update
* sender message sync
* version update
* 阿里云oss sts上传参数
* 阿里云oss sts上传参数
Co-authored-by: wenxu12345 <44203734@qq.com>
Co-authored-by: skiffer-git <72860476+skiffer-git@users.noreply.github.com>
Co-authored-by: Gordon <1432970085@qq.com>
Co-authored-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
|
3 years ago |
马守越
|
1ab3e04cba
|
新增mongo.dbUrl配置 (#174)
* 当dbUri值不为空则直接使用该值
* 新增支持ali oss
Co-authored-by: mashouyue's m1max <mashouyue@toowow.cn>
|
3 years ago |
|
Gordon
|
25adfe5b28
|
check shell update
|
3 years ago |
|
Gordon
|
6b3d984ca6
|
log update
|
3 years ago |
|
Gordon
|
da5bfe32af
|
log update
|
3 years ago |
|
wenxu12345
|
1b457b0be6
|
fix bug : etcd Put failed etcdserver: requested lease not found
|
3 years ago |
|
wangchuxiao
|
366f7621fa
|
rtc add
|
3 years ago |
|
wangchuxiao
|
984bc37e29
|
middleware
|
3 years ago |
|
wangchuxiao
|
604de144b9
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
Gordon
|
7790686a84
|
ws add token platform verify
|
3 years ago |
|
wangchuxiao
|
ef07634e09
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
f70a20f740
|
rtc add
|
3 years ago |
|
wenxu12345
|
c1cda2d536
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
2b03e7aea8
|
add log
|
3 years ago |
|
wangchuxiao
|
58cea3e947
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
f02fb7ba15
|
rtc add
|
3 years ago |
|
wenxu12345
|
f63aa33082
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
7bdf6717e1
|
add log
|
3 years ago |
|
Gordon
|
2bb6061a44
|
pb 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 |
|
Gordon
|
367888968b
|
log add
|
3 years ago |
|
Gordon
|
b7ff0cf2a2
|
meta data add
|
3 years ago |
|
wangchuxiao
|
fa21ae6161
|
rtc add
|
3 years ago |
|
Gordon
|
852d3b9f48
|
add friend and blacklist judge
|
3 years ago |
|
Gordon
|
10884b8175
|
add friend and blacklist judge
|
3 years ago |
|
Gordon
|
ab9f3a1635
|
add friend and blacklist judge
|
3 years ago |
|
Gordon
|
011960b159
|
send msg add protect
|
3 years ago |
|
Gordon
|
45777e6047
|
pb modify
|
3 years ago |
|
Gordon
|
1db0966675
|
pb modify
|
3 years ago |
|
Gordon
|
0c50815944
|
server modify
|
3 years ago |
|
Gordon
|
38e5b1f853
|
server modify
|
3 years ago |
|
Gordon
|
470bdb6efb
|
ws modify
|
3 years ago |
|
Gordon
|
ca9ac35eb5
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
cb68f83451
|
signal update
|
3 years ago |
|
wangchuxiao
|
972675d4da
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
347b1dd31c
|
livekit
|
3 years ago |
|
Gordon
|
d34e729e32
|
signal update
|
3 years ago |
|
Gordon
|
4954dcead8
|
grpc version
|
3 years ago |
|
Gordon
|
a2f3677784
|
grpc version
|
3 years ago |
|
Gordon
|
fb22b8bba5
|
grpc version
|
3 years ago |
|
Gordon
|
bae5042eea
|
grpc version
|
3 years ago |
|
wangchuxiao
|
8d08bc7fd1
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
Gordon
|
cf6379283b
|
add Signal message
|
3 years ago |
|
Gordon
|
9659638f0c
|
add Signal message
|
3 years ago |
|
Gordon
|
433fef9992
|
add Signal message
|
3 years ago |
|
Gordon
|
d60039454a
|
add Signal message
|
3 years ago |
|
wangchuxiao
|
d90b31c5df
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
Gordon
|
0ce164079e
|
ws modify
|
3 years ago |
|
wangchuxiao
|
3693d2e93d
|
conversation table
|
3 years ago |
|
Gordon
|
9d132d7f92
|
int32 modify
|
3 years ago |
