summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fixing return values and adding testsClark Tomlinson2015-04-222-32/+220
* Merge pull request #15799 from owncloud/fix-enc-folder-moveThomas Müller2015-04-2214-267/+168
|\
| * fix PHPDocThomas Müller2015-04-221-7/+8
| * pass KeyStorage via ctorThomas Müller2015-04-223-43/+12
| * calling renameKeys() on directory level as well - fixes #15778Thomas Müller2015-04-222-9/+18
| * add $encryptionModuleId to methods of Keys/IStorageThomas Müller2015-04-2213-218/+140
* | Merge pull request #15787 from owncloud/trash-partfilesMorris Jobke2015-04-222-3/+6
|\ \
| * | Do not trash part files, delete directlyVincent Petry2015-04-212-3/+6
* | | 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-224-6/+94
|\ \ \
| * | | Fix encryption feof to not return too earlyVincent Petry2015-04-204-6/+94
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-22102-14/+314
* | | | 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
* | | | Merge pull request #15782 from owncloud/hide-modified-multiselectMorris Jobke2015-04-211-1/+10
|\ \ \ \
| * | | | hide modified header when multiselect is active, fix #15779Jan-Christoph Borchardt2015-04-211-1/+10
* | | | | Merge pull request #15721 from oparoz/fix-readonly-cacheThomas Müller2015-04-212-1/+96
|\ \ \ \ \
| * | | | | Renamed class + split methodsOlivier Paroz2015-04-211-25/+13
| * | | | | Tests for read-only cacheOlivier Paroz2015-04-181-0/+105
| * | | | | Thou shalt not corrupt the answer of a cache requestOlivier Paroz2015-04-181-1/+3
* | | | | | Merge pull request #15690 from owncloud/enc_fix_uploadBjörn Schießle2015-04-212-2/+96
|\ \ \ \ \ \
| * | | | | | get dirname from sharePathBjoern Schiessle2015-04-212-2/+96
* | | | | | | Merge pull request #15769 from owncloud/files-emptycontentreadonlyJan-Christoph Borchardt2015-04-214-5/+16
|\ \ \ \ \ \ \
| * | | | | | | Added empty content message for empty read-only foldersVincent Petry2015-04-214-5/+16
| |/ / / / / /
* | | | | | | Merge pull request #15770 from owncloud/fix-15764Morris Jobke2015-04-211-1/+0
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | bring back border in host input field for consistencyArthur Schiwon2015-04-211-1/+0
| |/ / / / /
* | | | | | Merge pull request #15713 from owncloud/fix-15707-masterMorris Jobke2015-04-214-39/+47
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | doc and indentThomas Müller2015-04-212-4/+8
| * | | | | Don't pollute the global namespaceThomas Müller2015-04-213-33/+44
| * | | | | make jshint happyThomas Müller2015-04-202-14/+17
| * | | | | use a simple function - OC.Encryption is already defined - fixes #15707Thomas Müller2015-04-201-23/+13
* | | | | | Merge pull request #15636 from owncloud/enc2_performance_improvementBjörn Schießle2015-04-211-3/+2
|\ \ \ \ \ \
| * | | | | | set size and unencrypted size to zero on fopenBjoern Schiessle2015-04-201-3/+2
* | | | | | | Merge pull request #15753 from owncloud/remove-app-version-from-disabled-listThomas Müller2015-04-213-4/+25
|\ \ \ \ \ \ \
| * | | | | | | Remove the app version from disabled app listJoas Schilling2015-04-203-4/+25
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-2110-8/+44
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #15677 from owncloud/enc_reset_private_key_passwordThomas Müller2015-04-205-10/+379
|\ \ \ \ \ \ \
| * | | | | | | Dont use the old .status wayJoas Schilling2015-04-203-24/+12
| * | | | | | | Fix several minor thingsJoas Schilling2015-04-202-24/+21
| * | | | | | | let user update the private key password in case the login password was chang...Bjoern Schiessle2015-04-174-0/+384
* | | | | | | | Merge pull request #15748 from owncloud/fixing-enc-filesize-once-moreVincent Petry2015-04-206-26/+78
|\ \ \ \ \ \ \ \
| * | | | | | | | move permission related code into getMetaData()Thomas Müller2015-04-203-15/+20
| * | | | | | | | Avoid function name collision in dropbox external storageThomas Müller2015-04-201-7/+7
| * | | | | | | | Introduce Storage::getMetaData() to allow storage implementations more contro...Thomas Müller2015-04-205-10/+10
| * | | | | | | | Introduce Storage::getData() to allow storage implementations more control ov...Thomas Müller2015-04-205-10/+57
* | | | | | | | | Merge pull request #15744 from owncloud/fix-inverted-path-in-resourcenotfoundLukas Reschke2015-04-202-9/+21
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Add tests for correct pathJoas Schilling2015-04-201-1/+2
| * | | | | | | | Fix phpStorm complains and namespaceJoas Schilling2015-04-201-7/+18