summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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
| * | Improved JS L10N bundle merging + testsVincent Petry2016-03-012-3/+9
| | |
| * | Allow to overwrite a single language string via the theme folderJoas Schilling2016-02-292-8/+33
| | |
* | | Merge pull request #22657 from owncloud/stable8.2-backport-21854Vincent Petry2016-03-011-0/+17
|\ \ \ | | | | | | | | [stable8.2] Fix addUserToGroup hook of the share code
| * | | Fix addUserToGroup hook of the share codeMorris Jobke2016-02-251-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | * sets up the filesystem of the user that is added to a group to properly accept shares * fixes #18499
* | | | Merge pull request #22712 from owncloud/kill-coverage-on-scrutinizer-stable8.2Morris Jobke2016-02-291-4/+0
|\ \ \ \ | | | | | | | | | | Update .scrutinizer.yml
| * | | | Update .scrutinizer.ymlThomas Müller2016-02-291-4/+0
|/ / / /
* | | | Merge pull request #22665 from owncloud/backport-22599-stable8.2Thomas Müller2016-02-291-2/+2
|\ \ \ \ | |_|/ / |/| | | [backport] [stable8.2] take the first result of that array, if present. Fixes 2nd display na…
| * | | take the first result of that array, if present. Fixes 2nd display name to ↵Arthur Schiwon2016-02-261-2/+2
| |/ / | | | | | | | | | be 'Array', if cache is configured and enabled.
* | | Merge pull request #22685 from owncloud/stable8.2-fix-thrashbin-cronjobMorris Jobke2016-02-291-0/+6
|\ \ \ | | | | | | | | [Stable8.2] fix thrashbin cronjob
| * | | Skip users with no trashbinVictor Dubiniuk2016-02-261-0/+6
|/ / /
* | | Merge pull request #22676 from owncloud/fed-share-etag-82Morris Jobke2016-02-263-8/+78
|\ \ \ | | | | | | | | [8.2] use the default view for propagation if possible
| * | | use the default view for propagation if possibleRobin Appelman2016-02-262-8/+28
| | | |
| * | | Add test for owner etag propagationRobin Appelman2016-02-261-0/+50
| | | |
* | | | Merge pull request #22574 from ↵Roeland Douma2016-02-261-1/+10
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | owncloud/backport-22419-console-add-user-group-with-shares [8.2] Make sure to init the users Filesystem so we can add group shares
| * | | Make sure to init the users Filesystem so we can add group sharesJoas Schilling2016-02-221-1/+10
| | | |
* | | | Merge pull request #22649 from owncloud/external-share-manager-82Thomas Müller2016-02-251-3/+4
|\ \ \ \ | | | | | | | | | | inject the correct external share manager into the storage
| * | | | inject the correct external share manager into the storageRobin Appelman2016-02-251-3/+4
| | |/ / | |/| |
* | | | Merge pull request #22629 from owncloud/stable8.2-fedshare-testremote-after-404Thomas Müller2016-02-251-0/+3
|\ \ \ \ | | | | | | | | | | [stable8.2] Properly trigger testRemote after getting a 404 from remote fed share
| * | | | Properly trigger testRemote after getting a 404 from remote fed shareVincent Petry2016-02-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever a remote fed share's shareinfo call returns a 404, don't directly assume the storage is not available by throwing StorageNotAvailableException. We need to properly throw NotFoundException to trigger the later logic that calls testRemote() that verifies that the 404 is not from a broken server but really from an obsolete share.
* | | | | Merge pull request #22633 from owncloud/stable8.2-backport-22565Vincent Petry2016-02-251-0/+4
|\ \ \ \ \ | |_|/ / / |/| | | | [stable8.2] Avoids scanning the root storage
| * | | | Avoids scanning the root storageMorris Jobke2016-02-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This check will skip the background scan for the root storage because there is nothing in the root storage that isn't already in another (mostly user-) storage. Fixes #22501
* | | | | Merge pull request #22626 from owncloud/fix_broken_unencrypted_size_8.2Björn Schießle2016-02-252-4/+286
|\ \ \ \ \ | |/ / / / |/| | | | [stable8.2] Heal unencrypted file sizes at download time
| * | | | recalculate unencrypted size if we assume that the size stored in the db is ↵Bjoern Schiessle2016-02-252-4/+286
| |/ / / | | | | | | | | | | | | not correct
* | | | Merge pull request #22614 from owncloud/backport-22358-stable8.2Morris Jobke2016-02-244-5/+32
|\ \ \ \ | |/ / / |/| | | [Backport][stable8.2] Fix race condition when switching filter mode.
| * | | Fix race condition when switching filter mode. Fixes #22278Arthur Schiwon2016-02-244-5/+32
| |/ /
* | | Merge pull request #22571 from owncloud/stable8.2-backport-21544Morris Jobke2016-02-241-0/+3
|\ \ \ | |/ / |/| | [stable8.2] set etag and permission fields for trashbin entries
| * | set etag and permission fields for trashbin entriesRobin Appelman2016-02-221-0/+3
| | |
* | | Merge pull request #22557 from owncloud/backport-22496-share-group-problemRoeland Douma2016-02-221-1/+1
|\ \ \ | |/ / |/| | [8.2] Fix on shared groups assignment.
| * | Fix on shared groups assignment.Leonardo Diez2016-02-221-1/+1
| | |
* | | Merge pull request #22562 from owncloud/stable8.2-ie-publicpagefooterMorris Jobke2016-02-221-0/+5
|\ \ \ | | | | | | | | [stable8.2] Fix public page footer position in IE
| * | | Fix public page footer position in IEVincent Petry2016-02-221-0/+5
|/ / / | | | | | | | | | | | | | | | | | | | | | The content element needs hasLayout, so triggering it with a display attribute. Without this, the #content element's height would be as high as the window's height instead of adjusting itself to its contents' height.
* | | Merge pull request #22556 from owncloud/stable8.2-fix-pagination-in-ieVincent Petry2016-02-221-1/+0
|\ \ \ | |/ / |/| | [stable8.2] Fixes pagination in IE
| * | Fixes pagination in IEMorris Jobke2016-02-221-1/+0
|/ / | | | | | | | | * tested in Firefox, Chrome, Safari, IE and Edge with folder and file shares * fixes #20044