summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 #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
| * | | Fix wrong path generationMorris Jobke2015-04-201-1/+1
* | | | Merge pull request #15635 from owncloud/issue/15634-empty-txt-previewsMorris Jobke2015-04-201-1/+1
|\ \ \ \
| * | | | 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 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
|\ \ \ \ \
| * | | | | 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
| * | | | | Verify if returned object is an arrayLukas Reschke2015-04-202-24/+38
* | | | | | Merge pull request #15733 from owncloud/remove-oc_backgroundjobLukas Reschke2015-04-203-60/+7
|\ \ \ \ \ \
| * | | | | | Removed OC_BackgroundJob - reduce class overheadMorris Jobke2015-04-183-60/+7
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #15747 from owncloud/ldap-remove-deprecated-const-usage-groupJoas Schilling2015-04-201-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | 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
|\ \ \ \ \
| * | | | | Add version to deprecation noticeLukas Reschke2015-04-202-3/+3
| * | | | | Deprecate unused `\OCP\Response::sendFile`Lukas Reschke2015-04-202-3/+6
|/ / / / /
* | | | | 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
| | |_|/ / / | |/| | | |