summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22867 from owncloud/stable9-backport-22865C. Montero Luque2016-03-045-16/+71
|\
| * Run cleanup of expired DB file locks to background jobMorris Jobke2016-03-045-16/+71
* | Merge pull request #22848 from owncloud/stable9-fileactions-downloadspinnerfixC. Montero Luque2016-03-043-10/+42
|\ \
| * | Fix download spinner to work with CSS stylesVincent Petry2016-03-043-10/+42
* | | Merge pull request #22782 from owncloud/backport-22776-doc-fixC. Montero Luque2016-03-041-0/+6
|\ \ \ | |_|/ |/| |
| * | 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
|\ \ \
| * | | Properly check path validity before deleting to trashVincent Petry2016-03-041-1/+1
|/ / /
* | | Merge pull request #22858 from owncloud/stable9-release-channelThomas Müller2016-03-047-14/+219
|\ \ \
| * | | Add release channel selection backLukas Reschke2016-03-047-14/+219
* | | | Merge pull request #22832 from owncloud/external-unavailable-recheck9Thomas Müller2016-03-043-7/+21
|\ \ \ \ | |/ / / |/| | |
| * | | 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
|\ \ \ \
| * | | | 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
|\ \ \ \ | |_|_|/ |/| | |
| * | | Exclude the assets folder from integrity checkLukas Reschke2016-03-031-2/+3
| | |/ | |/|
* | | Merge pull request #22829 from owncloud/stable9-revert-22264-read-version-fro...Thomas Müller2016-03-046-6/+19
|\ \ \ | |_|/ |/| |
| * | Revert "No longer evaluate appinfo/version"Vincent Petry2016-03-036-6/+19
|/ /
* | Merge pull request #22818 from owncloud/backport-fix-encryption-on-version-re...Lukas Reschke2016-03-033-25/+61
|\ \ | |/ |/|
| * Keep "encryptedVersion" when calling `\OC\Files\View::copy`Lukas Reschke2016-03-033-25/+61
|/
* 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
|\
| * 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
* | Merge pull request #22756 from owncloud/exclude-custom-data-dirC. Montero Luque2016-03-011-2/+8
|\ \
| * \ 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
* | | | Merge pull request #22684 from owncloud/part-file-rootC. Montero Luque2016-03-013-4/+77
|\ \ \ \ | |_|/ / |/| | |
| * | | 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
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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
| |/ / |/| |
* | | Merge pull request #22699 from owncloud/checksum_int_testThomas Müller2016-03-015-2/+325
|\ \ \
| * | | Save some calls to refreshInfo during uploadVincent Petry2016-03-011-4/+5
| * | | Fix unit testsRoeland Jago Douma2016-03-011-5/+7
| * | | Checksums on chunked filesRoeland Jago Douma2016-03-011-0/+8
| * | | Remove checksum on upload of non checksumed fileRoeland Jago Douma2016-03-012-1/+8
| * | | Checksum intergration testRoeland Jago Douma2016-03-013-0/+305
| | |/ | |/|
* | | Merge pull request #22686 from owncloud/cleanup_remote_address_booksThomas Müller2016-03-0118-39/+155
|\ \ \ | |/ / |/| |
| * | increase version numberBjoern Schiessle2016-03-011-1/+1
| * | Handle null caseThomas Müller2016-03-011-2/+5
| * | fix doc-blockBjoern Schiessle2016-02-291-0/+1
| * | remove synced remote address book if the remote server revoked access to his ...Bjoern Schiessle2016-02-297-7/+39
| * | remove remote address book if the admin removes the server from the trusted s...Bjoern Schiessle2016-02-299-18/+97