Skip to content

Mark "Talk" active on /call/token URLs - #17850

Merged
nickvergessen merged 2 commits into
masterfrom
bugfix/noid/mark-spreed-as-active-on-call-urls
Nov 20, 2019
Merged

Mark "Talk" active on /call/token URLs#17850
nickvergessen merged 2 commits into
masterfrom
bugfix/noid/mark-spreed-as-active-on-call-urls

Conversation

@nickvergessen

@nickvergessennickvergessen commented Nov 7, 2019

Copy link
Copy Markdown
Member

On backport to stable17 the class name needs to be changed, so manual backporting it is.

Steps

  1. Open Talk
  2. Go to a conversation
  3. Reload the page
  4. Try to find the "active triangle" on the top navigation bar

@nickvergessennickvergessen added this to the Nextcloud 18 milestone Nov 7, 2019
rullzer
rullzer approved these changes Nov 7, 2019
View reviewed changes

@rullzerrullzer left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

sure

Ivansss
Ivansss approved these changes Nov 7, 2019
View reviewed changes

@IvansssIvansss left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

👍

@rullzer

rullzer commented Nov 8, 2019

Copy link
Copy Markdown
Member

Ha... PHAN is not happy here: https://drone.nextcloud.com/nextcloud/server/23079/5/6

@nickvergessen
nickvergessenforce-pushed the bugfix/noid/mark-spreed-as-active-on-call-urls branch from ee0b11d to 284d218CompareNovember 8, 2019 09:06
@rullzer

rullzer commented Nov 12, 2019

Copy link
Copy Markdown
Member

Phan still not happy...

georgehrke
georgehrke reviewed Nov 12, 2019
View reviewed changes
Comment threadlib/private/AppFramework/Middleware/Security/SecurityMiddleware.php Outdated
@nickvergessen
nickvergessenforce-pushed the bugfix/noid/mark-spreed-as-active-on-call-urls branch from 284d218 to b160589CompareNovember 12, 2019 14:21
@nickvergessen@rullzer
Mark "Talk" active on /call/token URLs
15f00f0
Signed-off-by: Joas Schilling <coding@schilljs.com>
@rullzer
rullzerforce-pushed the bugfix/noid/mark-spreed-as-active-on-call-urls branch from b160589 to 15f00f0CompareNovember 12, 2019 20:39
nickvergessen
nickvergessen commented Nov 18, 2019
View reviewed changes
Comment threadlib/private/AppFramework/Middleware/Security/SecurityMiddleware.php Outdated
@kesselb
Make phan happy ;)
9055f46
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@nickvergessen

nickvergessen commented Nov 19, 2019

Copy link
Copy Markdown
MemberAuthor

Oh thanks @kesselb

@kesselbkesselb added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Nov 19, 2019
@nickvergessen
nickvergessen merged commit 6ad54f3 into masterNov 20, 2019
@nickvergessen
nickvergessen deleted the bugfix/noid/mark-spreed-as-active-on-call-urls branch November 20, 2019 09:33
@nickvergessennickvergessen mentioned this pull request Dec 4, 2019
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@georgehrkegeorgehrkegeorgehrke left review comments
@ChristophWurstChristophWurstChristophWurst approved these changes
@kesselbkesselbkesselb left review comments
@rullzerrullzerrullzer approved these changes
@IvansssIvansssIvansss approved these changes
@marcoambrosinimarcoambrosiniAwaiting requested review from marcoambrosini
@danxuliudanxuliuAwaiting requested review from danxuliu

Assignees

No one assigned

Labels

4. to releaseReady to be released and/or waiting for tests to finishbug

Projects

None yet

Milestone

Nextcloud 18.0.0

Development

Successfully merging this pull request may close these issues.

6 participants

@nickvergessen@rullzer@georgehrke@ChristophWurst@kesselb@Ivansss