summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* 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-224-156/+56
|
* Merge pull request #15757 from owncloud/enc-fixfeofforlastblockBjörn Schießle2015-04-221-0/+4
|\ | | | | Fix encryption feof to not return too early
| * Fix encryption feof to not return too earlyVincent Petry2015-04-201-0/+4
| | | | | | | | | | | | | | | | | | | | This is because stream_read will pre-cache the next block which causes feof($this->source) to return true prematurely. So we cannot rely on it. Fixed encryption stream wrapper unit tests to actually simulate 6k/8k blocks to make sure we cover the matching logic. Added two data files with 8192 and 8193 bytes.
* | get dirname from sharePathBjoern Schiessle2015-04-211-1/+1
| |
* | Merge pull request #15636 from owncloud/enc2_performance_improvementBjörn Schießle2015-04-211-3/+2
|\ \ | | | | | | [encryption2] set size and unencrypted size to zero at the beginning of a write operation
| * | set size and unencrypted size to zero on fopenBjoern Schiessle2015-04-201-3/+2
| | |
* | | Merge pull request #15748 from owncloud/fixing-enc-filesize-once-moreVincent Petry2015-04-205-19/+71
|\ \ \ | | | | | | | | Introduce Storage::getData() to allow storage implementations more contr...
| * | | move permission related code into getMetaData()Thomas Müller2015-04-203-15/+20
| | | |
| * | | Introduce Storage::getMetaData() to allow storage implementations more ↵Thomas Müller2015-04-205-10/+10
| | | | | | | | | | | | | | | | control over the data array
| * | | Introduce Storage::getData() to allow storage implementations more control ↵Thomas Müller2015-04-205-10/+57
| | | | | | | | | | | | | | | | over the data array
* | | | Merge pull request #15744 from owncloud/fix-inverted-path-in-resourcenotfoundLukas Reschke2015-04-201-1/+1
|\ \ \ \ | |_|_|/ |/| | | Fix wrong path generation
| * | | Fix wrong path generationMorris Jobke2015-04-201-1/+1
| | | | | | | | | | | | | | | | * fixes #15742
* | | | Merge pull request #15635 from owncloud/issue/15634-empty-txt-previewsMorris Jobke2015-04-201-1/+1
|\ \ \ \ | | | | | | | | | | Scale up the font on larger previews
| * | | | Scale up the font on larger previewsJoas Schilling2015-04-151-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #15735 from owncloud/fix-visibilityMorris Jobke2015-04-203-4/+4
|\ \ \ \ | |_|_|/ |/| | | Fix visibility of interfaces in \OCP
| * | | Fix visibility of public API methodsJoas Schilling2015-04-203-4/+4
| | | |
* | | | Merge pull request #15637 from owncloud/migrate-certificate-stuffLukas Reschke2015-04-202-12/+12
|\ \ \ \ | | | | | | | | | | Migrate personal certificate handling to AppFramework controllers
| * | | | Proper return typesLukas Reschke2015-04-201-2/+2
| | | | |
| * | | | Verify if returned object is an arrayLukas Reschke2015-04-201-10/+10
| | | | | | | | | | | | | | | | | | | | The error has to be thrown at this point as otherwise errors and notices are thrown since the time cannot be parsed in L60 and L61
* | | | | Merge pull request #15733 from owncloud/remove-oc_backgroundjobLukas Reschke2015-04-201-56/+0
|\ \ \ \ \ | |/ / / / |/| | | | Removed OC_BackgroundJob - reduce class overhead
| * | | | Removed OC_BackgroundJob - reduce class overheadMorris Jobke2015-04-181-56/+0
| |/ / / | | | | | | | | | | | | * method code is now in the static public namespace (5 sloc)
* | | | Add version to deprecation noticeLukas Reschke2015-04-201-1/+1
| | | | | | | | | | | | | | | | As requested by @MorrisJobke
* | | | Deprecate unused `\OCP\Response::sendFile`Lukas Reschke2015-04-201-3/+4
| | | | | | | | | | | | | | | | This function is unused in our own code and can be better achieved using the AppFramework. Also very easy to do grave mistaked using this function.
* | | | Merge pull request #15717 from ↵Morris Jobke2015-04-201-10/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/issue/15716-fixing-ocp-api-namespace-usage Fixing OCS API namespace usage
| * | | | Fix usage of deprecated private constantsJoas Schilling2015-04-181-2/+2
| | | | |
| * | | | Deprecate the OC_API constants in favor of the OCP onesJoas Schilling2015-04-181-8/+24
| | | | |
* | | | | Merge pull request #15739 from DavidPrevot/symfony-2.7Morris Jobke2015-04-191-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | Replace `_method` requirement by {g,s}etMethods()
| * | | | Replace `_method` requirement by {g,s}etMethods()David Prévot2015-04-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the call compatible with future Symfony version, and avoid E_USER_DEPRECATED as thrown by the current 2.7.0-beta1: The "_method" requirement is deprecated since version 2.2 and will be removed in 3.0. Use getMethods() instead. at …/Symfony/Component/Routing/Route.php#554 The "_method" requirement is deprecated since version 2.2 and will be removed in 3.0. Use the setMethods() method instead or the "methods" option in the route definition. at …/Symfony/Component/Routing/Route.php#662
* | | | | get rid of OC_GeoGeorg Ehrke2015-04-191-50/+0
|/ / / /
* | | | Merge pull request #15729 from owncloud/remove-unused-variablesRobin McCorkell2015-04-1910-19/+12
|\ \ \ \ | |_|/ / |/| | | Remove unused variables
| * | | Remove unused variablesMorris Jobke2015-04-1810-19/+12
| |/ / | | | | | | | | | | | | * should make scrutinizer a lot more happy * reduces maybe memory footprint
* | | Merge pull request #15718 from ↵Thomas Müller2015-04-181-4/+4
|\ \ \ | | | | | | | | | | | | | | | | owncloud/issue/15694-display-name-of-encryption-modules Issue/15694 display name of encryption modules
| * | | Fix display name of encryption modulesJoas Schilling2015-04-181-4/+4
| |/ /
* | | Merge pull request #15727 from owncloud/cleanup-db-interfaceThomas Müller2015-04-184-22/+21
|\ \ \ | | | | | | | | DB: remove unused parameter - was forgotten during the migration to doct...
| * | | fix followup issues with unneeded parametersMorris Jobke2015-04-184-19/+19
| | | |
| * | | DB: remove unused parameter - was forgotten during the migration to doctrineMorris Jobke2015-04-181-3/+2
| |/ / | | | | | | | | | * 377e9a8677afc92bca61fb1bb055901db8457896 <- doctrine merge
* / / add visibility of methods in server container and interfaceMorris Jobke2015-04-181-48/+48
|/ /
* | Merge pull request #15691 from owncloud/vobject-sabre2.1Morris Jobke2015-04-171-258/+0
|\ \ | | | | | | Get rid of the obsolete OC_VObject class
| * | Get rid of the obsolete OC_VObject classVincent Petry2015-04-171-258/+0
| | | | | | | | | | | | The class isn't needed any more since the update to Sabre 2.1
* | | Delay initialization of the OC\Encryption\Update - introducing ↵Thomas Müller2015-04-171-0/+66
| | | | | | | | | | | | 'OC\Encryption\HookManager'
* | | always create a new instance of the encryption moduleBjoern Schiessle2015-04-171-23/+19
| | |
* | | Merge pull request #15445 from owncloud/enc2_migrationClark Tomlinson2015-04-166-23/+107
|\ \ \ | | | | | | | | add migration script from old encryption to new one
| * | | detect system wide mount points correctlyBjoern Schiessle2015-04-164-10/+53
| | | |
| * | | if we start writing a file from the beginning, size should start by zero; ↵Bjoern Schiessle2015-04-161-2/+2
| | | | | | | | | | | | | | | | result of floor needs to be casted to int in order to compare it with ->size
| * | | add migration script from old encryption to new oneBjoern Schiessle2015-04-164-12/+53
| | |/ | |/|
* | | Merge pull request #15674 from owncloud/fix-console-check-outputJoas Schilling2015-04-161-2/+2
|\ \ \ | | | | | | | | Convert error and hint to string before writing to the output
| * | | Convert error and hint to string before writing to the output - fixes ↵Thomas Müller2015-04-161-2/+2
| | |/ | |/| | | | | | | https://mailman.owncloud.org/pipermail/devel/2015-April/001184.html
* / | Using TRANSACTION_READ_COMMITTEDThomas Müller2015-04-161-0/+2
|/ /