summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-03-05146-178/+592
|
* Merge pull request #22878 from owncloud/use-clob-for-timezoneC. Montero Luque2016-03-042-3/+3
|\ | | | | Use CLOB for timezone
| * 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: https://github.com/owncloudarchive/calendar/commit/8d8bb68b010fc2c42a258dee43516404a95ab861. I'm not super convinced that CLOB is the best choice here but at least it seems to work. Fixes https://github.com/owncloud/core/issues/22876
* | Merge pull request #22870 from owncloud/autoenable-federation-appC. Montero Luque2016-03-042-11/+13
|\ \ | | | | | | Automatically enable "federation" app
| * \ Merge branch 'master' into autoenable-federation-appC. Montero Luque2016-03-041-1/+1
| |\ \
| * | | Adjust OCS testLukas Reschke2016-03-041-0/+1
| | | |
| * | | Automatically enable "federation" appLukas Reschke2016-03-041-11/+12
| | |/ | |/|
* | | Merge pull request #22865 from owncloud/fix-db-locking-cleanupC. Montero Luque2016-03-045-16/+71
|\ \ \ | |_|/ |/| | Run cleanup of expired DB file locks to background job
| * | 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 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 #22857 from owncloud/add-release-channel-selectionThomas Müller2016-03-047-14/+219
|\ \ \ | | | | | | | | 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 #22816 from owncloud/external-unavailable-recheckThomas Müller2016-03-043-7/+21
|\ \ \ \ | |/ / / |/| | | 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
| | | |
| | | * 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 #22851 from owncloud/issue-22849-php54-for-commentsThomas Müller2016-03-041-1/+1
|\ \ \ | | | | | | | | ucwords does not support delimiter before 5.4.32
| * | | 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 updatable
| * | | Rename and move permissions are set when a file is updatableRoeland Jago Douma2016-03-032-3/+3
| | | | | | | | | | | | | | | | * Fix unit tests
* | | | Merge pull request #22846 from owncloud/fileactions-downloadspinnerfixThomas Müller2016-03-043-10/+42
|\ \ \ \ | |_|_|/ |/| | | 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.
* / / [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`
| * | 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.
* | Merge pull request #22813 from owncloud/exclude-assets-folderLukas Reschke2016-03-031-2/+3
|\ \ | |/ |/| 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 #22778 from owncloud/fix-22770Thomas Müller2016-03-031-3/+3
|\ | | | | untangle different user manager instances, fixes #22770
| * 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 menu
| * | 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.php
| * | Minor grammar in config.sample.phpPhil Davis2016-03-031-1/+1
| | | | | | | | | | | | Fix this here in the source so it will propogate into the documentation. Edit was already applied in https://github.com/owncloud/documentation/pull/2208 but needs to be done here at the source.
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-0320-10/+52
|/ /
* | Merge pull request #22775 from ↵Thomas Müller2016-03-021-4/+4
|\ \ | | | | | | | | | | | | owncloud/issue-22767-federation-fix-missing-translation Translate strings of federation admin section
| * | 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.php
| * | 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
|\ | | | | Master is now 9.1
| * 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
|\ | | | | 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
| |\ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-02 08:38:19 +0000