Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-15 | 1 | -1/+3 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-14 | 2 | -0/+13 |
| | |||||
* | fixing variable naming | Thomas Müller | 2014-05-13 | 1 | -24/+24 |
| | |||||
* | fix PHPDoc | Thomas Müller | 2014-05-13 | 1 | -3/+5 |
| | |||||
* | object -> \OC\Preview | Thomas Müller | 2014-05-13 | 1 | -1/+1 |
| | |||||
* | adding PHPDoc | Thomas Müller | 2014-05-13 | 1 | -2/+21 |
| | |||||
* | fixing typo and missing @throws | Thomas Müller | 2014-05-13 | 1 | -1/+2 |
| | |||||
* | More PHPDoc for file functions | Robin McCorkell | 2014-05-13 | 2 | -0/+12 |
| | |||||
* | Fix various code errors detected by Scrutinizer | Robin McCorkell | 2014-05-13 | 2 | -2/+2 |
| | | | | | | Fixed: - An error with a misplaced bracket in lib/private/util.php - An error with an incorrect function being called in lib/public/contacts.php | ||||
* | Fix Scrutinizer errors | Robin McCorkell | 2014-05-13 | 4 | -7/+12 |
| | |||||
* | Change parameter order of implode | Robin McCorkell | 2014-05-13 | 1 | -1/+1 |
| | |||||
* | Use OC_User_Interface instead of OC_User_Backend | Robin McCorkell | 2014-05-13 | 2 | -6/+6 |
| | |||||
* | Fix PHPDoc and typos | Lukas Reschke | 2014-05-13 | 4 | -15/+27 |
| | | | | | | | | | | | | | Some things my IDE complained about while creating a custom backend. Fix PHPDoc and typos Some things my IDE complained about while creating a custom backend. Conflicts: lib/private/group/database.php lib/private/group/dummy.php lib/private/group/example.php | ||||
* | Change parameter type for useBackend | Robin McCorkell | 2014-05-13 | 1 | -1/+1 |
| | |||||
* | Fix all PHPDoc types and variable names, in /lib | Robin McCorkell | 2014-05-13 | 75 | -263/+255 |
| | |||||
* | Squash 'a | b' into 'a|b', in /lib | Robin McCorkell | 2014-05-13 | 23 | -26/+26 |
| | |||||
* | Fix @return array PHPDocs, in /lib | Robin McCorkell | 2014-05-13 | 38 | -75/+75 |
| | |||||
* | Replace @returns with @return, in /lib | Robin McCorkell | 2014-05-13 | 18 | -72/+72 |
| | |||||
* | Merge pull request #8572 from owncloud/core-getabsolutepathwithzero | Thomas Müller | 2014-05-13 | 1 | -1/+1 |
|\ | | | | | Fixed getAbsolutePath case when path is "0" | ||||
| * | Fixed getAbsolutePath case when path is "0" | Vincent Petry | 2014-05-13 | 1 | -1/+1 |
| | | | | | | | | | | Make sure to correctly check for string emptiness when the passed path is "0". | ||||
* | | Merge pull request #8398 from owncloud/enc_backup_keys | Björn Schießle | 2014-05-13 | 1 | -8/+28 |
|\ \ | | | | | | | backup the encryption key after the encryption was disabled | ||||
| * | | backup the encryption key after the encryption was disabled so that the user | Bjoern Schiessle | 2014-05-13 | 1 | -8/+28 |
| | | | | | | | | | | | | can restore them if needed | ||||
* | | | make it possible to omit parameters and use the default parameters from the ↵ | Bernhard Posselt | 2014-05-13 | 2 | -4/+9 |
| |/ |/| | | | | | controller method | ||||
* | | Merge pull request #8546 from owncloud/fix-preview-orientation-encrypted-master | Vincent Petry | 2014-05-13 | 1 | -4/+5 |
|\ \ | | | | | | | Rotate thumbnail when encryption is enabled | ||||
| * | | Rotate thumbnail when encryption is enabled | Thomas Müller | 2014-05-12 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | When a picture is encrypted, save it to a temporary file first so that the PHP function for rotation can access it as file. | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-13 | 1 | -1/+6 |
| | | | |||||
* | | | Merge pull request #8556 from owncloud/kill-legacy-code-master | Thomas Müller | 2014-05-12 | 6 | -440/+2 |
|\ \ \ | | | | | | | | | Kill legacy code master | ||||
| * | | | remove legacy aka deprecated code: OC_Cache_FileGlobalGC | Thomas Müller | 2014-05-12 | 1 | -4/+0 |
| | | | | |||||
| * | | | remove legacy aka deprecated code: OC_FilesystemView | Thomas Müller | 2014-05-12 | 2 | -10/+1 |
| | | | | |||||
| * | | | remove legacy aka deprecated code: OC_Cache | Thomas Müller | 2014-05-12 | 2 | -11/+1 |
| | | | | |||||
| * | | | remove legacy aka deprecated code: OC_Filesystem | Thomas Müller | 2014-05-12 | 1 | -415/+0 |
| |/ / | |||||
* | | | Merge pull request #8538 from owncloud/make-my-ide-less-complain-about-ldap | Lukas Reschke | 2014-05-12 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | Use proper PHPDoc and variable names in the LDAP lib | ||||
| * | | | Fix Typo | Lukas Reschke | 2014-05-11 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | I guess that should be `default` and not `defautl`, wondering how this ever worked. | ||||
* | | | | Merge pull request #8553 from owncloud/fix-8549-master | Thomas Müller | 2014-05-12 | 2 | -29/+33 |
|\ \ \ \ | | | | | | | | | | | adding X-Robots-Tag to all responses of ownCloud + move addSecurityHeade... | ||||
| * | | | | adding X-Robots-Tag to all responses of ownCloud + move addSecurityHeaders() ↵ | Thomas Müller | 2014-05-12 | 2 | -29/+33 |
| | |/ / | |/| | | | | | | | | | | to OC_Response, which seems to be a more reasonable place | ||||
* | | | | Merge pull request #8482 from owncloud/public-logger | Thomas Müller | 2014-05-12 | 3 | -13/+154 |
|\ \ \ \ | |/ / / |/| | | | Make logger available in the container | ||||
| * | | | fix missing spaces | Morris Jobke | 2014-05-12 | 2 | -3/+3 |
| | | | | |||||
| * | | | adding interpolation as requested by PSR-3 | Thomas Müller | 2014-05-12 | 1 | -0/+9 |
| | | | | |||||
| * | | | - make logger available in the container | Bernhard Posselt | 2014-05-09 | 3 | -13/+145 |
| | | | | | | | | | | | | | | | | | | | | - inject logger class into log - adding PHPDoc comments and fixing typos | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-12 | 2 | -1/+4 |
| | | | | |||||
* | | | | Merge pull request #8541 from owncloud/hardenIsSubDirectory | Morris Jobke | 2014-05-12 | 3 | -8/+20 |
|\ \ \ \ | | | | | | | | | | | Harden issubdirectory() | ||||
| * | | | | Rename issubdirectory to isSubDirectory | Lukas Reschke | 2014-05-11 | 3 | -7/+7 |
| | | | | | |||||
| * | | | | Harden issubdirectory() | Lukas Reschke | 2014-05-11 | 1 | -1/+13 |
| | |/ / | |/| | | | | | | | | | | realpath() may return false in case the directory does not exist since we can not be sure how different PHP versions may behave here we do an additional check whether realpath returned false | ||||
* | | | | Merge pull request #8477 from owncloud/better-controllers | Morris Jobke | 2014-05-12 | 22 | -46/+289 |
|\ \ \ \ | | | | | | | | | | | Better appframework controllers | ||||
| * | | | | use new controllermethodreflector for corsmiddleware | Bernhard Posselt | 2014-05-11 | 2 | -6/+12 |
| | | | | | |||||
| * | | | | Fix typo | Bernhard Posselt | 2014-05-11 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix method signature | Bernhard Posselt | 2014-05-11 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | default to null to not fail if type is not annotated via phpdoc | Bernhard Posselt | 2014-05-11 | 1 | -3/+7 |
| | | | | | |||||
| * | | | | adjust license headers to new mail address | Bernhard Posselt | 2014-05-11 | 21 | -20/+22 |
| | | | | | |||||
| * | | | | rename formatter to responder, formatResponse to buildResponse | Bernhard Posselt | 2014-05-11 | 2 | -13/+13 |
| | | | | |