Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #19574 from ↵ | Thomas Müller | 2015-10-05 | 1 | -12/+23 |
|\ | | | | | | | | | owncloud/fix-sharing-tests-assuming-empty-share-table Clear the shares after the test like storages and files | ||||
| * | Clear the shares after the test like storages and files | Joas Schilling | 2015-10-05 | 1 | -12/+23 |
| | | |||||
* | | Merge pull request #19416 from owncloud/node-hook-connector | Thomas Müller | 2015-10-05 | 1 | -0/+176 |
|\ \ | |/ |/| | pass view hooks trough to the node hooks | ||||
| * | remove unused use | Robin Appelman | 2015-09-28 | 1 | -1/+0 |
| | | |||||
| * | Add hook connector to connect view and node hooks | Robin Appelman | 2015-09-28 | 1 | -0/+177 |
| | | |||||
* | | Merge pull request #19272 from owncloud/mimetypes-enhanced | Thomas Müller | 2015-10-02 | 1 | -0/+72 |
|\ \ | | | | | | | Introduce a few new mimetypes for code, fix recursive mimetype aliases | ||||
| * | | Added mimetype repair step | Roeland Jago Douma | 2015-10-02 | 1 | -0/+72 |
| | | | | | | | | | | | | * Version number increased | ||||
* | | | Merge pull request #19525 from ↵ | Robin Appelman | 2015-10-02 | 1 | -19/+112 |
|\ \ \ | |/ / |/| | | | | | | | | owncloud/share-preventmovemountpointintosharedfolder Prevent moving mount point into already shared folder (outgoing) | ||||
| * | | Prevent moving mount point into already shared folder (outgoing) | Vincent Petry | 2015-10-02 | 1 | -19/+112 |
| | | | | | | | | | | | | | | | | | | | | | | | | It is already not allowed to share a folder containing mount points / incoming shares. This fixes an issue that made it possible to bypass the check by moving the incoming share mount point into an existing outgoing share folder. | ||||
* | | | [l10n] remove unused static methods | Morris Jobke | 2015-10-02 | 1 | -4/+2 |
| | | | |||||
* | | | Merge pull request #19510 from owncloud/json-grouplist-sharing-exclude | Thomas Müller | 2015-10-02 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | save excluded groups in json format | ||||
| * | | save excluded groups in json format - fixes #10983 | Thomas Müller | 2015-10-01 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #19463 from owncloud/fix_18132 | Thomas Müller | 2015-10-01 | 1 | -0/+23 |
|\ \ \ | | | | | | | | | encryption: versions should always use the keys of the original file, no need to … | ||||
| * | | | versions should always use the keys of the original file, no need to create ↵ | Bjoern Schiessle | 2015-10-01 | 1 | -0/+23 |
| | | | | | | | | | | | | | | | | new one | ||||
* | | | | Add tests | Robin Appelman | 2015-10-01 | 1 | -18/+56 |
| |/ / |/| | | |||||
* | | | Also delete all shares before the test, so the count matches | Joas Schilling | 2015-10-01 | 1 | -6/+18 |
| | | | |||||
* | | | Repair step to remove bogus expiration dates from non-link shares | Vincent Petry | 2015-10-01 | 1 | -0/+111 |
|/ / | |||||
* | | Merge pull request #19299 from owncloud/fixgetRawPathInfo | Thomas Müller | 2015-09-30 | 1 | -43/+44 |
|\ \ | | | | | | | Fix get raw path info, always return a string | ||||
| * | | use assertSame, add failing case | Jörn Friedrich Dreyer | 2015-09-23 | 1 | -43/+44 |
| | | | |||||
* | | | Merge pull request #19468 from owncloud/fix-36-vs-32-previews | Thomas Müller | 2015-09-30 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Change small thumbnails to 32 px | ||||
| * | | | Change small thumbnails to 32 px | Morris Jobke | 2015-09-30 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | * fixes #16913 * fixes issues in IE8 where the thumbnail is too big | ||||
* | | | | Merge pull request #19373 from owncloud/sidebar-preview-cover | Thomas Müller | 2015-09-30 | 1 | -0/+41 |
|\ \ \ \ | |/ / / |/| | | | Cover both width and height for the sidebar preview | ||||
| * | | | Cover both width and height for the sidebar preview | Robin Appelman | 2015-09-29 | 1 | -0/+41 |
| | | | | |||||
* | | | | cache result of \OCP\Util::needUpgrade() | Individual IT Services | 2015-09-29 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reduce calls of \OCP\Util::needUpgrade() where \OCP\Util::needUpgrade() is called we can call as well self::checkUpgrade and use the cached result In line 877 the call way unnecessary anyway because of the first part of the if statement move caching to \OCP\Util::needUpgrade renaming variable fixing testNeedUpgradeCore() cache result of checkUpgrade() in self::$needUpgrade reduce calls of \OCP\Util::needUpgrade() where \OCP\Util::needUpgrade() is called we can call as well self::checkUpgrade and use the cached result In line 877 the call way unnecessary anyway because of the first part of the if statement move caching to \OCP\Util::needUpgrade renaming variable fixing testNeedUpgradeCore() fix typo in variable name deleting tabs | ||||
* | | | | Add blob: scheme to default CSP policy | Lukas Reschke | 2015-09-29 | 4 | -56/+56 |
|/ / / | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/19438 | ||||
* | | | Merge pull request #18548 from owncloud/repair-mimetype-limitversion | Thomas Müller | 2015-09-28 | 1 | -1/+10 |
|\ \ \ | |_|/ |/| | | Repair mime types only when upgrading from OC 8.0 | ||||
| * | | Repair mime types only when upgrading from OC 8.0 | Vincent Petry | 2015-09-23 | 1 | -1/+10 |
| | | | |||||
* | | | rename config test to prevent autoloader issue | Robin Appelman | 2015-09-28 | 1 | -2/+4 |
| | | | |||||
* | | | Merge pull request #19346 from owncloud/drop-passwords-from-exception-log | Thomas Müller | 2015-09-25 | 1 | -0/+44 |
|\ \ \ | | | | | | | | | Remove passwords from logged exception stack traces | ||||
| * | | | Remove passwords from logged exception stack traces | Morris Jobke | 2015-09-24 | 1 | -0/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | * fixed #16318 * create logException in ILogger * add unit tests | ||||
* | | | | Merge pull request #19297 from owncloud/fix_19119 | Thomas Müller | 2015-09-25 | 1 | -0/+37 |
|\ \ \ \ | | | | | | | | | | | Do not blindy copy expiration date on reshare | ||||
| * | | | | Do not blindy copy expiration date on reshare | Roeland Jago Douma | 2015-09-25 | 1 | -0/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a file/folder is reshared we should not blindly copy the expiration date of the parent share. User/Group shares do not have expiration dates currently, and thus this is always set to null. Fixes #19119 * Added testcase | ||||
* | | | | | Move the filtering of sensitive data to the config class | Joas Schilling | 2015-09-25 | 1 | -9/+16 |
|/ / / / | |||||
* | | | | Merge pull request #19306 from owncloud/app-code-check-version | Thomas Müller | 2015-09-24 | 10 | -0/+127 |
|\ \ \ \ | |/ / / |/| | | | [App Code Check] add check for version and mandatory fields | ||||
| * | | | [App Code Check] add check for version and mandatory fields | Morris Jobke | 2015-09-24 | 10 | -0/+127 |
| | |/ | |/| | | | | | | | | | | * ref #17598 * including unit tests for mandatory fields/versions | ||||
* | | | Merge pull request #19335 from owncloud/phil-davis-view-typos | Thomas Müller | 2015-09-24 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | Comment typos in tests/lib/files/view.php | ||||
| * | | | Comment typos in tests/lib/files/view.php | Phil Davis | 2015-09-24 | 1 | -3/+3 |
| | | | | | | | | | | | | Correct a comment typo just introduced at line 892, plus another and some white space at EOL. | ||||
* | | | | only check if the user exists if a user was added as parameter | Bjoern Schiessle | 2015-09-24 | 1 | -6/+10 |
| | | | | |||||
* | | | | Merge pull request #19303 from owncloud/usecorrectvariable | Thomas Müller | 2015-09-24 | 1 | -0/+25 |
|\ \ \ \ | |/ / / |/| | | | Use correct variable | ||||
| * | | | add is* storage tests | Jörn Friedrich Dreyer | 2015-09-23 | 1 | -0/+25 |
| |/ / | |||||
* | | | Merge pull request #19326 from owncloud/issue-19314-querybuilder-set-null | Thomas Müller | 2015-09-24 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | Allow `set('column', 'null')` to work like in Doctrine's QueryBuilder | ||||
| * | | | Allow `set('column', 'null')` to work like in Doctrine | Joas Schilling | 2015-09-24 | 1 | -0/+4 |
| |/ / | |||||
* | | | Merge pull request #16479 from owncloud/core-fixgetrelativepathwrongmatches | Thomas Müller | 2015-09-24 | 1 | -28/+103 |
|\ \ \ | |/ / |/| | | Prevent wrong matches in getRelativePath | ||||
| * | | Add more tests for relativePath | Joas Schilling | 2015-09-22 | 1 | -23/+91 |
| | | | |||||
| * | | Prevent wrong matches in getRelativePath | Vincent Petry | 2015-09-22 | 1 | -10/+17 |
| | | | | | | | | | | | | | | | Before this fix, the root "/files" with path "/files_trashbin" would return "_trashbin" as relative path... | ||||
* | | | Merge pull request #19236 from owncloud/call_dot_directories_function | Thomas Müller | 2015-09-23 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | Replaces if ($file === '.' || $file === '..') by public function call isIgnoredDir | ||||
| * | | | Replaces if ($file === '.' || $file === '..') by ↵ | Martin | 2015-09-22 | 2 | -2/+2 |
| | |/ | |/| | | | | | | | if(\OC\Files\Filesystem::isIgnoredDir($file)). Eases to find where this operation is used. | ||||
* | | | Merge pull request #19247 from owncloud/fix_locking_copy_operation | Thomas Müller | 2015-09-23 | 1 | -0/+43 |
|\ \ \ | |/ / |/| | | locking: handle exceptions correctly during copy operation | ||||
| * | | catch excexptions during the copy operation and make sure that we free the ↵ | Bjoern Schiessle | 2015-09-22 | 1 | -0/+43 |
| |/ | | | | | | | lock correctly | ||||
* | | Move mimetype files into /resources/config/ | Lukas Reschke | 2015-09-22 | 1 | -31/+35 |
| | |