Skip to content

Conversation

@danxuliu
Copy link
Member

@danxuliu danxuliu commented Oct 21, 2019

Requires nextcloud/server#17575

The Talk sidebar is only shown for file shares, so there is no need to load it for folder shares. Moreover, this also prevents some of the hacks used to show the Talk sidebar to mess with the layout used for folders.

@danxuliu
Copy link
Member Author

Backport to stable17 in #2340

@nickvergessen
Copy link
Member

Conflicting files
lib/PublicShare/TemplateLoader.php

The Talk sidebar is only shown for file shares, so there is no need to
load it for folder shares. Moreover, this also prevents some of the
hacks used to show the Talk sidebar to mess with the layout used for
folders.

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
@danxuliu danxuliu force-pushed the do-not-load-talk-sidebar-in-public-share-page-of-folder-shares branch from dc3abae to 645c721 Compare October 22, 2019 11:20
@danxuliu
Copy link
Member Author

Rebased due to conflicts with #2283.

@nickvergessen nickvergessen merged commit 7972bee into master Oct 22, 2019
@delete-merged-branch delete-merged-branch bot deleted the do-not-load-talk-sidebar-in-public-share-page-of-folder-shares branch October 22, 2019 15:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review bug feature: talk-sidebar ⬅️ Sidebar integration of Talk into other apps like sharing and documents

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants