Commit Graph

1961 Commits (051f73013cddacfd82804b2b0cca3e4e4e6acf56)

Author SHA1 Message Date
wangchuxiao 943a5b36e3 Merge branch 'del' into v2.3.0release
2 years ago
Gordon eee98c5175 revoke super group message and push message modify
2 years ago
wangchuxiao d0a200f652 etcd
2 years ago
wangchuxiao 6f2451edd3 etcd
2 years ago
Gordon a38291fc17 notification
2 years ago
wangchuxiao bda96a2175 fix
2 years ago
wangchuxiao 64e1361ef5 fix signal bug
2 years ago
skiffer-git 2f6eb5969e getui
2 years ago
skiffer-git 125b6fa779 Merge remote-tracking branch 'origin/del' into del
2 years ago
skiffer-git 5e78871c00 getui
2 years ago
Gordon 487d9a6449 notification
2 years ago
Gordon 97b1a774fb Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon 12a4c12753 notification
2 years ago
wangchuxiao e8fdc454db update orgnization after update user
2 years ago
wangchuxiao 69da4410dc update orgnization after update user
2 years ago
wangchuxiao 5fc6f78555 Merge branch 'v2.3.0release' into del
2 years ago
wangchuxiao 15e0a7aa38 update orgnization after update user
2 years ago
wangchuxiao a37d82e2dd update orgnization after update user
2 years ago
wangchuxiao 0a14c8b3e6 update orgnization after update user
2 years ago
wangchuxiao e779280428 Merge branch 'v2.3.0release' into del
2 years ago
wangchuxiao 753cd95a18 update orgnization after update user
2 years ago
wangchuxiao 5bd34f19fe Merge branch 'v2.3.0release' into del
2 years ago
wangchuxiao 0e5b17adcc update orgnization after update user
2 years ago
wangchuxiao b23f10ecde Merge branch 'v2.3.0release' into del
2 years ago
wangchuxiao 08d6e142c3 update orgnization after update user
2 years ago
wangchuxiao 2016a1656b Merge branch 'v2.3.0release' into del
2 years ago
wangchuxiao 5a44618289 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao 338d7f0df6 update orgnization after update user
2 years ago
wangchuxiao 6d19af02c9 Merge branch 'v2.3.0release' into del
2 years ago
wangchuxiao 5a6f96f84b update orgnization after update user
2 years ago
wangchuxiao 3f74022142 Merge branch 'main' into del
2 years ago
wangchuxiao da8755fcb7 fix code
2 years ago
wangchuxiao 3be284c129 fix code
2 years ago
wangchuxiao 15e2d172a4 fix code
2 years ago
wangchuxiao 4e54cb56e5 fix code
2 years ago
wangchuxiao 1dbe80afc4 Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del
2 years ago
wangchuxiao 0683352c4b fix code
2 years ago
wangchuxiao d666f0245d
Merge pull request #267 from ouyangshi/del
2 years ago
wangchuxiao 7f252909fc fix code
2 years ago
欧阳氏 7b9d0b4f1f 封禁用户列表
2 years ago
wangchuxiao 37193c48d9 fix code
2 years ago
wangchuxiao 1747ae8984 fix code
2 years ago
wangchuxiao dfee8891d3 fix code
2 years ago
wangchuxiao c6b669eb9d fix code
2 years ago
wangchuxiao 919e2543ca fix code
2 years ago
wangchuxiao 9aa7ba77f5 fix code
2 years ago
wangchuxiao d5b873b70b Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del
2 years ago
wangchuxiao 4ec255917d Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del
2 years ago
wangchuxiao 9b86a18752 Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del
2 years ago
skiffer-git 630fef29a2 Restrict user login with IP
2 years ago
wangchuxiao 05d45c94d5 ip limit
2 years ago
skiffer-git 44e4c59493 Restrict user login with IP
2 years ago
skiffer-git 24e7076423 Restrict user login with IP
2 years ago
skiffer-git 8b857f9980 Restrict user login with IP
2 years ago
wangchuxiao 7d1707ca7c fix log
2 years ago
Gordon 652d560a21 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon be69ee8b1d fcm update
2 years ago
欧阳氏 ac7f905248 完善 用户注册 用户更新
2 years ago
wangchuxiao 1a2ea05361 fix bug
2 years ago
欧阳氏 39606248a1 邀请码功能
2 years ago
skiffer-git 4e5c1606f3 log
2 years ago
Gordon b8aa54a159 mark message
2 years ago
wangchuxiao 7caccce907 fix log
2 years ago
wangchuxiao 82777d641c fix log
2 years ago
wangchuxiao 5b248c82f5 fix log
2 years ago
Gordon 9c7ae3b0ef mark message
2 years ago
wangchuxiao 9b130ae56c fix log
2 years ago
wangchuxiao a48b2e9edb cms
2 years ago
wangchuxiao 69008e08be cms api rpc
2 years ago
wangchuxiao 60029fc618 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
Gordon 54cdb24cec user add delete cache
2 years ago
wangchuxiao c2bd1d0d83 callback kickoff
2 years ago
wangchuxiao aa7ba6d659 callback kickoff
2 years ago
skiffer-git c53bcd990d Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
skiffer-git 78c807a514 add Invitation Code
2 years ago
wangchuxiao c4084cbcec callback kickoff
2 years ago
wangchuxiao 062c4b53b6
Merge pull request #258 from ouyangshi/main
2 years ago
skiffer-git c9d7b63ef7 Multiple gateways
2 years ago
wangchuxiao 06729c4e84 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao 5c5f80691a fix delete
2 years ago
skiffer-git 079fe089de Multiple gateways
2 years ago
skiffer-git 5f83acf3ad Multiple gateways
2 years ago
skiffer-git 0d16fbe4ab Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
skiffer-git c1184fd7d2 Multiple gateways
2 years ago
wangchuxiao 429bee7e6c
Merge pull request #261 from ouyangshi/v2.3.0release
2 years ago
Smile 547ad7a2c7
kafka topic优化及解释,删除废弃topic的冗余代码 (#255)
2 years ago
wangchuxiao 911614673b fix delete
2 years ago
wangchuxiao e80d3e7dac fix delete
2 years ago
wangchuxiao 7b820ebb94 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao 6bfa8643d6 fix delete
2 years ago
Gordon 25de6b58c3 conversation update
2 years ago
wangchuxiao cdc60ef5f0 fix delete
2 years ago
wangchuxiao edeb228315 fix delete
2 years ago
wangchuxiao f6c6d58045 fix delete
2 years ago
wangchuxiao b1d0ca76c9 fix delete
2 years ago
wangchuxiao 5a058d9b97 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao 2892add766 fix delete
2 years ago
skiffer-git 923a035e6e Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
skiffer-git a2a56980d9 add log
2 years ago
wangchuxiao 2ee0943115 fix delete
2 years ago
wangchuxiao cfe218b8a4 fix delete
2 years ago
wangchuxiao a74168d1e1 fix delete
2 years ago
wangchuxiao f279b9173e Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao 706f6c6747 getui debug
2 years ago
Gordon dd6c2df5d2 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon bcc0c7c2df delete conversation update
2 years ago
wangchuxiao 2c0a2d7877 getui debug
2 years ago
Gordon 7bd7edfec9 send options bug fix
2 years ago
Gordon db8c4f369c send options bug fix
2 years ago
Gordon 569d5d2d89 super group add after callback
2 years ago
skiffer-git 5cbea2cab5 Set token kicked status first in forceKickOff
2 years ago
skiffer-git 57a21ab8e6 forceKickOff work
2 years ago
skiffer-git c52bdce621 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
欧阳氏 9358aa1bd8 用户表增加注册IP 登陆IP
2 years ago
Gordon c304de9288 userinfo get
2 years ago
skiffer-git 52e57cf547 fix bug
2 years ago
Gordon e33af2a316 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon ffc4da1589 callback add seq
2 years ago
wangchuxiao cd65d42004 getui debug
2 years ago
skiffer-git ae8acc6eba GetGroupAbstractInfoResp
2 years ago
skiffer-git 1e1381df8e log
2 years ago
wangchuxiao 2ba7fcd628 group hash
2 years ago
wangchuxiao 1f8e161001 group hash
2 years ago
wangchuxiao b4b215a3f8 group hash
2 years ago
wangchuxiao e2ff7ef113 group hash
2 years ago
wangchuxiao 73c998f510 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao 11f29280b1 group hash
2 years ago
Gordon 2cf10fce38 del conversation bug fix
2 years ago
Gordon 2436ea6ff9 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon 403489865c del conversation bug fix
2 years ago
wangchuxiao c8590b9e9c Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao d1ffa9b330 callback fix
2 years ago
Gordon 37799ca0be del conversation bug fix
2 years ago
Gordon ba5edabb2c del conversation bug fix
2 years ago
Gordon e77b4f334d Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon 87c64bdb2b del conversation bug fix
2 years ago
skiffer-git 68eed69221 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
skiffer-git 5db5bf17cb add GetGroupAbstractInfo api
2 years ago
Gordon 319631b5c4 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon 10c0f3075a unread bug fix
2 years ago
wangchuxiao 91a767b4fb callback fix
2 years ago
wangchuxiao 4e69ff196a cache get group
2 years ago
wangchuxiao db547d60df callback fix
2 years ago
wangchuxiao 3d0827a6da callback fix
2 years ago
Gordon 231d4db71d callback msg content
2 years ago
Gordon ca7bba33e6 docker-compose file update
2 years ago
wangchuxiao b294a8138c Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao a99dbf634b callback fix
2 years ago
skiffer-git cda0fb6a10 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
skiffer-git a1392a7677 GetGroupAllMemberListBySplit
2 years ago
Gordon e9da7f28cc Merge branch 'main' into v2.3.0release
2 years ago
Gordon c4ee293388 docker-compose file update
2 years ago
wangchuxiao d99b0893df fix bug
2 years ago
wangchuxiao b32463df53 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao f202d5f54a fix bug
2 years ago
Gordon 18891c554d log add
2 years ago
wangchuxiao 8e445caf26 fix bug
2 years ago
wangchuxiao d99375a536 fix bug
2 years ago
wangchuxiao 4c610abd44 fix bug
2 years ago
wangchuxiao e1a941b998 fix bug
2 years ago
wangchuxiao 9136838b63 fix bug
2 years ago
wangchuxiao ef9c291d9a fix bug
2 years ago
wangchuxiao 6f968342dc fix bug
2 years ago
wangchuxiao 4930906b62 fix bug
2 years ago
wangchuxiao c39df537b4 minio obj locking
2 years ago
欧阳氏 cfa9f2d13f 增加 AWS S3 存储
2 years ago
wangchuxiao 146cf8750f Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao c25352b660 fix bug
2 years ago
Gordon 7cc9d6707c Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon dca2f9323b update server version
2 years ago
wangchuxiao 7cf2fec3ea Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao ab6b1f0fca fix bug
2 years ago
wenxu12345 0b08bfdcba Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
wenxu12345 4701300ed8 Adjust error code
2 years ago
wangchuxiao 79a974946e Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao 151fec445e fix bug
2 years ago
wenxu12345 d653e139d3 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
wenxu12345 04e826ff09 Adjust error code
2 years ago
wangchuxiao b29f93dcd2 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao 1c85424488 mongodb superGroup
2 years ago
Gordon 490c94fa95 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon 1b92774778 add test file
2 years ago
wenxu12345 34588f9da3 Adjust error code
2 years ago
wenxu12345 0811999081 Adjust error code
2 years ago
wenxu12345 cf7e1c7767 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
wenxu12345 ba4988bb9b Adjust error code
2 years ago
Gordon cd3778a620 add test file
2 years ago
Gordon 5b065ee68d Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon ee79728f9d add test file
2 years ago
wenxu12345 482c502356 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
wenxu12345 92cdff3043 Adjust error code
2 years ago
Gordon b01474523e Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon 9121063ebc add test file
2 years ago
wangchuxiao 2c34b11980 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao e1af587040 mongodb superGroup
2 years ago
wenxu12345 efe727ec71 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
wenxu12345 d278dfb996 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon 9ed6afd836 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
wenxu12345 6a19c8130c Adjust error code
2 years ago
Gordon c43290338d add test file
2 years ago
wangchuxiao da540522ac mongodb superGroup
2 years ago
wangchuxiao 73c5dc159b mongodb superGroup
2 years ago
wangchuxiao 6e826cf369 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao 8f12fa52b4 mongodb superGroup to cache
2 years ago
Gordon 6d15e5b5a1 msg
2 years ago
Gordon 51679b47a6 delete super group message
2 years ago
Gordon 1eda0ebea7 fcm push modify
2 years ago
Gordon 787cef54f5 manger send msg modify
2 years ago
Gordon 36885b4f9e test
2 years ago
Gordon 4b6332dbfa Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon bbc62ef907 remove cache message from redis
2 years ago
wenxu12345 4c53023ebc debug
2 years ago
wenxu12345 17494b45bd debug
2 years ago
wenxu12345 90401d4d12 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
wenxu12345 9730ada805 debug
2 years ago
Gordon 5a626e9dab add update conversation unread count
2 years ago
Gordon 14d5b3b316 remove validation for notificationFaceURL
2 years ago
wenxu12345 b1377218b1 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
wenxu12345 80d74f6f38 Push message to client through message queue
2 years ago
wangchuxiao 5a262880b9 superGroupMaxSeq
2 years ago
wangchuxiao f84cc0554f superGroupMaxSeq
2 years ago
wangchuxiao 2d20c4ee4c superGroupMaxSeq
2 years ago
wangchuxiao 041a35e3c8 superGroupMaxSeq
2 years ago
wangchuxiao cf205c2480 superGroupMaxSeq
2 years ago
Gordon 09b830bcf9 super group add verification
2 years ago
Gordon 7561831624 super group add verification
2 years ago
Gordon ccf6ef6140 super group add verification
2 years ago
Gordon e61434347e Merge branch 'superGroup' into v2.3.0release
2 years ago
欧阳氏 84c068783d
新增 firebase cloud message 消息推送 (#236)
2 years ago
Gordon a71b42c335 not storage message push fix bug
2 years ago
Gordon f3ed48e0ac seq add
2 years ago
wangchuxiao 55cc8cead1 superGroupMaxSeq
2 years ago
wangchuxiao a3f62e2246 superGroupMaxSeq
2 years ago
wangchuxiao a5ef78fd1e superGroupMaxSeq
2 years ago
wangchuxiao 337d01008b script
2 years ago
skiffer-git 8bb82be2b9 fix bug : Two group owners
2 years ago
wangchuxiao eb1aeefc8c Merge branch 'dtm' into v2.3.0release
2 years ago
skiffer-git e64cf47d31 rename
2 years ago
skiffer-git dd0d518ecd rename
2 years ago
skiffer-git 6d236a2dd6 rename
2 years ago
skiffer-git 663db12594 rename
2 years ago
skiffer-git f383d6c636 rename
2 years ago
skiffer-git 2b3bb92357 rename
2 years ago
skiffer-git 87a2944837 rename
2 years ago
skiffer-git ea32c88d85 rename
2 years ago
skiffer-git 725f8ce761 rename
2 years ago
skiffer-git 3f42390f2f rename
2 years ago
skiffer-git 4d3343d0d0 rename
2 years ago
skiffer-git 4b22eb946c 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 5afa3380a6 docker-compose fix
2 years ago
wangchuxiao 8ee4ca0357 docker-compose fix
2 years ago
skiffer-git 5936492f76 Filter out disbanded groups
2 years ago
skiffer-git ad1d759840 Application for joining the group: JoinSource && InviterUserID
2 years ago
skiffer-git a55134ae63 fix bug: two group owners
2 years ago
wangchuxiao 67b20d073e docker-compose fix
2 years ago
wangchuxiao 8a8fce927e Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
skiffer-git 2b2ecad437 fix bug
2 years ago
wangchuxiao 89406f1c57 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao ea93e97e79 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao 1e6a93b4b6 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
skiffer-git 8ad22f8148 fix bug
2 years ago
wangchuxiao b064244907 rocks cache
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 33222d59c2 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon adb7da7aaf group add field
2 years ago
skiffer-git 04eb85d279 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
skiffer-git 58847c7fb6 Update group member nickname when personal nickname is updated
2 years ago
Gordon 504e4cc6a3 add super delete
2 years ago
Gordon f737d2e8ce Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon 3157f97ae6 push fix bug
2 years ago
wangchuxiao 278329b73c Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao 033ec6bc76 fix bug
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 3ad3b30d97 demo
2 years ago
wangchuxiao d0e7147911 demo
2 years ago
skiffer-git d7ce455f2f Super code can be disabled
2 years ago
wangchuxiao 7ffe857f52 fix bug
2 years ago
Gordon f2b0f54c0b test
2 years ago
Gordon a1025d8eee test
2 years ago
Gordon b8cd9484dc test
2 years ago
skiffer-git e23d5926dd Merge remote-tracking branch 'origin/superGroup' into superGroup
2 years ago
skiffer-git 5c4982a3f1 fix bug
2 years ago
wangchuxiao 36667b8649 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
2 years ago
wangchuxiao 088f9dae9b demo
2 years ago
skiffer-git ed52ecb259 fix bug
2 years ago
skiffer-git 54566997b2 fix bug
2 years ago
skiffer-git 4783e3d061 log
2 years ago
skiffer-git 658d97ff4e log
2 years ago
skiffer-git 3373925acf Merge remote-tracking branch 'origin/superGroup' into superGroup
2 years ago
skiffer-git 9d84bf8f4c log
2 years ago
Gordon 1650165f4b group add verify
2 years ago
wangchuxiao 8849cd46c9 callback
2 years ago