summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8541 from owncloud/hardenIsSubDirectoryMorris Jobke2014-05-124-12/+24
|\
| * Rename issubdirectory to isSubDirectoryLukas Reschke2014-05-114-11/+11
| * Harden issubdirectory()Lukas Reschke2014-05-111-1/+13
* | Merge pull request #8540 from owncloud/fix-undefinedMorris Jobke2014-05-121-1/+1
|\ \
| * | $owner is not defined hereLukas Reschke2014-05-111-1/+1
| |/
* | Merge pull request #8477 from owncloud/better-controllersMorris Jobke2014-05-1241-177/+684
|\ \
| * | use new controllermethodreflector for corsmiddlewareBernhard Posselt2014-05-113-11/+27
| * | 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-1138-40/+42
| * | rename formatter to responder, formatResponse to buildResponseBernhard Posselt2014-05-114-19/+19
| * | 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-113-7/+4
| * | add request to dispatcher classBernhard Posselt2014-05-111-1/+2
| * | implement most of the basic stuff that was suggested in #8290Bernhard Posselt2014-05-1112-105/+585
* | | Merge pull request #8274 from owncloud/appframework-dbMorris Jobke2014-05-1211-0/+1421
|\ \ \
| * | | 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-234-2/+33
| * | | fix phpdoc for entitiesBernhard Posselt2014-04-202-4/+9
| * | | Fix typo & add typeLukas Reschke2014-04-201-4/+4
| * | | remove useless importBernhard Posselt2014-04-191-1/+0
| * | | move db into iservercontainerBernhard Posselt2014-04-198-10/+28
| * | | remove unusued variableBernhard Posselt2014-04-191-6/+0
| * | | remove unusued variableBernhard Posselt2014-04-191-1/+0
| * | | fix doc strings for db facadeBernhard Posselt2014-04-192-2/+2
| * | | fix scrutinizer issuesBernhard Posselt2014-04-193-12/+27
| * | | port database layer from appframework to coreBernhard Posselt2014-04-1910-0/+1360
* | | | Merge pull request #8518 from owncloud/multiselect-width-fixMorris Jobke2014-05-111-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | reduce multiselect max-width from 400 to 200px to not take too much spaceJan-Christoph Borchardt2014-05-091-1/+1
* | | | Merge pull request #8504 from owncloud/cors-middlewareBernhard Posselt2014-05-119-5/+321
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix method signatureBernhard Posselt2014-05-111-2/+1
| * | | add cors middlewareBernhard Posselt2014-05-099-5/+322
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-11396-1387/+1421
* | | | Merge pull request #8520 from owncloud/jslint_polishing_in_file_uploadLukas Reschke2014-05-101-45/+61
|\ \ \ \
| * | | | polish jslint for files-upload.jsJörn Friedrich Dreyer2014-05-091-45/+61
| | |/ / | |/| |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-1091-178/+15473
* | | | Merge pull request #7546 from owncloud/no_freaking_tag_dupesLukas Reschke2014-05-092-22/+33
|\ \ \ \
| * | | | Yet another cleanupThomas Tanghus2014-03-052-22/+33
* | | | | Merge pull request #8496 from owncloud/fix-folder-iconJan-Christoph Borchardt2014-05-091-5/+4
|\ \ \ \ \
| * | | | | fix folder icon (file had a big background rectangle before)Jan-Christoph Borchardt2014-05-071-5/+4
* | | | | | Merge pull request #8512 from owncloud/fix-memcached-hasKeyAndreas Fischer2014-05-091-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Memcached hasKey should test for success, the get can fail for other reasons.Bart Visscher2014-05-081-1/+1
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-0927-137/+186
* | | | | | Merge pull request #8499 from owncloud/shareextstoragemountpointfixVincent Petry2014-05-083-6/+65
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix getPathById for OracleVincent Petry2014-05-081-0/+4
| * | | | | Added unit test for sharing ext storage mount pointsVincent Petry2014-05-081-2/+55
| * | | | | Fix sharing of ext storage mount pointsVincent Petry2014-05-081-4/+6
* | | | | | Merge pull request #8493 from owncloud/we-certainly-don't-want-type-juggling-...Andreas Fischer2014-05-081-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |