aboutsummaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #16399 from owncloud/enc_rmdir_fixClark Tomlinson2015-05-181-2/+6
|\
| * only try to delete file keys if it is a valid pathBjoern Schiessle2015-05-181-2/+6
* | Merge pull request #16403 from owncloud/fix-command-loadingThomas Müller2015-05-181-1/+1
|\ \
| * | Only load commands of enabled appsMorris Jobke2015-05-181-1/+1
* | | Merge pull request #15980 from owncloud/jknockaert-patch-1Björn Schießle2015-05-181-9/+7
|\ \ \
| * | | fix #15973jknockaert2015-04-301-9/+7
* | | | Merge pull request #16398 from owncloud/fix-php-docv8.1.0beta2Joas Schilling2015-05-181-1/+1
|\ \ \ \
| * | | | Fix PHPDoc of public interface ILockingProviderMorris Jobke2015-05-181-1/+1
| | |/ / | |/| |
* | | | Merge pull request #16243 from owncloud/error_if_download_failedVincent Petry2015-05-185-41/+105
|\ \ \ \ | |/ / / |/| | |
| * | | a new approach to display the error messageBjoern Schiessle2015-05-185-41/+105
| | |/ | |/|
* | | Merge pull request #16364 from owncloud/add-warning-webdavMorris Jobke2015-05-181-3/+15
|\ \ \ | |/ / |/| |
| * | Add notice that WebDAV interface is not intended for browsersLukas Reschke2015-05-151-3/+15
* | | Merge pull request #16176 from owncloud/fix-provisioning-api-set-quotaVincent Petry2015-05-151-0/+5
|\ \ \
| * | | 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 storageVincent Petry2015-05-131-6/+28
* | | | | Merge pull request #16323 from owncloud/enc_webdav_fixesThomas Müller2015-05-153-17/+27
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | delete all file keys doesn't need the encryption module as parameter; impleme...Bjoern Schiessle2015-05-133-17/+27
* | | | | Merge pull request #16342 from owncloud/fix_16338Lukas Reschke2015-05-151-1/+1
|\ \ \ \ \
| * | | | | 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 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 featuresLukas Reschke2015-05-121-2/+6
| |/ / /
* | | | Merge pull request #16228 from owncloud/enc_fix_restoreBjörn Schießle2015-05-124-8/+44
|\ \ \ \ | |/ / / |/| | |
| * | | use hooks to update encryption keys instead of the storage wrapper if a file ...Bjoern Schiessle2015-05-114-8/+44
* | | | Merge pull request #16233 from owncloud/enc_fix_check_if_file_is_excludedMorris Jobke2015-05-121-1/+1
|\ \ \ \
| * | | | fix check if file is excluded from encryptionBjoern Schiessle2015-05-111-1/+1
| |/ / /
* | | | Merge pull request #16234 from owncloud/issue-16206-fix-app-config-parallel-i...Morris Jobke2015-05-111-11/+16
|\ \ \ \
| * | | | 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 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 owncloud/issue-16109-fix-share-email-with-shar...Lukas Reschke2015-05-081-0/+5
|\ \ \ \
| * | | | Fix the share mail notification when the item is in a folderJoas Schilling2015-05-061-0/+5
* | | | | Merge pull request #16146 from owncloud/issue-16103-hide-module-already-exist...Lukas Reschke2015-05-081-1/+7
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | 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
|\ \ \
| * | | 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
|\ \ \ \
| * | | | 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
| | |/ / | |/| |