Sync stable9 #334
Merged
Sync stable9 #334
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Fix Decrypt message via occ
* Comments fixed
* Fixed reviews
* Originally:
commit 2304e4bda027e61ff1302c55c2f70f8e4c8f47d0
Author: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue Jun 7 09:13:11 2016 +0200
Allow to decrypt user '0' files only
* Fix uid comparison
* Initial web executor * Fix PHPDoc Fix broken integration test OccControllerTests do not require database access - moch them all! Kill unused sprintf
This reverts commit 58ed5b9328e9e12dd4319c0730202f385ca0dc5d.
Makes sure that the share owner is set before entering the checks that need it. Partial backport of afa37d3
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.
[stable9] occ web executor
…ble9 [stable9] get only vcards which match both the address book id and the vcard uri
[stable9] Change order of share creation validation
Revert "Remove repair steps for broken updater repair"
…8e99e379449792eeaf8 [stable9] Ignore invalid paths in the JS file list
This reverts commit 1a42979.
This reverts commit 445a76b.
This reverts commit 9fcb269.
I reverted owncloud/core#25363, owncloud/core#25222 and owncloud/core#25343 |
|
👍 |
1 similar comment
|
👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
cc @LukasReschke @nickvergessen @rullzer @schiessle
I reverted the web occ executor and the broken updater repair step.