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

Issue #565: Add the checkbox in the share dialogue to allow uploading from the public side #587

Merged
merged 1 commit into from
Mar 16, 2016

Conversation

imjalpreet
Copy link
Member

Fixes: #565

Licence: AGPL

Description and Features

  • Now, it is possible to allow editing via a share link(from the public side) from the share dialog in the Gallery.

Screenshots or screencasts

screenshot2
screenshot1

Tested on

  • Ubuntu 14.04/Firefox
  • Ubuntu 14.04/Chrome

Test Plan

As a logged-in user:

  • First enable public uploading in the admin settings.
  • Share a folder via link.
  • Tick the 'Allow editing' check box.
  • As Add uploading support for registered users #574 is not yet merged, we will have to go to the files list to test the uploading function.
  • Try to test in multiple browsers.

Reviewers

@oparoz Please have a look at this.

@mention-bot
Copy link

By analyzing the blame information on this pull request, we identified @oparoz, @PVince81 and @Spacefish to be potential reviewers

@imjalpreet
Copy link
Member Author

Either of #586 or this one will have to be rebased upon merging of the other one.

@oparoz
Copy link
Contributor

oparoz commented Mar 11, 2016

Yeah, no problem

@oparoz
Copy link
Contributor

oparoz commented Mar 11, 2016

Sorry this wasn't much work. Looks like I had already fixed most of it.

@@ -245,19 +245,18 @@
html += '</div>';

// FIXME public uploading is not supported in Gallery
Copy link
Contributor

Choose a reason for hiding this comment

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

Please remove

@imjalpreet
Copy link
Member Author

@oparoz No problem.
One more thing, I changed in this is that earlier in the mail that was being sent to the user with the share album details, the name was being sent as null, now I changed it to the album name.

@@ -174,19 +174,19 @@
// respective checkbox should be checked or
// not.
// FIXME public uploading is not supported in Gallery
Copy link
Contributor

Choose a reason for hiding this comment

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

Please remove

@oparoz oparoz added this to the 9.1-current milestone Mar 11, 2016
@oparoz
Copy link
Contributor

oparoz commented Mar 11, 2016

Code looks good and it works 👍
Add the fact that public uploading needs to be enabled in admin settings and summon other testers, please :)

@imjalpreet
Copy link
Member Author

@viraj96 @mbtamuli @tahaalibra Please test this.

@imjalpreet
Copy link
Member Author

Rebased the commit.

oparoz added a commit that referenced this pull request Mar 16, 2016
Issue #565: Add the checkbox in the share dialogue to allow uploading from the public side
@oparoz oparoz merged commit 0f7858e into owncloud:master Mar 16, 2016
@oparoz
Copy link
Contributor

oparoz commented Mar 17, 2016

@imjalpreet - I wasn't careful enough when merging... You need to update the failing test.

Just do it in a new PR. Should take 5 minutes to do. That way I don't need to revert this.

@imjalpreet
Copy link
Member Author

@oparoz Sorry, I forgot about that. I will send a new PR soon. 👍

imjalpreet added a commit to imjalpreet/gallery that referenced this pull request Mar 17, 2016
imjalpreet added a commit to imjalpreet/gallery that referenced this pull request Mar 17, 2016
imjalpreet added a commit to imjalpreet/gallery that referenced this pull request Mar 17, 2016
imjalpreet added a commit to imjalpreet/gallery that referenced this pull request Mar 17, 2016
oparoz added a commit that referenced this pull request Mar 17, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants