summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 8.1.1v8.1.1Frank Karlitschek2015-08-071-2/+2
|
* Merge pull request #18054 from ↵Thomas Müller2015-08-052-7/+16
|\ | | | | | | | | owncloud/shared-propagate-check-recipient-stable81 [8.1] fix infinite loops with propagating etags on reshares
| * fix infinite loops with propagating etags on resharesRobin Appelman2015-08-042-7/+16
|/
* 8.1.1 RC1v8.1.1RC1C Montero-Luque2015-08-031-2/+2
|
* Merge pull request #18013 from owncloud/enc_always_update_file_cache_8.1Thomas Müller2015-08-032-8/+9
|\ | | | | [stable8.1] let the encryption storage wrapper always update the file cache
| * always update file cache, the cache can handle partial data correctly if the ↵Bjoern Schiessle2015-07-312-8/+9
| | | | | | | | file doesn't already exists in the file cache
* | Merge pull request #17990 from owncloud/enc_only_update_file_cache_once_8.1Björn Schießle2015-08-032-7/+22
|\ \ | |/ |/| [stable8.1] only update database on the first run
| * only update database on the first run (first run = we have a version number ↵Bjoern Schiessle2015-07-312-7/+22
| | | | | | | | from the old encryption app)
* | Merge pull request #18003 from owncloud/backport-17805-stable8.1Roeland Douma2015-07-314-6/+59
|\ \ | | | | | | [stable8.1][avatar] add error handlers for avatar setup
| * | [avatar] add error handlers for avatar setupMorris Jobke2015-07-314-6/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add colon to translated string use placeholder in t() Adding a size limitation for avatar upload Unit test for file size Fix typo & display server side error message
* | | Merge pull request #17949 from ↵Morris Jobke2015-07-291-0/+4
|\ \ \ | | |/ | |/| | | | | | | owncloud/stable8.1-settings-users-apprenderedforsearchbox [stable8.1] Trigger "apprendered" event in users page
| * | Trigger "apprendered" event in users pageVincent Petry2015-07-291-0/+4
|/ / | | | | | | | | This will properly update the controls bar width and display the search box initially.
* | Merge pull request #17935 from owncloud/detect-old-openssl-versions-stable81Thomas Müller2015-07-294-11/+221
|\ \ | | | | | | [stable8.1] Detect old NSS and OpenSSL versions
| * | Detect old NSS and OpenSSL versionsLukas Reschke2015-07-284-11/+221
| | | | | | | | | | | | | | | | | | This will detect old NSS and OpenSSL versions and show appropriate errors in the admin interface. Fixes https://github.com/owncloud/core/issues/17901
* | | Merge pull request #17929 from owncloud/stable8.1-smb-storageiddoubleslashThomas Müller2015-07-282-1/+16
|\ \ \ | | | | | | | | [stable8.1] Double slash for SMB storage id for compatibility
| * | | Double slash for SMB storage id for compatibilityVincent Petry2015-07-282-1/+16
| |/ /
* | | Merge pull request #17928 from owncloud/fix_17925_8.1Vincent Petry2015-07-282-13/+177
|\ \ \ | |/ / |/| | [stable8.1] set logger in constructor
| * | Add unit testsLukas Reschke2015-07-282-13/+176
| | |
| * | set logger in constructorBjoern Schiessle2015-07-281-0/+1
|/ /
* | Merge pull request #17911 from ↵Vincent Petry2015-07-275-4/+159
|\ \ | | | | | | | | | | | | owncloud/fix-enc-wrapper-without-encryption-stable8.1 [stable8.1] Fix enc wrapper without encryption stable8.1
| * | adujust version to the stable8.1 branchBjoern Schiessle2015-07-271-2/+2
| | |
| * | add condition to update queryBjoern Schiessle2015-07-271-1/+1
| | |
| * | Add an update script to reset the valueJoas Schilling2015-07-273-2/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case encryption was not enabled, we accidently set encrypted = 1 for files inside mount points, since 8.1.0. This breaks opening the files in 8.1.1 because we fixed the code that checks if a file is encrypted. In order to fix the file, we need to reset the flag of the file. However, the flag might be set because the file is in fact encrypted because it was uploaded at a time where encryption was enabled. So we can only do this when: - Current version of ownCloud before the update is 8.1.0 or 8.2.0.(0-2) - Encryption is disabled - files_encryption is not known in the app config If the first two are not the case, we are save. However, if files_encryption values exist in the config, we might have a false negative here. Now if there is no file with unencrypted size greater 0, that means there are no files that are still encrypted with "files_encryption" encryption. So we can also safely reset the flag here. If this is not the case, we go with "better save then sorry" and don't change the flag but write a message to the ownCloud log file.
| * | Add a unit test for the disabled encryption caseJoas Schilling2015-07-271-1/+60
| | |
| * | Only set is encrypted when encryption is enabledJoas Schilling2015-07-271-1/+1
| | |
* | | Merge pull request #17903 from owncloud/fix_17898_8.1Thomas Müller2015-07-271-1/+2
|\ \ \ | |/ / |/| | [backport 8.1] get header size before we open the file to avoid locking exception
| * | get header size before we open the file to avoid locking exceptionBjoern Schiessle2015-07-271-1/+2
|/ /
* | Merge pull request #17896 from owncloud/backport-scan-check-pathThomas Müller2015-07-272-0/+31
|\ \ | | | | | | [stable8.1] check if the user is trying to scan a valid path
| * | Add unit testsLukas Reschke2015-07-271-0/+28
| | |
| * | check if the user is trying to scan a valid pathRobin Appelman2015-07-271-0/+3
| | |
* | | Merge pull request #17883 from owncloud/backport-17882Thomas Müller2015-07-272-4/+4
|\ \ \ | | | | | | | | [stable8.1] Allow classes in <h2> tags
| * | | Allow classes in <h2> tagsLukas Reschke2015-07-262-4/+4
| | | | | | | | | | | | | | | | Previously something like `<h2 class="inlineblock"><?php p($l->t('Some title')) ?></h2>` was shown as `<h2 class="inlineblock">Some title` within the sidebar instead as `Some Title` due to the fact that the regex was catching these classes but was not properly running the string replace function.
* | | | Merge pull request #17842 from rullzer/backport_17818Thomas Müller2015-07-271-2/+2
|\ \ \ \ | |_|/ / |/| | | [Stable8.1] assign error message to correct object (backport #17818)
| * | | assign error message to correct objectmichag862015-07-231-2/+2
| | |/ | |/| | | | | | | fix for #17817
* | | Merge pull request #17843 from owncloud/dont-set-share-password-twice-stable8.1Morris Jobke2015-07-271-5/+12
|\ \ \ | |_|/ |/| | Adding error handling in case setting the password fails
| * | Adding error handling in case setting the password failsThomas Müller2015-07-231-5/+12
| |/
* | Merge pull request #17853 from owncloud/sharing-password-policy-stable8.1Thomas Müller2015-07-242-2/+24
|\ \ | |/ |/| Sharing password policy stable8.1
| * Fix PHPDoc on setPasswordThomas Müller2015-07-242-2/+2
| |
| * Use a hook to integrate sharing password verificationThomas Müller2015-07-241-0/+22
|/
* Merge pull request #17832 from owncloud/improve_apps_template_8.1Jan-Christoph Borchardt2015-07-231-4/+4
|\ | | | | [8.1 backport] make sure that there is a space between user- and admin-documentation
| * make sure that there is a space between user- and admin-documentationBjoern Schiessle2015-07-231-4/+4
|/
* 8.1.1 beta1 againv8.1.1beta1C Montero-Luque2015-07-221-1/+1
|
* 8.1.1 beta1v8.1.1betaC Montero-Luque2015-07-222-3/+3
|
* Merge pull request #17802 from owncloud/update-sabre-dav-2.1.6Thomas Müller2015-07-221-0/+0
|\ | | | | Update SabreDAV to 2.1.6
| * Update SabreDAV to 2.1.6Joas Schilling2015-07-221-0/+0
| |
* | Merge pull request #17816 from owncloud/enc_improved_app_description_8.1Björn Schießle2015-07-221-13/+8
|\ \ | |/ |/| [8.1 backport] improved description for the default encryption module
| * improved app description and adjust it to the way the new encryption module ↵Bjoern Schiessle2015-07-221-13/+8
|/ | | | works
* Merge pull request #17752 from ↵Joas Schilling2015-07-212-4/+81
|\ | | | | | | | | owncloud/enc_migration_fix_mountpoint_detection_8.1 [8.1 backport] fix system wide mount point detection on migration
| * fix mount point detectionBjoern Schiessle2015-07-202-4/+81
| |
* | Merge pull request #17762 from owncloud/backport-17723-stable8.1Morris Jobke2015-07-212-125/+133
|\ \ | | | | | | Backport of #17723 to stable8.1
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-04 22:47:56 +0000