summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-186-6/+48
* 8.1 beta 2Frank Karlitschek2015-05-171-2/+2
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-176-0/+6
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-162-0/+2
* Merge pull request #15978 from owncloud/feature/fix-encryption-tooltipsThomas Müller2015-05-153-18/+14
|\
| * fixing testClark Tomlinson2015-05-111-9/+9
| * adding username as param for isrecoveryenabledClark Tomlinson2015-05-051-1/+1
| * fixing recovery tooltipClark Tomlinson2015-05-042-8/+4
* | Merge pull request #16242 from owncloud/use-oc-webrootThomas Müller2015-05-151-4/+1
|\ \
| * | Use OC.webroot instead of calculating the URLLukas Reschke2015-05-111-4/+1
* | | Merge pull request #16176 from owncloud/fix-provisioning-api-set-quotaVincent Petry2015-05-154-17/+46
|\ \ \
| * | | 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-074-17/+43
* | | | Merge pull request #16265 from owncloud/update-bundleLukas Reschke2015-05-151-68/+196
|\ \ \ \
| * | | | Update CA bundleLukas Reschke2015-05-121-68/+196
* | | | | Merge pull request #15811 from owncloud/exception-on-lost-ldap-connectionThomas Müller2015-05-153-0/+199
|\ \ \ \ \
| * | | | | do not execute integration tests when executing autotest.shThomas Müller2015-05-151-0/+3
| * | | | | add integration test to ensure correct behaviour on lost connectionsArthur Schiwon2015-04-241-0/+192
| * | | | | throw exception when LDAP Connection was lostArthur Schiwon2015-04-221-0/+4
* | | | | | Merge pull request #16367 from owncloud/fix-facade-autotestThomas Müller2015-05-151-14/+21
|\ \ \ \ \ \
| * | | | | | Store in array to allow paths with whitespaceLukas Reschke2015-05-151-4/+4
| * | | | | | Add support for facade binary scriptsLukas Reschke2015-05-151-3/+10
| * | | | | | Lint bash script using ShellCheckLukas Reschke2015-05-151-11/+11
* | | | | | | Merge pull request #16292 from owncloud/webdav-storage-fireprehooksJoas Schilling2015-05-153-44/+334
|\ \ \ \ \ \ \
| * | | | | | | Fire prehooks when uploading directly to storageVincent Petry2015-05-133-44/+334
* | | | | | | | Merge pull request #16337 from owncloud/versions-expireforownerJoas Schilling2015-05-153-12/+99
|\ \ \ \ \ \ \ \
| * | | | | | | | Properly log out test users in unit testsVincent Petry2015-05-151-0/+2
| * | | | | | | | Added unit tests for versions storingVincent Petry2015-05-151-4/+86
| * | | | | | | | Use owner when expiring versions, not the logged in userVincent Petry2015-05-131-8/+11
* | | | | | | | | Merge pull request #16273 from owncloud/trash-fixrestoreuniquenameJoas Schilling2015-05-152-6/+338
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Fix restoring files from trash with unique nameVincent Petry2015-05-152-6/+338
|/ / / / / / / /
* | | | | | | | Merge pull request #16247 from owncloud/fixrmdirtodeletefolderstotrashJoas Schilling2015-05-152-15/+199
|\ \ \ \ \ \ \ \
| * | | | | | | | Added rmdir to trashbin storage wrapperVincent Petry2015-05-122-15/+199
* | | | | | | | | Merge pull request #16323 from owncloud/enc_webdav_fixesThomas Müller2015-05-154-18/+28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | delete all file keys doesn't need the encryption module as parameter; impleme...Bjoern Schiessle2015-05-134-18/+28
* | | | | | | | | | 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-1524-2/+68
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-1414-2/+46
|/ / / / / / / / /
* | | | | | | | | Merge pull request #16276 from owncloud/dav-quota-rootRobin Appelman2015-05-132-1/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Added unit test to quota plugin for free_space argumentVincent Petry2015-05-131-1/+4
| * | | | | | | | fix webdav quota check for the root of the dav endpointRobin Appelman2015-05-121-0/+3
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #16284 from owncloud/shared-storage-viewLukas Reschke2015-05-131-20/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | dont go trough the view when renaming/copying on shared storagesRobin Appelman2015-05-121-20/+21
* | | | | | | | | Merge pull request #16290 from owncloud/upgrade-info-for-3rdparty-appsLukas Reschke2015-05-131-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add info message for upgrade of an 3rdparty appMorris Jobke2015-05-121-0/+3
| |/ / / / / / / /
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-1398-78/+386
* | | | | | | | | Merge pull request #16289 from owncloud/fix-stupid-mistakeLukas Reschke2015-05-121-0/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Subadmin permissions are also not requiredLukas Reschke2015-05-121-0/+2
| * | | | | | | | Add NoAdminRequired annotationLukas Reschke2015-05-121-0/+4
| |/ / / / / / /