summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* remove old share propagation entries from appconfig (#26454)Vincent Petry2016-10-242-1/+54
|
* Merge pull request #26409 from ↵Vincent Petry2016-10-192-3/+3
|\ | | | | | | | | owncloud/stable9-36d6f3ba8b7b7db8f4d8b2a70504fd184a30cc50 [stable9] Escape special characters (#25429)
| * [stable9] Escape special characters (#25429)Aaron Wood2016-10-192-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Escape LIKE parameter * Escape LIKE parameter * Escape LIKE parameter * Escape LIKE parameter * Escape LIKE parameter * Use correct method in the AbstractMapping class * Change the getNamesBySearch method so that input can be properly escaped while still supporting matches * Don't escape hardcoded wildcard
* | Fix post_unshareFromSelf hook parameter formatVincent Petry2016-10-171-2/+2
|/ | | | | | | | | | When unsharing from self in a group share situation, the share items passed to the post_unshareFromSelf hook were using the wrong format in which the attribute names (ex: "share_type") have non camel-case format. This fix makes sure that in group sharing case we use the correct format. It looks like the code was already producing it but in array_merge it was not using it and adding the unprocessed one.
* [stable9] Fix mimetype detection inside hidden folders (#26138) (#26152)Thomas Müller2016-09-201-2/+4
|
* Merge pull request #26049 from owncloud/stable9-cath-needs-upgrade-non-cliVincent Petry2016-09-071-0/+6
|\ | | | | [Stable9] Pass web requests to occ controller if upgrade is needed
| * Pass web requests to occ controller if upgrade is neededVictor Dubiniuk2016-09-071-0/+6
| |
* | Fix failing preview unit tests (#26039)Thomas Müller2016-09-071-1/+1
|/
* Fix redirection taking care of protocol and port (#25957)VicDeo2016-08-291-1/+1
|
* [9.0] Best practice through out the web speak of a max avatar image size ↵Thomas Müller2016-08-221-1/+1
| | | | | | | | | | of… (#25857) * Best practice through out the web speak of a max avatar image size of 96 pixels * Respect size argument THX @felixboehm
* Merge pull request #25832 from owncloud/stable9-dont-decrypt-shared-filesVincent Petry2016-08-181-0/+4
|\ | | | | [stable9] Don't decrypt shared files
| * Take from ↵Thomas Müller2016-08-171-0/+4
| | | | | | | | https://github.com/nextcloud/server/pull/608/commits/351cab6bce41b53f9efd4ba9aed4e7435f843691 - THX @schiessle
* | Merge pull request #25836 from owncloud/stable9_nobodyifnocontentVincent Petry2016-08-181-5/+11
|\ \ | | | | | | [stable9] 204 and 304 must not have a body, see https://tools.ietf.org/html/rfc7230#section-3.3
| * | 204 and 304 must not have a body, see ↵Jörn Friedrich Dreyer2016-08-171-5/+11
| |/ | | | | | | https://tools.ietf.org/html/rfc7230#section-3.3
* | Merge pull request #25842 from ↵Vincent Petry2016-08-171-8/+6
|\ \ | | | | | | | | | | | | owncloud/stable9-fix-unmerged-shares-repair-betterregexp [stable9] Improve regexp to detect duplicate folders when repairing unmerged sares
| * | Improve regexp to detect duplicate folders when repairing unmerged sharesVincent Petry2016-08-171-8/+6
| |/
* / map oracle driver options to params (#25801)Jörn Friedrich Dreyer2016-08-171-0/+4
|/
* [stable9] Merge pull request #25652 from owncloud/fix-getQuota-on-nullVincent Petry2016-08-161-5/+8
| | | | Ensure the user exists before calling a method on it
* Fix unmerged shares repair with mixed group and direct sharesVincent Petry2016-08-131-3/+13
| | | | | | | Whenever a group share is created after a direct share, the stime order needs to be properly considered in the repair routine, considering that the direct user share is appended to the $subShares array and breaking its order.
* Improve file_target finding logic when repairing unmerged sharesVincent Petry2016-08-131-1/+39
| | | | | | | Pick the most recent subshare that has no parenthesis from duplication which should match whichever name the user picked last. If all subshares have duplicate parenthesis names, use the least recent group share's target instead.
* Don't bother repairing unmerged shares when coming from OC 8.2Vincent Petry2016-08-131-1/+1
| | | | | This would slow down the upgrade needlessly as there is no repair to be done.
* Ignore file_target when grouping sharesVincent Petry2016-08-131-3/+5
|
* Fix RepairUnmergedShares to not skip valid repair casesVincent Petry2016-08-131-11/+16
| | | | | | The repair step was a bit overeager to skip repairing so it missed the case where a group share exists without subshares but with an additional direct user share.
* Adjust RepairUnmergedShares version checkVincent Petry2016-08-131-1/+1
|
* Fix grouping of received shares in MountProviderVincent Petry2016-08-132-8/+14
| | | | | | | | | Added flag to enforce grouping of received shares even when the method is called for a user different than the current one. This can happen at sharing time whenever the recipient's FS is being setup from the sharer's call. This fixes duplicated received folders for new shares.
* Add repair step for unmerged sharesVincent Petry2016-08-132-0/+333
|
* [stable9] backport of #23728 (#25491)Michael Stingl2016-08-121-1/+13
| | | Sanitize more data in config report
* [stable9] getJailedPath expects $path to have a trailing / (#25703) (#25738)Thomas Müller2016-08-121-0/+3
| | | | | * getJailedPath expects $path to have a trailing / - fixes #25464 * Adding test case for getPathById including a jailed cache where root is just empty
* [stable9] Use explode() instead of split() - fixes #25483 (#25488) (#25500)Thomas Müller2016-07-201-1/+1
|
* [stable9] Adding certificate revocation list and validate if the app ↵Vincent Petry2016-07-132-3/+23
| | | | | | | | certificate is revoked (#25469) * Adding certificate revocation list and validate if the app certificate is revoked * Check integrity of a signed app in any case on installation
* [stable9] Workaround to check htaccess in case of redirects (#25435)Vincent Petry2016-07-131-1/+2
| | | | | | | | | | | | | | | * Workaround to check htaccess in case of redirects In some setups, the web server will redirect any call to "data/" to the main page. This causes the XHR to return the 200 HTTP status code and the body contains the HTML page of the main page / files app. This fix improves the htaccess failure detection by adding a known string inside the test file "htaccesstest.txt". If we are able to find this string, it means that the web server didn't block access to that file. * Fix setup check unit test (#25439)
* fix swift primary object store test (#25281) (#25391)Thomas Müller2016-07-071-1/+1
| | | | | | | | | | | | * 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.
* [stable9] Use named parameter instead of direct value for system tags search ↵Thomas Müller2016-07-071-1/+1
| | | | param (#25380) (#25396)
* Bypass upgrade page when occ controller is requested (#25363)VicDeo2016-07-061-3/+15
|
* Merge pull request #25343 from owncloud/stable9-revertrepairrevertVincent Petry2016-07-062-0/+112
|\ | | | | Revert "Remove repair steps for broken updater repair"
| * Revert "Remove repair steps for broken updater repair"Vincent Petry2016-07-042-0/+112
| | | | | | | | This reverts commit 58ed5b9328e9e12dd4319c0730202f385ca0dc5d.
* | Merge pull request #25360 from owncloud/stable9-backportshareownerfixVincent Petry2016-07-061-18/+18
|\ \ | | | | | | [stable9] Change order of share creation validation
| * | Change order of share creation validationVincent Petry2016-07-051-18/+18
| |/ | | | | | | | | | | | | Makes sure that the share owner is set before entering the checks that need it. Partial backport of afa37d3
* / occ web executor (#24957)VicDeo2016-07-012-4/+18
|/ | | | | | | | | | | | * Initial web executor * Fix PHPDoc Fix broken integration test OccControllerTests do not require database access - moch them all! Kill unused sprintf
* Fix OC_Helper::rmdirr for nested symlinks (#25255)VicDeo2016-07-011-1/+3
|
* [stable9] Fix decrypt message stable9 (#25188)Thomas Müller2016-07-011-6/+12
| | | | | | | | | | | | | | | | | * 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
* Merge pull request #25165 from owncloud/stable9-capped-user-cacheVincent Petry2016-06-201-2/+4
|\ | | | | [stable9] Capped cache for user config
| * Capped cache for user configJörn Friedrich Dreyer2016-06-171-2/+4
| |
* | Merge pull request #25160 from owncloud/fix-oracle-endless-loop-stable9Vincent Petry2016-06-171-0/+5
|\ \ | |/ |/| Do not recurse link share fetching
| * Do not recurse link share fetchingRoeland Jago Douma2016-06-171-0/+5
| | | | | | | | * Might fix an issue on oracle
* | Revert "[stable9] Remove shares of the root folder" (#25157)Vincent Petry2016-06-172-147/+0
|/
* Remove shares of the root folder (#25138)Vincent Petry2016-06-172-0/+147
|
* Merge pull request #25149 from owncloud/backport25146Vincent Petry2016-06-161-1/+1
|\ | | | | –emit correct signal when disabling an app
| * –emit correct signal when disabling an appJörn Friedrich Dreyer2016-06-161-1/+1
| |
* | Capped cache for cache info in UserMountCacheVincent Petry2016-06-151-3/+14
| |