summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* 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 #8572 from owncloud/core-getabsolutepathwithzeroThomas Müller2014-05-131-1/+1
|\ | | | | Fixed getAbsolutePath case when path is "0"
| * Fixed getAbsolutePath case when path is "0"Vincent Petry2014-05-131-1/+1
| | | | | | | | | | Make sure to correctly check for string emptiness when the passed path is "0".
* | Merge pull request #8398 from owncloud/enc_backup_keysBjörn Schießle2014-05-131-8/+28
|\ \ | | | | | | backup the encryption key after the encryption was disabled
| * | backup the encryption key after the encryption was disabled so that the userBjoern Schiessle2014-05-131-8/+28
| | | | | | | | | | | | can restore them if needed
* | | make it possible to omit parameters and use the default parameters from the ↵Bernhard Posselt2014-05-132-4/+9
| |/ |/| | | | | controller method
* | Merge pull request #8546 from owncloud/fix-preview-orientation-encrypted-masterVincent Petry2014-05-131-4/+5
|\ \ | | | | | | Rotate thumbnail when encryption is enabled
| * | Rotate thumbnail when encryption is enabledThomas Müller2014-05-121-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 transifexJenkins for ownCloud2014-05-131-1/+6
| | |
* | | Merge pull request #8556 from owncloud/kill-legacy-code-masterThomas Müller2014-05-126-440/+2
|\ \ \ | | | | | | | | Kill legacy code master
| * | | remove legacy aka deprecated code: OC_Cache_FileGlobalGCThomas Müller2014-05-121-4/+0
| | | |
| * | | remove legacy aka deprecated code: OC_FilesystemViewThomas Müller2014-05-122-10/+1
| | | |
| * | | remove legacy aka deprecated code: OC_CacheThomas Müller2014-05-122-11/+1
| | | |
| * | | remove legacy aka deprecated code: OC_FilesystemThomas Müller2014-05-121-415/+0
| |/ /
* | | Merge pull request #8538 from owncloud/make-my-ide-less-complain-about-ldapLukas Reschke2014-05-122-2/+2
|\ \ \ | | | | | | | | Use proper PHPDoc and variable names in the LDAP lib
| * | | Fix TypoLukas Reschke2014-05-112-2/+2
| | | | | | | | | | | | | | | | I guess that should be `default` and not `defautl`, wondering how this ever worked.
* | | | Merge pull request #8553 from owncloud/fix-8549-masterThomas Müller2014-05-122-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üller2014-05-122-29/+33
| | |/ / | |/| | | | | | | | | | to OC_Response, which seems to be a more reasonable place
* | | | Merge pull request #8482 from owncloud/public-loggerThomas Müller2014-05-123-13/+154
|\ \ \ \ | |/ / / |/| | | Make logger available in the container
| * | | fix missing spacesMorris Jobke2014-05-122-3/+3
| | | |
| * | | adding interpolation as requested by PSR-3Thomas Müller2014-05-121-0/+9
| | | |
| * | | - make logger available in the containerBernhard Posselt2014-05-093-13/+145
| | | | | | | | | | | | | | | | | | | | - inject logger class into log - adding PHPDoc comments and fixing typos
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-122-1/+4
| | | |
* | | | Merge pull request #8541 from owncloud/hardenIsSubDirectoryMorris Jobke2014-05-123-8/+20
|\ \ \ \ | | | | | | | | | | Harden issubdirectory()
| * | | | Rename issubdirectory to isSubDirectoryLukas Reschke2014-05-113-7/+7
| | | | |
| * | | | Harden issubdirectory()Lukas Reschke2014-05-111-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-controllersMorris Jobke2014-05-1222-46/+289
|\ \ \ \ | | | | | | | | | | Better appframework controllers
| * | | | use new controllermethodreflector for corsmiddlewareBernhard Posselt2014-05-112-6/+12
| | | | |
| * | | | Fix typoBernhard Posselt2014-05-111-1/+1
| | | | |
| * | | | Fix method signatureBernhard Posselt2014-05-111-0/+2
| | | | |
| * | | | default to null to not fail if type is not annotated via phpdocBernhard Posselt2014-05-111-3/+7
| | | | |
| * | | | adjust license headers to new mail addressBernhard Posselt2014-05-1121-20/+22
| | | | |
| * | | | rename formatter to responder, formatResponse to buildResponseBernhard Posselt2014-05-112-13/+13
| | | | |
| * | | | add private property for reflector in security middlewareBernhard Posselt2014-05-111-0/+5
| | | | |
| * | | | fix broken ifBernhard Posselt2014-05-111-1/+1
| | | | |
| * | | | add test for not failing when adding more comments after type parameters, do ↵Bernhard Posselt2014-05-111-5/+2
| | | | | | | | | | | | | | | | | | | | not limit x-www-form-urlencoded to POST
| * | | | add request to dispatcher classBernhard Posselt2014-05-111-1/+2
| | | | |
| * | | | implement most of the basic stuff that was suggested in #8290Bernhard Posselt2014-05-117-21/+247
| | | | |
* | | | | Merge pull request #8274 from owncloud/appframework-dbMorris Jobke2014-05-128-0/+740
|\ \ \ \ \ | |/ / / / |/| | | | Port database layer from appframework to core
| * | | | Make db connection protectedBernhard Posselt2014-05-111-1/+1
| | | | |
| * | | | dont update entity and dont run an update query if an entity wasnt changed ↵Bernhard Posselt2014-04-232-1/+9
| | | | | | | | | | | | | | | | | | | | at all
| * | | | Fix typo & add typeLukas Reschke2014-04-201-4/+4
| | | | |
| * | | | remove useless importBernhard Posselt2014-04-191-1/+0
| | | | |
| * | | | move db into iservercontainerBernhard Posselt2014-04-196-9/+25
| | | | |
| * | | | fix doc strings for db facadeBernhard Posselt2014-04-192-2/+2
| | | | |
| * | | | fix scrutinizer issuesBernhard Posselt2014-04-191-0/+4
| | | | |
| * | | | port database layer from appframework to coreBernhard Posselt2014-04-197-0/+713
| | | | |
* | | | | Merge pull request #8504 from owncloud/cors-middlewareBernhard Posselt2014-05-115-2/+186
|\ \ \ \ \ | |_|/ / / |/| | | | Add cors middleware