Commit Graph

877 Commits (5b56de784d3166a6f03957e58e579b77a2f02d8f)

Author SHA1 Message Date
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
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
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'
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
wangchuxiao 228cbb4082 tag
3 years ago
wangchuxiao c39f5a27b2 tag
3 years ago
wangchuxiao dbdb516f3c tag
3 years ago
wangchuxiao c1a97b7356 tag
3 years ago
wangchuxiao a6d8f7ea24 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
3 years ago
wangchuxiao 574c7600e0 tag
3 years ago
Gordon d1c0205d77 add oa notification
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 e6c36411cb 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
hxnets 6c43f75f9f
新增阿里云OSS文件上传参数获取接口 (#115)
3 years ago
马守越 1ab3e04cba
新增mongo.dbUrl配置 (#174)
3 years ago
Arthur 1b8f664c8a
fix: json tag value of UserIDResult.UserID (#178)
3 years ago
Gordon f93d22ae22 log update
3 years ago
wangchuxiao d77894c8fe rtc add
3 years ago
wangchuxiao 366f7621fa rtc add
3 years ago
wangchuxiao 604de144b9 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
3 years ago
Gordon 5dddaeb6e5 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
Gordon 7790686a84 ws add token platform verify
3 years ago
wenxu12345 60950f056b fix bug : etcd Put failed etcdserver: requested lease not found
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
Gordon bf09c88e6e Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
Gordon cb8f7e0ddb mongo single node
3 years ago
wenxu12345 f63aa33082 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
wenxu12345 7bdf6717e1 add log
3 years ago
Gordon 2fc2801ad4 mongo single node
3 years ago
wangchuxiao a0e3488af0 rtc proto 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
wenxu12345 11c65e6b90 signaling add participant
3 years ago
wenxu12345 e9699ed8cc Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
wenxu12345 812362338e signaling add participant
3 years ago
wangchuxiao fa21ae6161 rtc add
3 years ago
wenxu12345 27c6a187a2 signaling
3 years ago
wenxu12345 5f37414fee delete msg from server
3 years ago
wenxu12345 e95644ada2 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
wenxu12345 ab4aee93c1 delete msg from server
3 years ago
Gordon 5df94a03fe Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
Gordon ab9f3a1635 add friend and blacklist judge
3 years ago
wenxu12345 e0a86a8016 delete msg from server
3 years ago
wenxu12345 204b27ca5d pb platformID
3 years ago
Gordon dde8f427af pb modify
3 years ago
wenxu12345 b4c16002ff signaling
3 years ago
Gordon ca23c76426 pb modify
3 years ago
wenxu12345 185f3c05fb signaling
3 years ago
Gordon bde88ecc79 server modify
3 years ago
wenxu12345 83fffe717e signaling
3 years ago
Gordon 9b61fb1f85 ws modify
3 years ago
wenxu12345 fa53530055 signaling
3 years ago
Gordon 02d0b4c99b ws.proto
3 years ago
wangchuxiao 347b1dd31c livekit
3 years ago
wangchuxiao d90b31c5df Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
3 years ago
Gordon 965dac5ff9 constant
3 years ago
wenxu12345 564f77bcdc signaling
3 years ago
Gordon 6136ac4116 ws proto modify
3 years ago
Gordon bba84b4d11 ws proto modify
3 years ago
wenxu12345 b52317f56b signaling
3 years ago
wenxu12345 98f2806be6 signaling
3 years ago
wangchuxiao 3693d2e93d conversation table
3 years ago
wenxu12345 9ab9ae0408 signal
3 years ago
wenxu12345 0abb4a82b1 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
wenxu12345 94a579e7d3 signal
3 years ago
Gordon 24e04f1303 utils modify
3 years ago
wangchuxiao 51c2f845d8 opt
3 years ago
Gordon edc81534c4 ws modify
3 years ago
wenxu12345 b10ba999cd join time
3 years ago
wenxu12345 c4554cb4e9 1.statistics log
3 years ago
wenxu12345 0e575a9366 keepalive ttl * 3
3 years ago
Gordon 15aabb3859 log
3 years ago
Gordon e734b000de log
3 years ago
Gordon a7c8eda290 log
3 years ago
Gordon 1bcd2d4531 log
3 years ago
Gordon 7e9234e712 log
3 years ago
Gordon af2917adb9 log
3 years ago
Gordon 8dc04667b0 test recover
3 years ago
wangchuxiao bcae7720e1 add callback
3 years ago
wangchuxiao a5712e1216 msg callback
3 years ago
wangchuxiao 3805db1263 msg callback
3 years ago
wangchuxiao 4d4520226d msg callback
3 years ago
wangchuxiao 2ed3fd3cba alter callback fg
3 years ago
wangchuxiao 9cec4b0c8e alter callback fg
3 years ago
wangchuxiao 48f03f306a Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
3 years ago
wangchuxiao f1c11ac114 add callback
3 years ago
FG 25f24801d6 log
3 years ago
skiffer-git e6b302abf9 log
3 years ago
wangchuxiao 60e29cc894 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
3 years ago
wangchuxiao dcfd802757 callback add
3 years ago
skiffer-git c4ec54f6e4 Statistics
3 years ago
skiffer-git de7dae4455 statistics
3 years ago
skiffer-git 6362500741 Statistics
3 years ago
skiffer-git 123aad2707 statistics log
3 years ago
wangchuxiao 0bed7ee669 merge code
3 years ago
skiffer-git 04f8a7247d replace find with take
3 years ago
skiffer-git 7b6ef76d54 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
skiffer-git ed65ad842f Replace find with take
3 years ago
Gordon a33fe330f7 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
Gordon b30da3eea4 database judge modify
3 years ago
skiffer-git 05fbbfcf39 grpc-etcd log
3 years ago
wenxu12345 e1f58f07fe 2.0.1
3 years ago
Gordon 4f01b0b2ad remove mysql for test
3 years ago