summaryrefslogtreecommitdiffstats
path: root/lib/private/files
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #16440 from owncloud/scrutinizer-patch-1Thomas Müller2015-05-193-13/+0
|\
| * Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-05-193-13/+0
* | Fix unexisting class and broken docJoas Schilling2015-05-191-1/+1
|/
* Merge pull request #16412 from owncloud/jknockaert-patch-1Björn Schießle2015-05-181-1/+1
|\
| * fix #16356jknockaert2015-05-181-1/+1
* | Merge pull request #16399 from owncloud/enc_rmdir_fixClark Tomlinson2015-05-181-2/+6
|\ \ | |/ |/|
| * only try to delete file keys if it is a valid pathBjoern Schiessle2015-05-181-2/+6
* | Merge pull request #15980 from owncloud/jknockaert-patch-1Björn Schießle2015-05-181-9/+7
|\ \
| * | fix #15973jknockaert2015-04-301-9/+7
* | | a new approach to display the error messageBjoern Schiessle2015-05-181-0/+24
| |/ |/|
* | delete all file keys doesn't need the encryption module as parameter; impleme...Bjoern Schiessle2015-05-131-4/+23
* | Merge pull request #16269 from owncloud/master-fix-16179Morris Jobke2015-05-121-2/+6
|\ \
| * | Check if cURL supports the desired featuresLukas Reschke2015-05-121-2/+6
* | | use hooks to update encryption keys instead of the storage wrapper if a file ...Bjoern Schiessle2015-05-111-7/+1
|/ /
* | Fix missing types on doc block and deduplicate the method nameJoas Schilling2015-05-061-4/+4
* | update 'encrypted'-flag in file cache according to the storage settingsBjoern Schiessle2015-05-062-6/+47
* | move/copy from storageBjoern Schiessle2015-05-061-7/+67
* | unit testsBjoern Schiessle2015-05-061-1/+1
* | check if encryption is enbaled before we start moving keysBjoern Schiessle2015-05-061-24/+29
* | Merge pull request #16070 from owncloud/enc_update_file_cache_on_copyMorris Jobke2015-05-061-0/+4
|\ \
| * | make sure that we keep the correct encrypted-flag and the (unencrypted)size i...Bjoern Schiessle2015-05-051-0/+4
| |/
* / improve phpdoc of cache classesRobin Appelman2015-05-053-29/+139
|/
* Merge pull request #14764 from owncloud/shared-etag-propagateMorris Jobke2015-04-283-1/+12
|\
| * fix propagation when renaming a directly reshared folderRobin Appelman2015-04-271-0/+4
| * Make the change propagator an emitterRobin Appelman2015-04-272-1/+8
* | Merge pull request #15886 from owncloud/fix-15848-masterThomas Müller2015-04-271-1/+4
|\ \
| * | fixes #15848Thomas Müller2015-04-271-1/+4
| |/
* | Merge pull request #15860 from owncloud/enc_fallback_old_encryptionThomas Müller2015-04-272-14/+36
|\ \ | |/ |/|
| * fall back to the ownCloud default encryption module and aes128 if we read a e...Bjoern Schiessle2015-04-272-14/+36
* | Make getDefaultModuleId public and get module protectedJoas Schilling2015-04-271-4/+2
|/
* fix unit testsBjoern Schiessle2015-04-241-4/+10
* Update encryption.phpjknockaert2015-04-241-1/+2
* fixed namejknockaert2015-04-241-1/+1
* Update encryption.phpjknockaert2015-04-241-8/+8
* fix encryption header errorjknockaert2015-04-241-13/+16
* Use public interfaces for type hintingJoas Schilling2015-04-241-12/+12
* only update share keys if the file was encryptedBjoern Schiessle2015-04-241-4/+10
* update share keys if file gets copiedBjoern Schiessle2015-04-231-3/+3
* update share keys if a file is moved to a shared folderBjoern Schiessle2015-04-231-7/+21
* Merge pull request #15809 from owncloud/view-null-rootVincent Petry2015-04-221-0/+6
|\
| * typoRobin Appelman2015-04-221-1/+1
| * dont allow using null as view rootRobin Appelman2015-04-221-0/+6
* | Merge pull request #15799 from owncloud/fix-enc-folder-moveThomas Müller2015-04-221-20/+10
|\ \ | |/ |/|
| * pass KeyStorage via ctorThomas Müller2015-04-221-16/+9
| * calling renameKeys() on directory level as well - fixes #15778Thomas Müller2015-04-221-7/+3
| * add $encryptionModuleId to methods of Keys/IStorageThomas Müller2015-04-221-4/+5
* | Merge pull request #15549 from owncloud/jcf-fix-cache-updateMorris Jobke2015-04-221-1/+8
|\ \ | |/ |/|
| * clarify the duplication of the $params arrayJens-Christian Fischer2015-04-121-1/+2
| * don't update identical valuesJens-Christian Fischer2015-04-111-1/+7
* | Merge pull request #15757 from owncloud/enc-fixfeofforlastblockBjörn Schießle2015-04-221-0/+4
|\ \