aboutsummaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Depreatace OC_Util::getUrlContentRoeland Jago Douma2015-05-181-0/+1
| | | | It is just a wrapper and the other functions are deprecated already
* Merge pull request #16176 from owncloud/fix-provisioning-api-set-quotaVincent Petry2015-05-151-0/+5
|\ | | | | Validate the quota value to be a correct value
| * Pure numbers are returned as bytes right awayThomas Müller2015-05-081-0/+3
| |
| * Validate the quota value to be a correct valueThomas Müller2015-05-071-0/+2
| |
* | Merge pull request #16292 from owncloud/webdav-storage-fireprehooksJoas Schilling2015-05-151-6/+28
|\ \ | | | | | | Fire prehooks when uploading directly to storage
| * | Fire prehooks when uploading directly to storageVincent Petry2015-05-131-6/+28
| | |
* | | Merge pull request #16323 from owncloud/enc_webdav_fixesThomas Müller2015-05-153-17/+27
|\ \ \ | | | | | | | | some encryption fixes
| * | | delete all file keys doesn't need the encryption module as parameter; ↵Bjoern Schiessle2015-05-133-17/+27
| | | | | | | | | | | | | | | | implement rmdir; getFileKeyDir should also work for part files and complete directories
* | | | Merge pull request #16342 from owncloud/fix_16338Lukas Reschke2015-05-151-1/+1
|\ \ \ \ | | | | | | | | | | fix preview hooks, enable_previews default is true
| * | | | fix preview hooks, enable_previews default is trueGeorg Ehrke2015-05-131-1/+1
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-154-0/+8
|/ / / /
* | | | Merge pull request #16276 from owncloud/dav-quota-rootRobin Appelman2015-05-131-0/+3
|\ \ \ \ | |/ / / |/| | | fix webdav quota check for the root of the dav endpoint
| * | | fix webdav quota check for the root of the dav endpointRobin Appelman2015-05-121-0/+3
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-134-2/+40
| |/ / |/| |
* | | Merge pull request #16269 from owncloud/master-fix-16179Morris Jobke2015-05-121-2/+6
|\ \ \ | | | | | | | | Check if cURL supports the desired features
| * | | Check if cURL supports the desired featuresLukas Reschke2015-05-121-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_restoreBjörn Schießle2015-05-124-8/+44
|\ \ \ | |/ / |/| | use hooks to update encryption keys
| * | use hooks to update encryption keys instead of the storage wrapper if a file ↵Bjoern Schiessle2015-05-114-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_excludedMorris Jobke2015-05-121-1/+1
|\ \ \ | | | | | | | | fix check if a file is excluded from encryption
| * | | fix check if file is excluded from encryptionBjoern Schiessle2015-05-111-1/+1
| |/ /
* | | Merge pull request #16234 from ↵Morris Jobke2015-05-111-11/+16
|\ \ \ | | | | | | | | | | | | | | | | owncloud/issue-16206-fix-app-config-parallel-insert Issue 16206 fix app config parallel insert
| * | | Use insertIfNotExists to avoid problems with parallel callsJoas Schilling2015-05-111-11/+16
| | | |
* | | | Merge pull request #16208 from owncloud/fix-language-selection-sr-latinThomas Müller2015-05-111-0/+11
|\ \ \ \ | |/ / / |/| | | Some locales need to be converted to be compliant with CLDR
| * | | Some locales need to be converted to be compliant with CLDRThomas Müller2015-05-081-0/+11
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-112-2/+4
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-104-0/+8
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-092-2/+2
|/ / /
* | | Merge pull request #16124 from ↵Lukas Reschke2015-05-081-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 folderJoas Schilling2015-05-061-0/+5
| | | |
* | | | Merge pull request #16146 from ↵Lukas Reschke2015-05-081-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 appJoas Schilling2015-05-071-1/+7
| | |/ | |/|
* / | use cross storage move when renaming the part file during webdav putRobin Appelman2015-05-071-10/+12
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2015-05-0750-94/+4
| |
* | Merge pull request #16119 from owncloud/fix-16056Thomas Müller2015-05-071-11/+14
|\ \ | | | | | | [HHVM] Throw RunTimeException from OC\AppFramework\App::buildAppNamespace()
| * | Check return value of OC_App::getAppPath() and verify info.xml exists.Andreas Fischer2015-05-061-11/+14
| | |
* | | Merge pull request #15628 from owncloud/enc_fix_renameBjörn Schießle2015-05-062-7/+108
|\ \ \ | | | | | | | | Encryption - fix moving/copying files between storages
| * | | Fix missing types on doc block and deduplicate the method nameJoas Schilling2015-05-061-4/+4
| | | |
| * | | update 'encrypted'-flag in file cache according to the storage settingsBjoern Schiessle2015-05-062-6/+47
| | | |
| * | | move/copy from storageBjoern Schiessle2015-05-061-7/+67
| | |/ | |/|
* | | Merge pull request #16099 from labkode/prevent-preview-hooksJoas Schilling2015-05-061-1/+3
|\ \ \ | |/ / |/| | Do not trigger preview hooks if enable_previews is false
| * | Do not trigger preview hooks if enable_previews is falseHugo Gonzalez Labrador2015-05-061-10/+10
| | |
| * | Do not trigger preview hooks if enable_previews is falseHugo Gonzalez Labrador2015-05-061-7/+9
| | |
* | | unit testsBjoern Schiessle2015-05-061-1/+1
| | |
* | | check if encryption is enbaled before we start moving keysBjoern Schiessle2015-05-062-34/+43
| |/ |/|
* | Merge pull request #16067 from owncloud/verbosity-in-app-code-checkLukas Reschke2015-05-061-1/+1
|\ \ | | | | | | Add verbosity option to app:check-code
| * | Add verbosity option to app:check-codeMorris Jobke2015-05-051-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_copyMorris Jobke2015-05-061-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 Schiessle2015-05-051-0/+4
| |/ | | | | | | if a file gets copied
* | Merge pull request #16072 from owncloud/phpdoc-cacheMorris Jobke2015-05-064-30/+139
|\ \ | | | | | | improve phpdoc of cache classes
| * | improve phpdoc of cache classesRobin Appelman2015-05-054-30/+139
| |/