summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix references to legacy encryption app nameClark Tomlinson2015-05-184-4/+4
* Merge pull request #15980 from owncloud/jknockaert-patch-1Björn Schießle2015-05-182-19/+18
|\
| * correct testSeekjknockaert2015-05-181-4/+4
| * work on testsjknockaert2015-05-181-10/+11
| * fix #15973jknockaert2015-04-301-9/+7
* | Merge pull request #16404 from owncloud/enc_encrypt_files_in_trashVincent Petry2015-05-182-1/+29
|\ \
| * | also encrypt files in trash binBjoern Schiessle2015-05-182-1/+29
* | | 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-1814-56/+208
|\ \ \ \ | |/ / / |/| | |
| * | | a new approach to display the error messageBjoern Schiessle2015-05-1814-56/+208
| |/ /
* | | Merge pull request #16364 from owncloud/add-warning-webdavMorris Jobke2015-05-182-3/+80
|\ \ \
| * | | Add unit tests for \OC\Connector\Sabre\DummyGetResponsePluginLukas Reschke2015-05-151-0/+65
| * | | Add notice that WebDAV interface is not intended for browsersLukas Reschke2015-05-151-3/+15
* | | | Merge pull request #15738 from rullzer/fix_15611Vincent Petry2015-05-182-10/+53
|\ \ \ \
| * | | | Fix to make sure expiration date is properly setRoeland Jago Douma2015-05-182-10/+53
| | |/ / | |/| |
* | | | Merge pull request #15870 from rullzer/fix_15812Morris Jobke2015-05-182-0/+111
|\ \ \ \ | |/ / / |/| | |
| * | | Reset share dialog values so we start out cleanRoeland Jago Douma2015-05-182-0/+111
|/ / /
* | | [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
|\ \ \ \ \ \ \ \ \ \