summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * always update file cache, the cache can handle partial data correctly if the ...Bjoern Schiessle2015-07-312-8/+9
* | Merge pull request #17990 from owncloud/enc_only_update_file_cache_once_8.1Björn Schießle2015-08-032-7/+22
|\ \ | |/ |/|
| * only update database on the first run (first run = we have a version number f...Bjoern Schiessle2015-07-312-7/+22
* | Merge pull request #18003 from owncloud/backport-17805-stable8.1Roeland Douma2015-07-314-6/+59
|\ \
| * | [avatar] add error handlers for avatar setupMorris Jobke2015-07-314-6/+59
* | | Merge pull request #17949 from owncloud/stable8.1-settings-users-apprenderedf...Morris Jobke2015-07-291-0/+4
|\ \ \ | | |/ | |/|
| * | Trigger "apprendered" event in users pageVincent Petry2015-07-291-0/+4
|/ /
* | Merge pull request #17935 from owncloud/detect-old-openssl-versions-stable81Thomas Müller2015-07-294-11/+221
|\ \
| * | Detect old NSS and OpenSSL versionsLukas Reschke2015-07-284-11/+221
* | | Merge pull request #17929 from owncloud/stable8.1-smb-storageiddoubleslashThomas Müller2015-07-282-1/+16
|\ \ \
| * | | 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
|\ \ \ | |/ / |/| |
| * | Add unit testsLukas Reschke2015-07-282-13/+176
| * | set logger in constructorBjoern Schiessle2015-07-281-0/+1
|/ /
* | Merge pull request #17911 from owncloud/fix-enc-wrapper-without-encryption-st...Vincent Petry2015-07-275-4/+159
|\ \
| * | 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
| * | 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
|\ \ \ | |/ / |/| |
| * | 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
|\ \
| * | 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
|\ \ \
| * | | Allow classes in <h2> tagsLukas Reschke2015-07-262-4/+4
* | | | Merge pull request #17842 from rullzer/backport_17818Thomas Müller2015-07-271-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | assign error message to correct objectmichag862015-07-231-2/+2
| | |/ | |/|
* | | 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 failsThomas Müller2015-07-231-5/+12
| |/
* | Merge pull request #17853 from owncloud/sharing-password-policy-stable8.1Thomas Müller2015-07-242-2/+24
|\ \ | |/ |/|
| * 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
|\
| * 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.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
|\ \ | |/ |/|
| * improved app description and adjust it to the way the new encryption module w...Bjoern Schiessle2015-07-221-13/+8
|/
* Merge pull request #17752 from owncloud/enc_migration_fix_mountpoint_detectio...Joas Schilling2015-07-212-4/+81
|\
| * 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.1Arthur Schiwon2015-07-202-125/+133
* | | Merge pull request #17704 from owncloud/backport-stable8.1-17255-17526Morris Jobke2015-07-2110-1/+483
|\ \ \ | |/ / |/| |
| * | LDAP: when checking group for matching filter, also take base DN into conside...Arthur Schiwon2015-07-174-2/+96
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-05 13:45:37 +0000