summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 9.0.0 RC3v9.0.0RC3C Montero-Luque2016-03-061-2/+2
|
* Merge pull request #22884 from owncloud/backport-cache-resultsThomas Müller2016-03-061-2/+19
|\ | | | | [stable9] Cache results of testRemoteUrl
| * Cache results of testRemoteUrlLukas Reschke2016-03-051-2/+19
| | | | | | | | | | | | Otherwise setting up the storage will result in a HTTP request and thus slowing down ownCloud. Replaces https://github.com/owncloud/core/pull/22855
* | Merge pull request #22889 from owncloud/stable9-use-custom-headerThomas Müller2016-03-061-1/+1
|\ \ | |/ |/| [stable9] Use custom header
| * Use custom headerLukas Reschke2016-03-051-1/+1
|/ | | | PHP in CGI mode eats the Authorization header => :bomb:
* 9.0.0 RC2v9.0.0RC2C Montero-Luque2016-03-041-2/+2
|
* Merge pull request #22879 from owncloud/stable9-backport-use-clob-for-timezoneC. Montero Luque2016-03-042-3/+3
|\ | | | | [stable9] Use CLOB for timezone
| * [stable9] Use CLOB for timezoneLukas Reschke2016-03-042-3/+3
| | | | | | | | | | | | | | | | | | | | TEXT defaults to a length of 255 which is going to fail in some cases as the timezone can be rather long. This changes it back to a CLOB as it has been before as well: owncloudarchive/calendar@8d8bb68. I'm not super convinced that CLOB is the best choice here but at least it seems to work. Fixes #22876 Backport of https://github.com/owncloud/core/pull/22878 to stable9
* | Merge pull request #22871 from owncloud/enable-federation-app-stable9C. Montero Luque2016-03-042-0/+2
|\ \ | | | | | | [stable9] Automatically enabled federation app
| * \ Merge branch 'stable9' into enable-federation-app-stable9C. Montero Luque2016-03-041-1/+1
| |\ \
| * | | Adjust OCS testLukas Reschke2016-03-041-0/+1
| | | |
| * | | Automatically enabled federation appLukas Reschke2016-03-041-0/+1
| | | |
* | | | Merge pull request #22867 from owncloud/stable9-backport-22865C. Montero Luque2016-03-045-16/+71
|\ \ \ \ | | | | | | | | | | [stable9] Run cleanup of expired DB file locks to background job
| * | | | Run cleanup of expired DB file locks to background jobMorris Jobke2016-03-045-16/+71
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 #22848 from owncloud/stable9-fileactions-downloadspinnerfixC. Montero Luque2016-03-043-10/+42
|\ \ \ \ | |_|_|/ |/| | | [stable9] Fix download spinner to work with CSS styles
| * | | Fix download spinner to work with CSS stylesVincent Petry2016-03-043-10/+42
| | | | | | | | | | | | | | | | | | | | | | | | A recent change replaced img elements with CSS icons for file actions. This fix adjusts the logic to work properly with CSS icons instead of images.
* | | | Merge pull request #22782 from owncloud/backport-22776-doc-fixC. Montero Luque2016-03-041-0/+6
|\ \ \ \ | |_|/ / |/| | | Add Versions app header to config.sample.php
| * | | Add Versions app header to config.sample.phpRealRancor2016-03-021-0/+6
| | | |
* | | | Merge pull request #22861 from owncloud/stable9-trashbin-checkpathC. Montero Luque2016-03-041-1/+1
|\ \ \ \ | |_|_|/ |/| | | [stable9] 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 #22858 from owncloud/stable9-release-channelThomas Müller2016-03-047-14/+219
|\ \ \ | | | | | | | | [stable9] Add release channel selection back
| * | | Add release channel selection backLukas Reschke2016-03-047-14/+219
| | | | | | | | | | | | | | | | Allows to select the release channels again and also shows the last check date
* | | | Merge pull request #22832 from owncloud/external-unavailable-recheck9Thomas Müller2016-03-043-7/+21
|\ \ \ \ | |/ / / |/| | | [9.0] allow availability recheck for external storages
| * | | Properly set exception in FailedStorageVincent Petry2016-03-032-1/+7
| | | |
| * | | allow availability recheck for external storagesRobin Appelman2016-03-032-6/+14
| | | |
* | | | Merge pull request #22852 from owncloud/backport-22851-php54-for-commentsThomas Müller2016-03-041-1/+1
|\ \ \ \ | | | | | | | | | | [9.0] ucwords does not support delimiter on 5.4
| * | | | ucwords does not support delimiter on 5.4Joas Schilling2016-03-041-1/+1
|/ / / /
* | | | Merge pull request #22822 from owncloud/stable9-exclude-assetsThomas Müller2016-03-041-2/+3
|\ \ \ \ | |_|_|/ |/| | | [stable9] Exclude the assets folder from integrity check
| * | | Exclude the assets folder from integrity checkLukas Reschke2016-03-031-2/+3
| | |/ | |/| | | | | | | We should not scan the assets folder as this can contain user specific content. Partially addresses https://github.com/owncloud/core/issues/22803
* | | Merge pull request #22829 from ↵Thomas Müller2016-03-046-6/+19
|\ \ \ | |_|/ |/| | | | | | | | owncloud/stable9-revert-22264-read-version-from-info.xml-only [stable9] Revert "No longer evaluate appinfo/version"
| * | Revert "No longer evaluate appinfo/version"Vincent Petry2016-03-036-6/+19
|/ /
* | Merge pull request #22818 from ↵Lukas Reschke2016-03-033-25/+61
|\ \ | |/ |/| | | | | owncloud/backport-fix-encryption-on-version-restore [stable9] Keep "encryptedVersion" when calling `\OC\Files\View::copy`
| * Keep "encryptedVersion" when calling `\OC\Files\View::copy`Lukas Reschke2016-03-033-25/+61
|/ | | | | | | | | | | | | | | | When calling `\OC\Files\View::copy` we should also keep the version to ensure that the file will always have the correct version attached and can be successfully decrypted. To test this the following steps are necessary (from https://github.com/owncloud/core/issues/22781#issuecomment-191328982): 1. setup a new ownCloud 9.0 beta2 2. enable encryption 2. upload a docx (5.7MB large) 3. upload the same file again and overwrite the existing file 4. I can download the original file and the first version 5. I restore the first version 6. restored version can no longer be downloaded with the error described above The manual cache operation in `\OCA\Files_Versions\Storage` is unfortunately necessary since `\OCA\Files_Versions\Storage::copyFileContents` is not using `\OCP\Files\Storage::moveFromStorage` in the case when an object storage is used. Due to the workaround added in https://github.com/owncloud/core/commit/54cea05271b887f1c8062c034741df869bc0f055 the stream is directly copied and thus bypassing the FS.
* 9.0.0 RC1v9.0.0RC1C Montero-Luque2016-03-011-2/+2
|
* Merge pull request #22757 from owncloud/apply-licenseC. Montero Luque2016-03-01316-201/+625
|\ | | | | Update copyright information and author file
| * Add new appsLukas Reschke2016-03-019-4/+33
| |
| * Remove Scrutinizer Auto FixerLukas Reschke2016-03-0193-93/+3
| |
| * Map MaciLukas Reschke2016-03-0115-3/+14
| |
| * Update author informationLukas Reschke2016-03-01273-123/+597
| | | | | | | | Probably nice for the people that contributed to 9.0 to see themselves in the AUTHORS file :)
* | Merge pull request #22756 from owncloud/exclude-custom-data-dirC. Montero Luque2016-03-011-2/+8
|\ \ | | | | | | Exclude custom data directory from integrity checker
| * \ Merge branch 'master' into exclude-custom-data-dirC. Montero Luque2016-03-0130-333/+510
| |\ \
| * | | Exclude custom data directory from integrity checkerLukas Reschke2016-03-011-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should not scan any custom data directory in the integrity checker as well. Otherwise this would lead to a massive increased update time that may likely exceed the timeout. To test this: 1. Install ownCloud 8.2.2, set as data dir another folder than `data` such as `data-asdf`. Make sure that folder lives in the web root as well. 2. Update that instance to 9.0.0 beta2 => Errors are shown in the code integrity check 3. Apply this patch and trigger the rescan in the admin settings => No errors are shown anymore (can also do a new update with that patch applied) Fixes https://github.com/owncloud/core/issues/22698
* | | | Merge pull request #22684 from owncloud/part-file-rootC. Montero Luque2016-03-013-4/+77
|\ \ \ \ | |_|/ / |/| | | allow putting the part file in the view root
| * | | Merge branch 'master' into part-file-rootC. Montero Luque2016-03-017-292/+30
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #22742 from owncloud/ceph-keystone-readinessC. Montero Luque2016-03-017-292/+30
|\ \ \ \ | |_|_|/ |/| | | Use readiness notification socket to be absolutely sure this works
| * | | local entrypoint.sh isn't needed - all fixes are upstreamMorris Jobke2016-03-012-276/+1
| | | |
| * | | Use sockets for startup notification in primary storage testsMorris Jobke2016-03-012-14/+13
| | | |
| * | | Use readiness notification socket to be absolutely sure this worksRobin McCorkell2016-02-294-2/+16
| | | |
| | * | add config sampleRobin Appelman2016-03-011-0/+8
| | | |
| | * | allow putting the part file in the view rootRobin Appelman2016-03-012-4/+69
| |/ / |/| |