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

Sync master #333

Merged
merged 51 commits into from
Jul 7, 2016
Merged

Sync master #333

merged 51 commits into from
Jul 7, 2016

Conversation

MorrisJobke
Copy link
Member

Vincent Petry and others added 30 commits June 23, 2016 18:42
Prevents "other" value to be deleted.
When appending custom value, put it above the "other" entry.
Prepend a slash to directories in case it was missing since many places
assume that it's there.
prevent users from deleting their own session token
Only save federated share after remote server is notified
show configuration options for authentication backends
Fix "Other" value handling in quota dropdown in users page
* Wait for socket to be open

* Fix call on null

* Allow DB access for MountProviderTest

Makes unit tests pass when using object store, since their FS access is
actually oc_filecache DB access. It is currently not possible to mock
or bypass the logic from "SharedMount::verifyMountPoint()" triggered by
this test.
Add integration test for the use case where a group share exists and
then the same owner creates a direct share to a user in that group.
@MorrisJobke
Copy link
Member Author

@blizzz Done :)

@blizzz
Copy link
Member

blizzz commented Jul 7, 2016

@MorrisJobke 👍

@LukasReschke LukasReschke merged commit 828106a into master Jul 7, 2016
@LukasReschke LukasReschke deleted the sync-master branch July 7, 2016 17:29
juliushaertl added a commit that referenced this pull request Feb 21, 2017
Signed-off-by: Julius Haertl <jus@bitgrid.net>
juliushaertl added a commit that referenced this pull request Mar 5, 2017
Signed-off-by: Julius Haertl <jus@bitgrid.net>
juliushaertl added a commit that referenced this pull request Mar 5, 2017
Signed-off-by: Julius Haertl <jus@bitgrid.net>
juliushaertl added a commit that referenced this pull request Mar 16, 2017
Signed-off-by: Julius Haertl <jus@bitgrid.net>
juliushaertl added a commit that referenced this pull request Mar 20, 2017
Signed-off-by: Julius Haertl <jus@bitgrid.net>
juliushaertl added a commit that referenced this pull request Mar 20, 2017
Signed-off-by: Julius Haertl <jus@bitgrid.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet