summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #15890 from owncloud/fix-helper-docsThomas Müller2015-04-271-4/+5
|\
| * Fix several type(hint) errors in private/helper.phpJoas Schilling2015-04-271-4/+5
* | 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-273-15/+38
|\ \ | |/ |/|
| * fall back to the ownCloud default encryption module and aes128 if we read a e...Bjoern Schiessle2015-04-273-15/+38
* | Merge pull request #15882 from owncloud/fix-type-annotationMorris Jobke2015-04-272-2/+2
|\ \
| * | Fix type annotationLukas Reschke2015-04-272-2/+2
| |/
* | Merge pull request #15411 from mmattel/fix_for_15375_better_message_textThomas Müller2015-04-271-0/+1
|\ \
| * | Improve error messge text for app upgrade try (#15375)Martin2015-04-221-0/+1
* | | Make methods explicit publicJoas Schilling2015-04-271-6/+6
* | | Make getDefaultModuleId public and get module protectedJoas Schilling2015-04-274-18/+11
* | | Verify that the encryption module exists before setting itJoas Schilling2015-04-271-6/+7
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2015-04-272-0/+2
* | Merge pull request #15834 from owncloud/make-temporary-file-really-uniqueLukas Reschke2015-04-251-38/+61
|\ \
| * | Fix collision on temporary files + adjust permissionsLukas Reschke2015-04-231-38/+61
* | | Merge pull request #15683 from owncloud/block-legacy-clientsLukas Reschke2015-04-241-0/+79
|\ \ \
| * | | Catch not existing User-Agent headerLukas Reschke2015-04-231-1/+5
| * | | Use 403 instead a 50x responseLukas Reschke2015-04-201-10/+9
| * | | Block old legacy clientsLukas Reschke2015-04-201-0/+76
* | | | 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
* | | | Merge pull request #15839 from owncloud/enc_fix_moving_shared_filesJoas Schilling2015-04-247-52/+127
|\ \ \ \
| * | | | Use public interfaces for type hintingJoas Schilling2015-04-242-13/+13
| * | | | only update share keys if the file was encryptedBjoern Schiessle2015-04-243-4/+21
| * | | | 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-235-40/+98
| | |/ / | |/| |
* / | | Ignore test folders when checking the code for complianceThomas Müller2015-04-231-1/+1
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-236-2/+44
* | | 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-227-194/+94
|\ \ \ \ | |/ / / |/| | |
| * | | fix PHPDocThomas Müller2015-04-221-7/+8
| * | | pass KeyStorage via ctorThomas Müller2015-04-222-17/+11
| * | | 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-226-170/+79
* | | | Merge pull request #15787 from owncloud/trash-partfilesMorris Jobke2015-04-221-2/+2
|\ \ \ \
| * | | | Do not trash part files, delete directlyVincent Petry2015-04-211-2/+2
* | | | | 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
|\ \ \ \ \
| * | | | | Fix encryption feof to not return too earlyVincent Petry2015-04-201-0/+4
| | |_|_|/ | |/| | |
* | | | | Merge pull request #15734 from owncloud/add-deprecate-tagsThomas Müller2015-04-216-1/+27
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add @deprecated to all methods with a proper method in \OCPMorris Jobke2015-04-206-1/+27
* | | | | get dirname from sharePathBjoern Schiessle2015-04-211-1/+1