Feature: add direct connect mode with zookeeper, etcd, and k8s#1775
Merged
cubxxw merged 78 commits intoopenimsdk:mainfrom Jan 26, 2024
Merged
Feature: add direct connect mode with zookeeper, etcd, and k8s#1775cubxxw merged 78 commits intoopenimsdk:mainfrom
cubxxw merged 78 commits intoopenimsdk:mainfrom
Conversation
fix: fix the imAdmin permission and searchNoficitaion resp
Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>
feat(release-v3.5): fix openim docker start openim server internal port lock
Update docker-start-all.sh fix MSG_TRANSFER_PROM_PORT
Update docker-start-all.sh
rebase openim main to release-v3.5
Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>
…o-env fix openim config mongo passwd env
fix: fix some bug
fix: group messages sync failed.
fix: fix the getSortedConversationList api
fix: fix the mongo search error
(cherry picked from commit 4c3c455)
fix: GroupApplicationRejectedNotification not notification apply for userID
Contributor
|
Could you please help me resolve the conflict? |
skiffer-git
approved these changes
Jan 22, 2024
FGadvancer
approved these changes
Jan 22, 2024
FGadvancer
approved these changes
Jan 26, 2024
cubxxw
approved these changes
Jan 26, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
🔍 What type of PR is this?
👀 What this PR does / why we need it:
🅰 Which issue(s) this PR fixes:
Fixes #1770
📝 Special notes for your reviewer:
🎯 Describe how to verify it
📑 Additional documentation e.g., RFC, notion, Google docs, usage docs, etc.: