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.

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 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
Copy link
Member Author

@juliushaertl juliushaertl commented Nov 19, 2018

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

@rullzer
Copy link
Member

@rullzer 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
Copy link
Member

@ChristophWurst 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
Copy link
Member

@MorrisJobke MorrisJobke commented Nov 20, 2018

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

Same here - is not there on master.

Copy link
Member

@MorrisJobke MorrisJobke left a comment

Tested and works 👍

@MorrisJobke
Copy link
Member

@MorrisJobke 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
@MorrisJobke
Copy link
Member

@MorrisJobke MorrisJobke commented Nov 20, 2018

Conflicts 🙈

juliushaertl and others added 4 commits Nov 19, 2018
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
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
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/drone/pr the build failed
Details
@dco
DCO DCO
Details
@fixupbot
fixupbot No fixup commits found. The commit history is clean
Details
@rullzer rullzer deleted the bugfix/noid/hide-download-folders branch Nov 20, 2018
@MorrisJobke MorrisJobke mentioned this pull request Nov 22, 2018
7 of 7 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants