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.

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

Allow to hide download option for folders shared by link #12531

Merged
merged 4 commits into from Nov 20, 2018

Conversation

@juliushaertl
Copy link
Member

juliushaertl commented Nov 19, 2018

  • Enable "Hide download" share option for folders
  • Remove file selection and download option
  • Remove file action to download

Files we cannot display inline will still be downloaded. Right-clicking and opening the file in a new tab will also still cause the file to be downloaded.

@juliushaertl

This comment has been minimized.

Copy link
Member

juliushaertl commented Nov 19, 2018

Companion PR to remove the download button from the gallery app slideshow: nextcloud/gallery#484

@rullzer

This comment has been minimized.

Copy link
Member

rullzer commented Nov 19, 2018

Files we cannot display inline will still be downloaded. Right-clicking and opening the file in a new tab will also still cause the file to be downloaded.

Fixed that :)

@rullzer rullzer requested review from danxuliu , rullzer and ChristophWurst Nov 19, 2018

@ChristophWurst
Copy link
Member

ChristophWurst left a comment

Tested and works, but I see some unexpected whitespace on the right:

bildschirmfoto von 2018-11-20 10-31-14

@MorrisJobke

This comment has been minimized.

Copy link
Member

MorrisJobke commented Nov 20, 2018

Tested and works, but I see some unexpected whitespace on the right:

Same here - is not there on master.

@MorrisJobke
Copy link
Member

MorrisJobke left a comment

Tested and works 👍

@MorrisJobke

This comment has been minimized.

Copy link
Member

MorrisJobke commented Nov 20, 2018

JSUnit test fails:

PhantomJS 2.1.1 (Linux 0.0.0) OC.Share.ShareDialogLinkShareView hide download is not shown if the share is a folder FAILED
	Expected 1 to be falsy.
	core/js/tests/specs/sharedialoglinkshareview.js:117:50

@juliushaertl juliushaertl force-pushed the bugfix/noid/hide-download-folders branch from 053a5a4 to 88fb538 Nov 20, 2018

@juliushaertl

This comment has been minimized.

@MorrisJobke

This comment has been minimized.

Copy link
Member

MorrisJobke commented Nov 20, 2018

Conflicts 🙈

juliushaertl and others added some commits Nov 19, 2018

Allow to hide download option for folders shared by link
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Compile handlebars
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Clear link to avoid downloads
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Fix whitespace and file action cleanup
Signed-off-by: Julius Härtl <jus@bitgrid.net>

@rullzer rullzer force-pushed the bugfix/noid/hide-download-folders branch from 88fb538 to 78056a3 Nov 20, 2018

@rullzer rullzer merged commit b150d27 into master Nov 20, 2018

1 check failed

continuous-integration/drone/pr the build failed
Details

@rullzer rullzer deleted the bugfix/noid/hide-download-folders branch Nov 20, 2018

@MorrisJobke MorrisJobke referenced this pull request Nov 22, 2018

Merged

15.0.0 RC 1 #12581

7 of 7 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment