summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Fixed getAbsolutePath case when path is "0"Vincent Petry2014-05-131-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-131-1/+6
* | Merge pull request #8556 from owncloud/kill-legacy-code-masterThomas Müller2014-05-126-440/+2
|\ \
| * | 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
|\ \
| * | Fix TypoLukas Reschke2014-05-112-2/+2
* | | 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 addSecurityHeaders() ...Thomas Müller2014-05-122-29/+33
| | |/ | |/|
* | | Merge pull request #8482 from owncloud/public-loggerThomas Müller2014-05-123-13/+154
|\ \ \ | |/ / |/| |
| * | 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
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-122-1/+4
* | | Merge pull request #8541 from owncloud/hardenIsSubDirectoryMorris Jobke2014-05-123-8/+20
|\ \ \
| * | | Rename issubdirectory to isSubDirectoryLukas Reschke2014-05-113-7/+7
| * | | Harden issubdirectory()Lukas Reschke2014-05-111-1/+13
| | |/ | |/|
* | | Merge pull request #8477 from owncloud/better-controllersMorris Jobke2014-05-1222-46/+289
|\ \ \
| * | | 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
| * | | 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
|\ \ \ \ | |/ / / |/| | |
| * | | Make db connection protectedBernhard Posselt2014-05-111-1/+1
| * | | dont update entity and dont run an update query if an entity wasnt changed at...Bernhard Posselt2014-04-232-1/+9
| * | | 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
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix method signatureBernhard Posselt2014-05-111-2/+1
| * | | add cors middlewareBernhard Posselt2014-05-095-2/+187
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-111-0/+2
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-105-0/+47
| |_|/ |/| |
* | | Merge pull request #7546 from owncloud/no_freaking_tag_dupesLukas Reschke2014-05-091-21/+32
|\ \ \
| * | | Yet another cleanupThomas Tanghus2014-03-051-21/+32
* | | | Merge pull request #8512 from owncloud/fix-memcached-hasKeyAndreas Fischer2014-05-091-1/+1
|\ \ \ \