summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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
* | | | Merge pull request #15737 from owncloud/add-deprecated-versionRoeland Douma2015-04-1914-87/+89
|\ \ \ \ | | | | | | | | | | Add version to @deprecated tags
| * | | | Add version to @deprecated tagsMorris Jobke2015-04-1914-87/+89
| |/ / /
* | | | Merge pull request #15729 from owncloud/remove-unused-variablesRobin McCorkell2015-04-1912-21/+14
|\ \ \ \ | | | | | | | | | | Remove unused variables
| * | | | Remove unused variablesMorris Jobke2015-04-1812-21/+14
| | |/ / | |/| | | | | | | | | | | | | | * should make scrutinizer a lot more happy * reduces maybe memory footprint
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-1952-42/+350
| |/ / |/| |
* | | Merge pull request #15718 from ↵Thomas Müller2015-04-183-7/+7
|\ \ \ | | | | | | | | | | | | | | | | owncloud/issue/15694-display-name-of-encryption-modules Issue/15694 display name of encryption modules
| * | | Fix dummy encryption module registrationJoas Schilling2015-04-181-1/+1
| | | |
| * | | Fix potential undefined variableJoas Schilling2015-04-181-2/+2
| | | |
| * | | Fix display name of encryption modulesJoas Schilling2015-04-181-4/+4
| | |/ | |/|
* | | Merge pull request #15728 from owncloud/update-iurlgenerator-docThomas Müller2015-04-181-1/+3
|\ \ \ | | | | | | | | IUrlGenerator - document linkTo properly
| * | | IUrlGenerator - document linkTo properlyMorris Jobke2015-04-181-1/+3
| | |/ | |/| | | | | | | | | | * parameter $args was there since 6.0.0 * see 61a9098b7d88656d0297a18c1b7685c04d1c64dc
* | | Merge pull request #15727 from owncloud/cleanup-db-interfaceThomas Müller2015-04-186-26/+24
|\ \ \ | | | | | | | | DB: remove unused parameter - was forgotten during the migration to doct...
| * | | fix followup issues with unneeded parametersMorris Jobke2015-04-185-20/+20
| | | |
| * | | DB: remove unused parameter - was forgotten during the migration to doctrineMorris Jobke2015-04-182-6/+4
| |/ / | | | | | | | | | * 377e9a8677afc92bca61fb1bb055901db8457896 <- doctrine merge
* | | Merge pull request #15725 from owncloud/l10n-public-interfaceThomas Müller2015-04-181-2/+4
|\ \ \ | | | | | | | | IL10n - add PHPDoc for $options
| * | | IL10n - add PHPDoc for $optionsMorris Jobke2015-04-181-2/+4
| |/ / | | | | | | | | | | | | * added in #11549 * undocumented in the public interface
* | | Merge pull request #15722 from owncloud/remove-vardumpsMorris Jobke2015-04-181-3/+3
|\ \ \ | | | | | | | | LDAP tests: switch var_dump to exception
| * | | LDAP tests: swithc var_dump to exceptionMorris Jobke2015-04-181-3/+3
| |/ /
* | | Merge pull request #15723 from owncloud/fix-decimal-unit-testsMorris Jobke2015-04-181-22/+24
|\ \ \ | | | | | | | | Use data provider instead of hand-crafted for loops
| * | | Use data provider instead of hand-crafted for loopsMorris Jobke2015-04-181-22/+24
| |/ / | | | | | | | | | | | | * reduces scrutinizer complains * uses PHPUnit functionality
* | | Merge pull request #15720 from owncloud/fix-method-visibilityThomas Müller2015-04-184-98/+98
|\ \ \ | |/ / |/| | add visibility of methods in server container
| * | fix wrong variable names in PHPDocMorris Jobke2015-04-182-4/+4
| | |
| * | add visibility of methods in server container and interfaceMorris Jobke2015-04-182-94/+94
|/ /
* | Merge pull request #15692 from owncloud/log-exception-type-masterJoas Schilling2015-04-181-0/+1
|\ \ | |/ |/| Write the type of exception to the log - really helpful for exceptions w...
| * Write the type of exception to the log - really helpful for exceptions which ↵Thomas Müller2015-04-171-0/+1
| | | | | | | | hold no message
* | [tx-robot] updated from transifexJenkins for ownCloud2015-04-18242-198/+692
| |
* | Merge pull request #15714 from owncloud/fix-ldap-xpmodeMorris Jobke2015-04-183-2/+8
|\ \ | | | | | | always open filter tab in raw mode, when 'Manually enter LDAP filters' i...
| * | always open filter tab in raw mode, when 'Manually enter LDAP filters' is ↵Arthur Schiwon2015-04-173-2/+8
|/ / | | | | | | checked
* | 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