summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Don't pollute the global namespaceThomas Müller2015-04-213-33/+44
|
* make jshint happyThomas Müller2015-04-202-14/+17
| | | | This reverts commit ae681f0061f534b48b45cf9a41f6110c0ff20b1d.
* use a simple function - OC.Encryption is already defined - fixes #15707Thomas Müller2015-04-201-23/+13
| | | | This reverts commit 0ca6398aa34e0a3698f3aed0305f0e9299578bbc.
* Merge pull request #15677 from owncloud/enc_reset_private_key_passwordThomas Müller2015-04-205-10/+379
|\ | | | | [encryption] let user update the private key password
| * 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 ↵Bjoern Schiessle2015-04-174-0/+384
| | | | | | | | changed from outside
* | Merge pull request #15748 from owncloud/fixing-enc-filesize-once-moreVincent Petry2015-04-206-26/+78
|\ \ | | | | | | Introduce Storage::getData() to allow storage implementations more contr...
| * | 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 ↵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-202-9/+21
|\ \ \ | | | | | | | | Fix wrong path generation
| * | | Add tests for correct pathJoas Schilling2015-04-201-1/+2
| | | |
| * | | Fix phpStorm complains and namespaceJoas Schilling2015-04-201-7/+18
| | | |
| * | | 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-208-22/+22
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix visibility of interfaces in \OCP
| * | | | Fix visibility of public API methodsJoas Schilling2015-04-203-4/+4
| | | | |
| * | | | Fix visibility of interfaces in \OCPMorris Jobke2015-04-195-18/+18
| | | | |
* | | | | Merge pull request #15637 from owncloud/migrate-certificate-stuffLukas Reschke2015-04-2015-132/+359
|\ \ \ \ \ | | | | | | | | | | | | Migrate personal certificate handling to AppFramework controllers
| * | | | | Adjust tests and statuscodeLukas Reschke2015-04-203-9/+19
| | | | | |
| * | | | | fix date variableMorris Jobke2015-04-201-1/+1
| | | | | |
| * | | | | Fix filesLukas Reschke2015-04-201-2/+6
| | | | | |
| * | | | | Proper return typesLukas Reschke2015-04-202-3/+4
| | | | | |
| * | | | | Migrate personal certificate handling into AppFramework controllersLukas Reschke2015-04-2010-100/+298
| | | | | | | | | | | | | | | | | | | | | | | | Also added unit-tests and better error-handling
| * | | | | Verify if returned object is an arrayLukas Reschke2015-04-202-24/+38
| | | | | | | | | | | | | | | | | | | | | | | | 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-203-60/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Removed OC_BackgroundJob - reduce class overhead
| * | | | | | Removed OC_BackgroundJob - reduce class overheadMorris Jobke2015-04-183-60/+7
| | |/ / / / | |/| | | | | | | | | | | | | | | | * method code is now in the static public namespace (5 sloc)
* | | | | | Merge pull request #15747 from owncloud/ldap-remove-deprecated-const-usage-groupJoas Schilling2015-04-201-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | move away from deprecated consts
| * | | | | move away from deprecated constsArthur Schiwon2015-04-201-1/+1
|/ / / / /
* | | | | Merge pull request #15629 from owncloud/deprecate-potential-dangerous-methodsLukas Reschke2015-04-202-3/+6
|\ \ \ \ \ | | | | | | | | | | | | Deprecate unused `\OCP\Response::sendFile`
| * | | | | Add version to deprecation noticeLukas Reschke2015-04-202-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | As requested by @MorrisJobke
| * | | | | Deprecate unused `\OCP\Response::sendFile`Lukas Reschke2015-04-202-3/+6
|/ / / / / | | | | | | | | | | | | | | | 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-2015-81/+120
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue/15716-fixing-ocp-api-namespace-usage Fixing OCS API namespace usage
| * | | | | Add @since tag to public namespace constantsMorris Jobke2015-04-181-0/+2
| | | | | |
| * | | | | Fix usage of deprecated private constantsJoas Schilling2015-04-1814-71/+76
| | | | | |
| * | | | | Deprecate the OC_API constants in favor of the OCP onesJoas Schilling2015-04-181-8/+24
| | | | | |
| * | | | | Move constants to OCP\API so apps can use themJoas Schilling2015-04-181-2/+18
| | | | | |
| * | | | | Correctly prefix OC_API with \ since its not in the namespaceJoas Schilling2015-04-181-2/+2
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-2020-4/+78
| | | | | |
* | | | | | 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
* | | | | | Merge pull request #15740 from owncloud/get_rid_of_geoThomas Müller2015-04-192-73/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | get rid of OC_Geo
| * | | | | | get rid of OC_GeoGeorg Ehrke2015-04-192-73/+0
| |/ / / / /
* | | | | | Merge pull request #15724 from owncloud/ldap-remove-deprecated-const-usageThomas Müller2015-04-191-5/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | LDAP - move from constants to class member constants
| * | | | | LDAP - move from constants to class member constantsMorris Jobke2015-04-181-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes scrutinizer warnings * drops the usage of deprecated code usage
* | | | | | Merge pull request #15736 from owncloud/remove-dependency-on-legacy-code-in-ocpRoeland Douma2015-04-193-9/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | Reduce call of legacy wrapper by call the OCP directly
| * | | | | | Reduce call of legacy wrapper by call the OCP directlyMorris Jobke2015-04-193-9/+10
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | * ref #15734 * reduces the call depth, because the private methods just call OCP stuff