summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | Merge branch 'master' into fix-db-locking-cleanupC. Montero Luque2016-03-0411-22/+241
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #22860 from owncloud/trashbin-checkpathC. Montero Luque2016-03-041-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Properly check path validity before deleting to trashVincent Petry2016-03-041-1/+1
* | | | | | | | | Merge pull request #22857 from owncloud/add-release-channel-selectionThomas Müller2016-03-047-14/+219
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add release channel selection backLukas Reschke2016-03-047-14/+219
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #22816 from owncloud/external-unavailable-recheckThomas 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
| | |_|_|_|_|/ / | |/| | | | | |
| | | * | | | | Run cleanup of expired DB file locks to background jobMorris Jobke2016-03-045-16/+71
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #22851 from owncloud/issue-22849-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 #22830 from owncloud/fix_dav_permissionsThomas Müller2016-03-042-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Rename and move permissions are set when a file is updatableRoeland Jago Douma2016-03-032-3/+3
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #22846 from owncloud/fileactions-downloadspinnerfixThomas Müller2016-03-043-10/+42
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fix download spinner to work with CSS stylesVincent Petry2016-03-043-10/+42
|/ / / / / /
* / / / / / [tx-robot] updated from transifexJenkins for ownCloud2016-03-0464-36/+336
|/ / / / /
* | | | | Merge pull request #22796 from owncloud/fix-encryption-on-version-restoreThomas Müller2016-03-033-25/+61
|\ \ \ \ \
| * | | | | Keep "encryptedVersion" when calling `\OC\Files\View::copy`Lukas Reschke2016-03-033-25/+61
| |/ / / /
* | | | | Merge pull request #22813 from owncloud/exclude-assets-folderLukas Reschke2016-03-031-2/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Exclude the assets folder from integrity checkLukas Reschke2016-03-031-2/+3
|/ / / /
* | | | Merge pull request #22778 from owncloud/fix-22770Thomas Müller2016-03-031-3/+3
|\ \ \ \
| * | | | untangle different user manager instances, fixes #22770Arthur Schiwon2016-03-021-3/+3
| | |_|/ | |/| |
* | | | Merge pull request #22784 from owncloud/files-newmenu-removebrowsercompleteThomas Müller2016-03-031-1/+1
|\ \ \ \
| * | | | Remove browser autocomplete in new file menuVincent Petry2016-03-021-1/+1
| |/ / /
* | | | Merge pull request #22799 from owncloud/phil-davis-patch-1Thomas Müller2016-03-031-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Minor grammar in config.sample.phpPhil Davis2016-03-031-1/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-0320-10/+52
|/ / /
* | | Merge pull request #22775 from owncloud/issue-22767-federation-fix-missing-tr...Thomas Müller2016-03-021-4/+4
|\ \ \
| * | | Translate strings of federation admin sectionJoas Schilling2016-03-021-4/+4
| |/ /
* | | Merge pull request #22776 from RealRancor/versions_config_sampleThomas Müller2016-03-021-0/+6
|\ \ \
| * | | Add Versions app header to config.sample.phpRealRancor2016-03-021-0/+6
| |/ /
* / / [tx-robot] updated from transifexJenkins for ownCloud2016-03-0212-0/+26
|/ /
* | Merge pull request #22769 from owncloud/increase-version-for-9.1Thomas Müller2016-03-0215-31/+31
|\ \
| * | Increase all versions on master which is now 9.1Joas Schilling2016-03-0215-31/+31
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2016-03-02130-124/+272
* | 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