Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix failing preview unit tests (#26039) | Thomas Müller | 2016-09-07 | 1 | -1/+1 |
| | |||||
* | [9.0] Best practice through out the web speak of a max avatar image size ↵ | Thomas Müller | 2016-08-22 | 1 | -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-files | Vincent Petry | 2016-08-18 | 1 | -0/+4 |
|\ | | | | | [stable9] Don't decrypt shared files | ||||
| * | Take from ↵ | Thomas Müller | 2016-08-17 | 1 | -0/+4 |
| | | | | | | | | https://github.com/nextcloud/server/pull/608/commits/351cab6bce41b53f9efd4ba9aed4e7435f843691 - THX @schiessle | ||||
* | | Merge pull request #25842 from ↵ | Vincent Petry | 2016-08-17 | 1 | -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 shares | Vincent Petry | 2016-08-17 | 1 | -8/+6 |
| |/ | |||||
* / | map oracle driver options to params (#25801) | Jörn Friedrich Dreyer | 2016-08-17 | 1 | -0/+4 |
|/ | |||||
* | [stable9] Merge pull request #25652 from owncloud/fix-getQuota-on-null | Vincent Petry | 2016-08-16 | 1 | -5/+8 |
| | | | | Ensure the user exists before calling a method on it | ||||
* | Fix unmerged shares repair with mixed group and direct shares | Vincent Petry | 2016-08-13 | 1 | -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 shares | Vincent Petry | 2016-08-13 | 1 | -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.2 | Vincent Petry | 2016-08-13 | 1 | -1/+1 |
| | | | | | This would slow down the upgrade needlessly as there is no repair to be done. | ||||
* | Ignore file_target when grouping shares | Vincent Petry | 2016-08-13 | 1 | -3/+5 |
| | |||||
* | Fix RepairUnmergedShares to not skip valid repair cases | Vincent Petry | 2016-08-13 | 1 | -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 check | Vincent Petry | 2016-08-13 | 1 | -1/+1 |
| | |||||
* | Fix grouping of received shares in MountProvider | Vincent Petry | 2016-08-13 | 1 | -6/+11 |
| | | | | | | | | | 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 shares | Vincent Petry | 2016-08-13 | 2 | -0/+333 |
| | |||||
* | [stable9] backport of #23728 (#25491) | Michael Stingl | 2016-08-12 | 1 | -1/+13 |
| | | | Sanitize more data in config report | ||||
* | [stable9] getJailedPath expects $path to have a trailing / (#25703) (#25738) | Thomas Müller | 2016-08-12 | 1 | -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üller | 2016-07-20 | 1 | -1/+1 |
| | |||||
* | [stable9] Adding certificate revocation list and validate if the app ↵ | Vincent Petry | 2016-07-13 | 2 | -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 Petry | 2016-07-13 | 1 | -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üller | 2016-07-07 | 1 | -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üller | 2016-07-07 | 1 | -1/+1 |
| | | | | param (#25380) (#25396) | ||||
* | Merge pull request #25343 from owncloud/stable9-revertrepairrevert | Vincent Petry | 2016-07-06 | 2 | -0/+112 |
|\ | | | | | Revert "Remove repair steps for broken updater repair" | ||||
| * | Revert "Remove repair steps for broken updater repair" | Vincent Petry | 2016-07-04 | 2 | -0/+112 |
| | | | | | | | | This reverts commit 58ed5b9328e9e12dd4319c0730202f385ca0dc5d. | ||||
* | | Merge pull request #25360 from owncloud/stable9-backportshareownerfix | Vincent Petry | 2016-07-06 | 1 | -18/+18 |
|\ \ | | | | | | | [stable9] Change order of share creation validation | ||||
| * | | Change order of share creation validation | Vincent Petry | 2016-07-05 | 1 | -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) | VicDeo | 2016-07-01 | 1 | -1/+2 |
|/ | | | | | | | | | | | | * 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) | VicDeo | 2016-07-01 | 1 | -1/+3 |
| | |||||
* | [stable9] Fix decrypt message stable9 (#25188) | Thomas Müller | 2016-07-01 | 1 | -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-cache | Vincent Petry | 2016-06-20 | 1 | -2/+4 |
|\ | | | | | [stable9] Capped cache for user config | ||||
| * | Capped cache for user config | Jörn Friedrich Dreyer | 2016-06-17 | 1 | -2/+4 |
| | | |||||
* | | Merge pull request #25160 from owncloud/fix-oracle-endless-loop-stable9 | Vincent Petry | 2016-06-17 | 1 | -0/+5 |
|\ \ | |/ |/| | Do not recurse link share fetching | ||||
| * | Do not recurse link share fetching | Roeland Jago Douma | 2016-06-17 | 1 | -0/+5 |
| | | | | | | | | * Might fix an issue on oracle | ||||
* | | Revert "[stable9] Remove shares of the root folder" (#25157) | Vincent Petry | 2016-06-17 | 2 | -147/+0 |
|/ | |||||
* | Remove shares of the root folder (#25138) | Vincent Petry | 2016-06-17 | 2 | -0/+147 |
| | |||||
* | Merge pull request #25149 from owncloud/backport25146 | Vincent Petry | 2016-06-16 | 1 | -1/+1 |
|\ | | | | | emit correct signal when disabling an app | ||||
| * | emit correct signal when disabling an app | Jörn Friedrich Dreyer | 2016-06-16 | 1 | -1/+1 |
| | | |||||
* | | Capped cache for cache info in UserMountCache | Vincent Petry | 2016-06-15 | 1 | -3/+14 |
| | | |||||
* | | Use capped cache for encryption's user access list | Vincent Petry | 2016-06-13 | 1 | -0/+3 |
| | | |||||
* | | Repair job to fix permissions for avatars (#25068) | Roeland Douma | 2016-06-13 | 2 | -0/+110 |
| | | | | | | | | | | | | | | | | | | | | Backport of #24898 Cherry-picked: 1b66db72d916a763b1c22613b9df5c42e93593a8 60225284f3b8ef947f67bbe168b12dca867d6f3d 28d9ad2817b744bcef35a9259f65eb56b0b2ae78 But manually since we renamed stuff and the repair procedures changed | ||||
* | | Merge pull request #25045 from owncloud/stable9-admin-datadircheck-fix | Vincent Petry | 2016-06-09 | 1 | -13/+24 |
|\ \ | | | | | | | [stable9] Use temporary htaccesstest.txt for data dir security check | ||||
| * | | Use temporary htaccesstest.txt for data dir security check | Vincent Petry | 2016-06-09 | 1 | -13/+24 |
| | | | |||||
* | | | skip scanning for a user when the user is not setup yet | Robin Appelman | 2016-06-09 | 1 | -1/+6 |
|/ / | |||||
* | | Fix update from 9.0.0 and 9.0.1 (#24854) | VicDeo | 2016-06-07 | 2 | -0/+65 |
| | | |||||
* | | Allow public upload when the quota is unlimited (#24988) | Joas Schilling | 2016-06-06 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #24921 from owncloud/stable9-backport-24795 | Vincent Petry | 2016-06-02 | 1 | -1/+2 |
|\ \ | | | | | | | [9.0] Allow opening the password reset link in a new window when … | ||||
| * | | Allow opening the password reset link in a new window when its a URL | Joas Schilling | 2016-06-01 | 1 | -1/+2 |
| | | | |||||
* | | | Merge pull request #24944 from owncloud/fix_21173_stable9 | Vincent Petry | 2016-06-02 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | stable9: normalize path in getInternalPath | ||||
| * | | | normalize path in getInternalPath | Georg Ehrke | 2016-06-01 | 1 | -0/+1 |
| |/ / |