Skip to content

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Mar 4, 2021

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #5082

When the current conversation was deleted while in a call, or
whenever someone has been removed from a room, the redirect
now targets the not-found page instead of the one about duplicate
session.

Signed-off-by: Vincent Petry <[email protected]>
@PVince81 PVince81 force-pushed the backport/5082/stable21.1 branch from 88a0245 to cc292ce Compare March 4, 2021 15:15
@PVince81 PVince81 self-assigned this Mar 4, 2021
@PVince81
Copy link
Member

PVince81 commented Mar 4, 2021

conflict solved by cherry-picking the commit from #5289 which is closed code-wise

@PVince81
Copy link
Member

PVince81 commented Mar 8, 2021

@nickvergessen @ma12-co please review, conflict was solved

@nickvergessen
Copy link
Member

Btw there is a difference now. Before the page title e.g. was cleared, with your PR it still contains the room name.

@nickvergessen
Copy link
Member

So merge or not, that is the question?

@PVince81
Copy link
Member

I've now pushed a fix for the window title here: #5487

@PVince81
Copy link
Member

we can merge this here and then backport the other fix once ready

@nickvergessen nickvergessen merged commit 6e6a7bd into stable21.1 Apr 19, 2021
@nickvergessen nickvergessen deleted the backport/5082/stable21.1 branch April 19, 2021 11:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants