Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Only show the conflict warning when the session was in a call #4374

Merged
merged 2 commits into from
Oct 23, 2020
Merged

Only show the conflict warning when the session was in a call #4374

merged 2 commits into from
Oct 23, 2020

Conversation

nickvergessen
Copy link
Member

Fix #4366

@nickvergessen nickvergessen added 3. to review bug feature: chat 💬 Chat and system messages feature: signaling 📶 Internal and external signaling backends labels Oct 15, 2020
@nickvergessen nickvergessen added this to the 💚 Next Major (21) milestone Oct 15, 2020
@nickvergessen
Copy link
Member Author

/backport to stable20

@nickvergessen
Copy link
Member Author

/backport to stable19

marcoambrosini
marcoambrosini requested changes Oct 15, 2020
View reviewed changes
Copy link
Member

@marcoambrosini marcoambrosini left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we update the warning message and change the title of the tab?

@nickvergessen
Copy link
Member Author

Any suggestions?

@marcoambrosini
Copy link
Member

Warning: "You've joined a call in this conversation on another device, if you join here, the call will be interrupted."
Title of the "logged out" tab: "Duplicate session"

@nickvergessen
Only show the conflict warning when the session was in a call
32f14e1 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Add "Duplicate session" to the page title
7baf0bf 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen nickvergessen force-pushed the bugfix/4366/only-conflict-with-calls branch from 2b10339 to 7baf0bf Compare October 23, 2020 07:39
@nickvergessen
Copy link
Member Author

Added the page title as that is already translated. Let's do the update of the other message after the maintenance release ?

@nickvergessen nickvergessen merged commit 739efd0 into master Oct 23, 2020
@nickvergessen nickvergessen deleted the bugfix/4366/only-conflict-with-calls branch October 23, 2020 07:43
This was referenced Oct 23, 2020
Merged
Merged
@danxuliu danxuliu mentioned this pull request Aug 26, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marcoambrosini marcoambrosini marcoambrosini approved these changes

@danxuliu danxuliu Awaiting requested review from danxuliu

@jancborchardt jancborchardt Awaiting requested review from jancborchardt

Assignees
No one assigned
Labels
3. to review bug feature: chat 💬 Chat and system messages feature: signaling 📶 Internal and external signaling backends
Projects
None yet
Milestone
v11.0.0-alpha.1
Development

Successfully merging this pull request may close these issues.

Better duplicate session UX
2 participants
@nickvergessen @marcoambrosini