aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #16404 from owncloud/enc_encrypt_files_in_trashVincent Petry2015-05-182-1/+29
|\ | | | | also encrypt files in trash bin
| * 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 ILockingProvider
| * | 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
|\ \ \ | |/ / |/| | redirect to error page if download failed
| * | 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 notice that WebDAV interface is not intended for browsers
| * | 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
| | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/16359
* | | Merge pull request #15738 from rullzer/fix_15611Vincent Petry2015-05-182-10/+53
|\ \ \ | | | | | | | | Fix to make sure expiration date is properly set
| * | | Fix to make sure expiration date is properly setRoeland Jago Douma2015-05-182-10/+53
| | |/ | |/| | | | | | | | | | | | | | | | | | | This did not happen correctly when the password was enforced since a different code path was taken. * moved generation of the default date string to separate function * added unit test
* | | Merge pull request #15870 from rullzer/fix_15812Morris Jobke2015-05-182-0/+111
|\ \ \ | |/ / |/| | Reset share dialog values - more
| * | Reset share dialog values so we start out cleanRoeland Jago Douma2015-05-182-0/+111
|/ / | | | | | | * Unit test
* | [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
|\ \ | | | | | | [enc2]fixing recovery tooltip
| * | 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 URL
| * | | Use OC.webroot instead of calculating the URLLukas Reschke2015-05-111-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | Calculating the URL is error-prone as it doesn't work when for example `public.php` is requested and might even be harmful as it could leak sensitive information. Since `oc.js` is even available when maintenance mode is available it is better to use the global `OC.webroot` that is not controlled by any user.
* | | | Merge pull request #16176 from owncloud/fix-provisioning-api-set-quotaVincent Petry2015-05-154-17/+46
|\ \ \ \ | | | | | | | | | | 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-074-17/+43
| | | | |
* | | | | Merge pull request #16265 from owncloud/update-bundleLukas Reschke2015-05-151-68/+196
|\ \ \ \ \ | | | | | | | | | | | | Update CA bundle
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | throw exception when LDAP Connection was lost
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix facade autotest
| * | | | | | | Store in array to allow paths with whitespaceLukas Reschke2015-05-151-4/+4
| | | | | | | |
| * | | | | | | Add support for facade binary scriptsLukas Reschke2015-05-151-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/16296
| * | | | | | | Lint bash script using ShellCheckLukas Reschke2015-05-151-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref http://www.shellcheck.net/about.html
* | | | | | | | Merge pull request #16292 from owncloud/webdav-storage-fireprehooksJoas Schilling2015-05-153-44/+334
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fire prehooks when uploading directly to storage
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Use owner when expiring versions, not the logged in user
| * | | | | | | | | 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 name
| * | | | | | | | | Fix restoring files from trash with unique nameVincent Petry2015-05-152-6/+338
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When restoring a file, a unique name needs to be generated if a file with the same name already exists. Also fixed the restore() method to return false if the file to restore does not exist. Added unit tests to cover restore cases.
* | | | | | | | | Merge pull request #16247 from owncloud/fixrmdirtodeletefolderstotrashJoas Schilling2015-05-152-15/+199
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Added rmdir to trashbin storage wrapper
| * | | | | | | | | Added rmdir to trashbin storage wrapperVincent Petry2015-05-122-15/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure that folders are moved to trash when deleted with rmdir() instead of unlink(). This happens for example when deleting a folder over WebDAV. The web UI uses unlink() so it wasn't affected.
* | | | | | | | | | Merge pull request #16323 from owncloud/enc_webdav_fixesThomas Müller2015-05-154-18/+28
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | some encryption fixes
| * | | | | | | | | delete all file keys doesn't need the encryption module as parameter; ↵Bjoern Schiessle2015-05-134-18/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |_|/ / / / / / / | |/| | | | | | | |