Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #16085 from owncloud/encryption-module-rename | Thomas Müller | 2015-05-19 | 2 | -2/+2 |
|\ | | | | | rename to 'Default encryption module' | ||||
| * | rename to 'Default encryption module' | Jan-Christoph Borchardt | 2015-05-06 | 2 | -2/+2 |
| | | |||||
* | | Merge pull request #16293 from owncloud/xcache | Morris Jobke | 2015-05-19 | 1 | -1/+1 |
|\ \ | | | | | | | Mute XCache error when trying to clear the opcode cache | ||||
| * | | Mute XCache error when trying to clear the opcode cache | Lukas Reschke | 2015-05-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | From https://github.com/owncloud/core/issues/16287: > This is caused by XCache at https://github.com/owncloud/core/blob/8e59d4c64b48ed7daeebb714e11213f7a22b5740/lib/private/util.php#L1276 where we are trying to reset the opcode cache with `XC_TYPE_PHP`. > I suspect that while XCache is installed its opcode component is not used. Unfortunately, the XCache API is not really properly documented and thus I don't know what API we would have to call to check whether the `XC_TYPE_PHP` cache is populated. In fact, there is an [open XCache bug](http://xcache.lighttpd.net/ticket/176) since 7 years that discusses this problem and is likely to never get fixed since XCache is abandonware. Fixes https://github.com/owncloud/core/issues/16287 | ||||
* | | | Merge pull request #16412 from owncloud/jknockaert-patch-1 | Björn Schießle | 2015-05-18 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | fix #16356 | ||||
| * | | | fix #16356 | jknockaert | 2015-05-18 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #16399 from owncloud/enc_rmdir_fix | Clark Tomlinson | 2015-05-18 | 1 | -2/+6 |
|\ \ \ \ | | | | | | | | | | | [encryption] only try to delete file keys if it is a valid path | ||||
| * | | | | only try to delete file keys if it is a valid path | Bjoern Schiessle | 2015-05-18 | 1 | -2/+6 |
| | | | | | |||||
* | | | | | Merge pull request #16403 from owncloud/fix-command-loading | Thomas Müller | 2015-05-18 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Only load commands of enabled apps | ||||
| * | | | | Only load commands of enabled apps | Morris Jobke | 2015-05-18 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #15980 from owncloud/jknockaert-patch-1 | Björn Schießle | 2015-05-18 | 1 | -9/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | fix bug #15973 | ||||
| * | | | | | fix #15973 | jknockaert | 2015-04-30 | 1 | -9/+7 |
| | | | | | | | | | | | | | | | | | | Rework of stream_seek handling; there where basically two bugs: 1. seeking to the end of the current file would fail (with SEEK_SET); and 2. if seeking to an undefined position (outside 0,unencryptedSize) then newPosition was not defined. I used the opportunity to simplify the code. | ||||
* | | | | | | Merge pull request #16398 from owncloud/fix-php-docv8.1.0beta2 | Joas Schilling | 2015-05-18 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix PHPDoc of public interface ILockingProvider | ||||
| * | | | | | | Fix PHPDoc of public interface ILockingProvider | Morris Jobke | 2015-05-18 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #16243 from owncloud/error_if_download_failed | Vincent Petry | 2015-05-18 | 5 | -41/+105 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | redirect to error page if download failed | ||||
| * | | | | | a new approach to display the error message | Bjoern Schiessle | 2015-05-18 | 5 | -41/+105 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #16364 from owncloud/add-warning-webdav | Morris Jobke | 2015-05-18 | 1 | -3/+15 |
|\ \ \ \ \ | |/ / / / |/| | | | | Add notice that WebDAV interface is not intended for browsers | ||||
| * | | | | Add notice that WebDAV interface is not intended for browsers | Lukas Reschke | 2015-05-15 | 1 | -3/+15 |
| | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/16359 | ||||
* | | | | | Merge pull request #16176 from owncloud/fix-provisioning-api-set-quota | Vincent Petry | 2015-05-15 | 1 | -0/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | Validate the quota value to be a correct value | ||||
| * | | | | | Pure numbers are returned as bytes right away | Thomas Müller | 2015-05-08 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | Validate the quota value to be a correct value | Thomas Müller | 2015-05-07 | 1 | -0/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #16292 from owncloud/webdav-storage-fireprehooks | Joas Schilling | 2015-05-15 | 1 | -6/+28 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fire prehooks when uploading directly to storage | ||||
| * | | | | | | Fire prehooks when uploading directly to storage | Vincent Petry | 2015-05-13 | 1 | -6/+28 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #16323 from owncloud/enc_webdav_fixes | Thomas Müller | 2015-05-15 | 3 | -17/+27 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | some encryption fixes | ||||
| * | | | | | | delete all file keys doesn't need the encryption module as parameter; ↵ | Bjoern Schiessle | 2015-05-13 | 3 | -17/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | implement rmdir; getFileKeyDir should also work for part files and complete directories | ||||
* | | | | | | | Merge pull request #16342 from owncloud/fix_16338 | Lukas Reschke | 2015-05-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | fix preview hooks, enable_previews default is true | ||||
| * | | | | | | | fix preview hooks, enable_previews default is true | Georg Ehrke | 2015-05-13 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-15 | 4 | -0/+8 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #16276 from owncloud/dav-quota-root | Robin Appelman | 2015-05-13 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | fix webdav quota check for the root of the dav endpoint | ||||
| * | | | | | | fix webdav quota check for the root of the dav endpoint | Robin Appelman | 2015-05-12 | 1 | -0/+3 |
| | | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-13 | 4 | -2/+40 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #16269 from owncloud/master-fix-16179 | Morris Jobke | 2015-05-12 | 1 | -2/+6 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Check if cURL supports the desired features | ||||
| * | | | | | Check if cURL supports the desired features | Lukas Reschke | 2015-05-12 | 1 | -2/+6 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | Older versions of cURL that are unfortunately still bundled by distributors don't support these features which will result in errors and other possibly unpredictable behaviour. Fixes https://github.com/owncloud/core/issues/16179 for master – stable8 requires another patch. | ||||
* | | | | | Merge pull request #16228 from owncloud/enc_fix_restore | Björn Schießle | 2015-05-12 | 4 | -8/+44 |
|\ \ \ \ \ | |/ / / / |/| | | | | use hooks to update encryption keys | ||||
| * | | | | use hooks to update encryption keys instead of the storage wrapper if a file ↵ | Bjoern Schiessle | 2015-05-11 | 4 | -8/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gets renamed/restored, as long as we are in the storage wrapper the file cache isn't up-to-date | ||||
* | | | | | Merge pull request #16233 from owncloud/enc_fix_check_if_file_is_excluded | Morris Jobke | 2015-05-12 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | fix check if a file is excluded from encryption | ||||
| * | | | | | fix check if file is excluded from encryption | Bjoern Schiessle | 2015-05-11 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #16234 from ↵ | Morris Jobke | 2015-05-11 | 1 | -11/+16 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-16206-fix-app-config-parallel-insert Issue 16206 fix app config parallel insert | ||||
| * | | | | | Use insertIfNotExists to avoid problems with parallel calls | Joas Schilling | 2015-05-11 | 1 | -11/+16 |
| | | | | | | |||||
* | | | | | | Merge pull request #16208 from owncloud/fix-language-selection-sr-latin | Thomas Müller | 2015-05-11 | 1 | -0/+11 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Some locales need to be converted to be compliant with CLDR | ||||
| * | | | | | Some locales need to be converted to be compliant with CLDR | Thomas Müller | 2015-05-08 | 1 | -0/+11 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-11 | 2 | -2/+4 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-10 | 4 | -0/+8 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-09 | 2 | -2/+2 |
|/ / / / / | |||||
* | | | | | Merge pull request #16124 from ↵ | Lukas Reschke | 2015-05-08 | 1 | -0/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-16109-fix-share-email-with-shared-folder Fix the share mail notification when the item is in a folder | ||||
| * | | | | | Fix the share mail notification when the item is in a folder | Joas Schilling | 2015-05-06 | 1 | -0/+5 |
| | | | | | | |||||
* | | | | | | Merge pull request #16146 from ↵ | Lukas Reschke | 2015-05-08 | 1 | -1/+7 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | owncloud/issue-16103-hide-module-already-exists-on-enable-app Avoid the log entry with the ModuleAlreadyExists exception when enabl… | ||||
| * | | | | | Avoid the log entry with the ModuleAlreadyExists exception when enabling the app | Joas Schilling | 2015-05-07 | 1 | -1/+7 |
| | |/ / / | |/| | | | |||||
* / | | | | use cross storage move when renaming the part file during webdav put | Robin Appelman | 2015-05-07 | 1 | -10/+12 |
|/ / / / | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-07 | 50 | -94/+4 |
| | | | |