summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8542 from owncloud/phpdoc-improvementsThomas Müller2014-05-13121-487/+543
|\
| * fixing variable namingThomas Müller2014-05-131-24/+24
| * @returns -> @returnThomas Müller2014-05-133-12/+12
| * @breif -> @briefThomas Müller2014-05-132-3/+3
| * fix PHPDocThomas Müller2014-05-131-3/+5
| * object -> \OC\PreviewThomas Müller2014-05-131-1/+1
| * adding PHPDocThomas Müller2014-05-131-2/+21
| * fixing typo and missing @throwsThomas Müller2014-05-131-1/+2
| * More PHPDoc for file functionsRobin McCorkell2014-05-132-0/+12
| * Fix various code errors detected by ScrutinizerRobin McCorkell2014-05-132-2/+2
| * Fix Scrutinizer errorsRobin McCorkell2014-05-134-7/+12
| * Change parameter order of implodeRobin McCorkell2014-05-131-1/+1
| * Fix Scrutinizer errors about missing user backendRobin McCorkell2014-05-132-21/+34
| * Use OC_User_Interface instead of OC_User_BackendRobin McCorkell2014-05-132-6/+6
| * Fix PHPDoc and typosLukas Reschke2014-05-134-15/+27
| * Change parameter type for useBackendRobin McCorkell2014-05-131-1/+1
| * Fix all PHPDoc types and variable names, in /libRobin McCorkell2014-05-1375-263/+255
| * Squash 'a | b' into 'a|b', in /libRobin McCorkell2014-05-1323-26/+26
| * Fix @return array PHPDocs, in /libRobin McCorkell2014-05-1338-75/+75
| * Replace @returns with @return, in /libRobin McCorkell2014-05-1318-72/+72
* | Merge pull request #8586 from owncloud/more-unit-testsThomas Müller2014-05-131-0/+2
|\ \ | |/ |/|
| * Add tests for other types that PHP might castLukas Reschke2014-05-131-0/+2
|/
* Merge pull request #8572 from owncloud/core-getabsolutepathwithzeroThomas Müller2014-05-132-1/+19
|\
| * Fixed getAbsolutePath case when path is "0"Vincent Petry2014-05-132-1/+19
* | Merge pull request #8524 from owncloud/prompt-dialogThomas Müller2014-05-131-1/+60
|\ \
| * | Fix Typo, define $ as globalLukas Reschke2014-05-111-2/+2
| * | Add prompt dialog to OC.dialogsRobin Appelman2014-05-091-0/+59
* | | Merge pull request #8398 from owncloud/enc_backup_keysBjörn Schießle2014-05-139-22/+176
|\ \ \
| * | | backup the encryption key after the encryption was disabled so that the userBjoern Schiessle2014-05-139-22/+176
* | | | Merge pull request #8566 from owncloud/controller-defaultsMorris Jobke2014-05-134-13/+46
|\ \ \ \ | |_|_|/ |/| | |
| * | | make it possible to omit parameters and use the default parameters from the c...Bernhard Posselt2014-05-134-13/+46
* | | | Merge pull request #8562 from owncloud/better-addmountpointVincent Petry2014-05-131-11/+25
|\ \ \ \
| * | | | Extract mount point merging logic into separate functionRobin McCorkell2014-05-131-11/+25
* | | | | Merge pull request #8550 from owncloud/fix-sticky-footerMorris Jobke2014-05-131-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | fix sticky footer on log in pageJan-Christoph Borchardt2014-05-121-2/+2
* | | | | Merge pull request #8526 from owncloud/escape-share-emails-masterVincent Petry2014-05-131-2/+2
|\ \ \ \ \
| * | | | | fix styleThomas Müller2014-05-121-2/+2
| * | | | | escape display name and emailThomas Müller2014-05-091-1/+1
* | | | | | Merge pull request #8546 from owncloud/fix-preview-orientation-encrypted-masterVincent Petry2014-05-131-4/+5
|\ \ \ \ \ \
| * | | | | | Rotate thumbnail when encryption is enabledThomas Müller2014-05-121-4/+5
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-1317-94/+104
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #8556 from owncloud/kill-legacy-code-masterThomas Müller2014-05-1236-540/+102
|\ \ \ \ \ \
| * | | | | | remove legacy aka deprecated code: OC_Cache_FileGlobalGCThomas Müller2014-05-121-4/+0
| * | | | | | remove legacy aka deprecated code: OC_FilesystemViewThomas Müller2014-05-1228-98/+89
| * | | | | | remove legacy aka deprecated code: OC_CacheThomas Müller2014-05-125-17/+7
| * | | | | | remove legacy aka deprecated code: OC_FilesystemThomas Müller2014-05-125-421/+6
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #8538 from owncloud/make-my-ide-less-complain-about-ldapLukas Reschke2014-05-1215-386/+691
|\ \ \ \ \ \
| * | | | | | Use array as typeLukas Reschke2014-05-121-1/+1
| * | | | | | That's bool and not always trueLukas Reschke2014-05-111-1/+1
| * | | | | | Use WizardResult|false instead of mixedLukas Reschke2014-05-111-2/+2