summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #15717 from owncloud/issue/15716-fixing-ocp-api-namespace-...Morris Jobke2015-04-2015-81/+120
|\
| * 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()David Prévot2015-04-191-2/+2
* | | Merge pull request #15740 from owncloud/get_rid_of_geoThomas Müller2015-04-192-73/+0
|\ \ \
| * | | 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 constantsMorris Jobke2015-04-181-5/+5
* | | 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 directlyMorris Jobke2015-04-193-9/+10
* | | | Merge pull request #15737 from owncloud/add-deprecated-versionRoeland Douma2015-04-1914-87/+89
|\ \ \ \
| * | | | 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 variablesMorris Jobke2015-04-1812-21/+14
| | |/ / | |/| |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-1952-42/+350
| |/ / |/| |
* | | Merge pull request #15718 from owncloud/issue/15694-display-name-of-encryptio...Thomas Müller2015-04-183-7/+7
|\ \ \
| * | | 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 properlyMorris Jobke2015-04-181-1/+3
| | |/ | |/|
* | | Merge pull request #15727 from owncloud/cleanup-db-interfaceThomas Müller2015-04-186-26/+24
|\ \ \
| * | | 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
| |/ /
* | | Merge pull request #15725 from owncloud/l10n-public-interfaceThomas Müller2015-04-181-2/+4
|\ \ \
| * | | IL10n - add PHPDoc for $optionsMorris Jobke2015-04-181-2/+4
| |/ /
* | | Merge pull request #15722 from owncloud/remove-vardumpsMorris Jobke2015-04-181-3/+3
|\ \ \
| * | | 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 loopsMorris Jobke2015-04-181-22/+24
| |/ /
* | | Merge pull request #15720 from owncloud/fix-method-visibilityThomas Müller2015-04-184-98/+98
|\ \ \ | |/ / |/| |
| * | 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 which ...Thomas Müller2015-04-171-0/+1
* | [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' is che...Arthur Schiwon2015-04-173-2/+8
|/ /
* | Merge pull request #15691 from owncloud/vobject-sabre2.1Morris Jobke2015-04-171-258/+0
|\ \
| * | Get rid of the obsolete OC_VObject classVincent Petry2015-04-171-258/+0
* | | Merge pull request #15708 from owncloud/fix-capitalizationMorris Jobke2015-04-172-5/+5
|\ \ \
| * | | fix capitalization for server-side encryption and email server, fix #15642Jan-Christoph Borchardt2015-04-172-5/+5
* | | | Revert "make jshint happy"Thomas Müller2015-04-172-20/+17
* | | | Revert "use a simple function - OC.Encryption is already defined - fixes #15707"Thomas Müller2015-04-171-13/+23
* | | | make jshint happyThomas Müller2015-04-172-17/+20