summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #23391 from ↵Morris Jobke2016-03-212-42/+61
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | owncloud/stable8.2-share-keepoptioncheckboxinblocks [stable8.2] Keep share checkboxes together
| * | | Keep share checkboxes togetherVincent Petry2016-03-182-42/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - removed leading spaces before markup which can affect rendering in some cases - added shareOption CSS class to group and keep share option checkbox + label - moved ".showCruds" arrow into the matching shareOption to keep the arrow together with the checkbox
* | | | Merge pull request #23379 from owncloud/stable8.2-backport-23370Roeland Douma2016-03-181-1/+4
|\ \ \ \ | |/ / / |/| | | [stable8.2] Update avatar on username change if avatar is set
| * | | Update avatar on username change if avatar is setMorris Jobke2016-03-181-1/+4
| | | | | | | | | | | | | | | | * fixes #20455
* | | | Merge pull request #22766 from owncloud/ceph-keystone-readiness-stable8.2Vincent Petry2016-03-1812-40/+245
|\ \ \ \ | | | | | | | | | | Synchronise files_external and objectstore Docker tests with master
| * | | | Synchronise files_external and objectstore Docker tests with masterRobin McCorkell2016-03-0112-40/+245
| | | | | | | | | | | | | | | | | | | | Checkout files from 4d69e562a065a79461343444a842ada025f3643c
* | | | | Merge pull request #23354 from owncloud/stable8.2_backport_23346Thomas Müller2016-03-171-0/+5
|\ \ \ \ \ | |_|_|/ / |/| | | | [Stable 8.2] Set proper public webdav permissions when public upload disabled
| * | | | Set proper public webdav permissions when public upload disabledRoeland Jago Douma2016-03-171-0/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #23325 It can happen that a user shares a folder with public upload. And some time later the admin disables public upload on the server. To make sure this is handled correctly we need to check the config value and reduce the permissions. Fix is kept small to be easy backportable.
* | | | Merge pull request #23312 from owncloud/check-syntax-travis-stable8.2Vincent Petry2016-03-162-0/+31
|\ \ \ \ | |_|/ / |/| | | [stable8.2] Execute parallel-lint
| * | | [stable8.2] Execute parallel-lintLukas Reschke2016-03-162-0/+31
|/ / / | | | | | | | | | Backport of https://github.com/owncloud/core/pull/22994 and https://github.com/owncloud/core/pull/23303
* | | Merge pull request #23234 from owncloud/stable8.2-fix_21678Morris Jobke2016-03-161-0/+6
|\ \ \ | | | | | | | | [stable8.2] Gracefull handle link shares rename hook
| * | | Gracefull handle link shares rename hookRoeland Jago Douma2016-03-141-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #21678 The hook is called on all renames. However when we use a link share the getUserFolder fails. We now just opt out.
* | | | Merge pull request #23266 from owncloud/fix_22907_8.2Lukas Reschke2016-03-152-2/+42
|\ \ \ \ | | | | | | | | | | allow group shares, even if not all public keys are available
| * | | | allow group shares, even if not all public keys are availableBjoern Schiessle2016-03-152-2/+42
|/ / / /
* | | | Merge pull request #22934 from owncloud/stable8.2-backport-22872Vincent Petry2016-03-141-0/+2
|\ \ \ \ | | | | | | | | | | [stable8.2] Update error text for link passwords
| * | | | Update error text for link passwordsMorris Jobke2016-03-081-0/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | * this removes the old tooltip first before showing the new one to update the text - otherwise the old text will be shown
* | | | Merge pull request #22944 from owncloud/backport-22800-stable8.2Thomas Müller2016-03-141-0/+3
|\ \ \ \ | | | | | | | | | | [8.2] don't hide server not available exception, fixes #20536
| * | | | don't hide server not available exception, fixes #20536Arthur Schiwon2016-03-081-0/+3
| |/ / /
* | | | Merge pull request #23103 from owncloud/stable8.2-backport-23094Morris Jobke2016-03-131-1/+5
|\ \ \ \ | | | | | | | | | | [stable8.2] Fake LOCK statement for Windows 7, 8 and 10 network mounts
| * | | | Fake LOCK statement for Windows 7, 8 and 10 network mountsMorris Jobke2016-03-101-1/+5
|/ / / / | | | | | | | | | | | | * fixes #22596
* | | | Merge pull request #23025 from owncloud/stable8.2-backport-22986Morris Jobke2016-03-091-1/+1
|\ \ \ \ | | | | | | | | | | [stable8.2] Remove disabled autocorrect for new file names
| * | | | Remove disabled autocorrect for new file namesMorris Jobke2016-03-091-1/+1
|/ / / / | | | | | | | | | | | | * ref #22784
* | | | Merge pull request #22842 from owncloud/stable82_22830Morris Jobke2016-03-092-3/+3
|\ \ \ \ | | | | | | | | | | [Stable 8.2] Rename and move permissions are set when a file is updatable
| * | | | Rename and move permissions are set when a file is updatableRoeland Jago Douma2016-03-042-3/+3
| | | | | | | | | | | | | | | | | | | | * Fix unit tests
* | | | | Merge pull request #22923 from owncloud/stable8.2-share-archivenamedownloadallMorris Jobke2016-03-092-3/+5
|\ \ \ \ \ | | | | | | | | | | | | [stable8.2] Fix archive file name when downloading public share
| * | | | | Remove "files" arg from download URL in public link pageVincent Petry2016-03-071-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When no files were specified for download, it means folder download. In this case, no need to pass an empty "files" argument.
| * | | | | Fix archive file name when downloading public shareVincent Petry2016-03-071-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When download a public link share folder using the button on the top right, it doesn't provide a list of files. This fix makes sure to trigger the correct logic when no file list was given.
* | | | | Merge pull request #22935 from owncloud/stable8.2-remove-wrongly-backported-testMorris Jobke2016-03-092-57/+1
|\ \ \ \ \ | | | | | | | | | | | | Remove wrongly backported test
| * | | | | Fix casing - causes failure on php 5.4Thomas Müller2016-03-081-1/+1
| | | | | |
| * | | | | Remove wrongly backported testMorris Jobke2016-03-081-56/+0
| |/ / / / | | | | | | | | | | | | | | | * backported with #22752
* | | | | Merge pull request #22927 from ↵Morris Jobke2016-03-091-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | owncloud/stable8.2-files-newmenu-removebrowsercomplete [stable8.2] Remove browser autocomplete in new file menu
| * | | | Remove browser autocomplete in new file menuVincent Petry2016-03-071-1/+1
| |/ / /
* / / / 8.2.3v8.2.3C Montero-Luque2016-03-081-2/+2
|/ / /
* | | 8.2.3 RC2v8.2.3RC2C Montero-Luque2016-03-041-2/+2
| | |
* | | Merge pull request #22868 from owncloud/stable8.2-backport-22865C. Montero Luque2016-03-045-16/+93
|\ \ \ | | | | | | | | [stable8.2] Run cleanup of expired DB file locks to background job
| * | | Run cleanup of expired DB file locks to background jobMorris Jobke2016-03-045-16/+93
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes #22819 The old way fired a DELETE statement on each destruction of the DBLockingProvider. Which could cause a lot of queries. It's enough to run this every 5 minutes in a background job, which in the end could result in file locks that exists 5 minutes longer - in the worst case and for not properly released locks. This makes the DB based locking a lot more performant and could result in a similar performance to the Redis based locking provider.
* | | Merge pull request #22862 from owncloud/stable8.2-trashbin-checkpathC. Montero Luque2016-03-041-1/+1
|\ \ \ | |/ / |/| | [stable8.2] Properly check path validity before deleting to trash
| * | Properly check path validity before deleting to trashVincent Petry2016-03-041-1/+1
|/ / | | | | | | | | This prevents deleting the whole "files" folder of the user whenever $ownerPath is empty. This can happen in concurrency situations.
* | Merge pull request #22802 from RealRancor/backport_22776_stable8.2Frank Karlitschek2016-03-031-0/+6
|\ \ | | | | | | Add Versions app header to config.sample.php
| * | Add Versions app header to config.sample.phpRealRancor2016-03-031-0/+6
|/ /
* / 8.2.3 RC1v8.2.3RC1C Montero-Luque2016-03-012-3/+3
|/
* Merge pull request #22752 from owncloud/part-file-root-82Vincent Petry2016-03-014-12/+104
|\ | | | | [stable8.2] allow putting the part file in the view root
| * Don't apply quota in stream wrapper for part filesVincent Petry2016-03-011-5/+22
| | | | | | | | | | | | | | | | | | When overwriting shared files as recipient, the part file is written on the uploader's storage before overwriting the target file. If the uploader has no quota left, they should still be able to overwrite that file with Webdav. To make this work, they need to be able to write the part file to their own storage first.
| * add config sampleRobin Appelman2016-03-011-1/+9
| |
| * allow putting the part file in the view rootRobin Appelman2016-03-012-6/+73
| |
* | Merge pull request #22751 from owncloud/stable8.2-codecheckerusesThomas Müller2016-03-011-1/+4
|\ \ | |/ |/| [stable8.2] Fixing CodeChecker usage
| * Fixing CodeChecker usage :see_no_evil:Thomas Müller2016-03-011-1/+4
|/
* Merge pull request #22325 from owncloud/dav-upload-scan-in-lock-82Vincent Petry2016-03-011-5/+5
|\ | | | | [8.2] scan the file in the write lock when uploading over dav
| * scan the file in the write lock when uploading over davRobin Appelman2016-02-111-5/+5
| |
* | Merge pull request #22705 from ↵Morris Jobke2016-03-013-8/+39
|\ \ | | | | | | | | | | | | owncloud/backport-22677-theme-overwriting-language [8.2] Allow to overwrite a single language string via the theme folder