Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Depreatace OC_Util::getUrlContent | Roeland Jago Douma | 2015-05-18 | 1 | -0/+1 |
| | | | | It is just a wrapper and the other functions are deprecated already | ||||
* | 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 |
| | | |||||
* | | Merge pull request #16119 from owncloud/fix-16056 | Thomas Müller | 2015-05-07 | 1 | -11/+14 |
|\ \ | | | | | | | [HHVM] Throw RunTimeException from OC\AppFramework\App::buildAppNamespace() | ||||
| * | | Check return value of OC_App::getAppPath() and verify info.xml exists. | Andreas Fischer | 2015-05-06 | 1 | -11/+14 |
| | | | |||||
* | | | Merge pull request #15628 from owncloud/enc_fix_rename | Björn Schießle | 2015-05-06 | 2 | -7/+108 |
|\ \ \ | | | | | | | | | Encryption - fix moving/copying files between storages | ||||
| * | | | Fix missing types on doc block and deduplicate the method name | Joas Schilling | 2015-05-06 | 1 | -4/+4 |
| | | | | |||||
| * | | | update 'encrypted'-flag in file cache according to the storage settings | Bjoern Schiessle | 2015-05-06 | 2 | -6/+47 |
| | | | | |||||
| * | | | move/copy from storage | Bjoern Schiessle | 2015-05-06 | 1 | -7/+67 |
| | |/ | |/| | |||||
* | | | Merge pull request #16099 from labkode/prevent-preview-hooks | Joas Schilling | 2015-05-06 | 1 | -1/+3 |
|\ \ \ | |/ / |/| | | Do not trigger preview hooks if enable_previews is false | ||||
| * | | Do not trigger preview hooks if enable_previews is false | Hugo Gonzalez Labrador | 2015-05-06 | 1 | -10/+10 |
| | | | |||||
| * | | Do not trigger preview hooks if enable_previews is false | Hugo Gonzalez Labrador | 2015-05-06 | 1 | -7/+9 |
| | | | |||||
* | | | unit tests | Bjoern Schiessle | 2015-05-06 | 1 | -1/+1 |
| | | | |||||
* | | | check if encryption is enbaled before we start moving keys | Bjoern Schiessle | 2015-05-06 | 2 | -34/+43 |
| |/ |/| | |||||
* | | Merge pull request #16067 from owncloud/verbosity-in-app-code-check | Lukas Reschke | 2015-05-06 | 1 | -1/+1 |
|\ \ | | | | | | | Add verbosity option to app:check-code | ||||
| * | | Add verbosity option to app:check-code | Morris Jobke | 2015-05-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | * by default only lists files with errors * option -v lists all files even if there are no errors | ||||
* | | | Merge pull request #16070 from owncloud/enc_update_file_cache_on_copy | Morris Jobke | 2015-05-06 | 1 | -0/+4 |
|\ \ \ | |_|/ |/| | | make sure that we keep the correct encrypted-flag and the (unencrypted)size | ||||
| * | | make sure that we keep the correct encrypted-flag and the (unencrypted)size ↵ | Bjoern Schiessle | 2015-05-05 | 1 | -0/+4 |
| |/ | | | | | | | if a file gets copied | ||||
* | | Merge pull request #16072 from owncloud/phpdoc-cache | Morris Jobke | 2015-05-06 | 4 | -30/+139 |
|\ \ | | | | | | | improve phpdoc of cache classes | ||||
| * | | improve phpdoc of cache classes | Robin Appelman | 2015-05-05 | 4 | -30/+139 |
| |/ |