summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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-1240-218/+295
|
* Merge pull request #8541 from owncloud/hardenIsSubDirectoryMorris Jobke2014-05-124-12/+24
|\ | | | | Harden issubdirectory()
| * Rename issubdirectory to isSubDirectoryLukas Reschke2014-05-114-11/+11
| |
| * 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 #8540 from owncloud/fix-undefinedMorris Jobke2014-05-121-1/+1
|\ \ | | | | | | $owner is not defined here
| * | $owner is not defined hereLukas Reschke2014-05-111-1/+1
| |/ | | | | Fixes https://github.com/owncloud/core/issues/8539
* | Merge pull request #8477 from owncloud/better-controllersMorris Jobke2014-05-1241-177/+684
|\ \ | | | | | | Better appframework controllers
| * | 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
| | | | | | | | | | | | 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-1112-105/+585
| | |
* | | Merge pull request #8274 from owncloud/appframework-dbMorris Jobke2014-05-1211-0/+1421
|\ \ \ | | | | | | | | 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-234-2/+33
| | | | | | | | | | | | | | | | at all
| * | | 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 space
| * | | 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
|\ \ \ \ | |_|_|/ |/| | | Add cors middleware
| * | | Fix method signatureBernhard Posselt2014-05-111-2/+1
| | | |
| * | | add cors middlewareBernhard Posselt2014-05-099-5/+322
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove methodannotationreader namespace fix namespace for server container fix tests fail if with cors credentials header is set to true, implement a reusable preflighted cors method in the controller baseclass, make corsmiddleware private and register it for every request remove uneeded local in cors middleware registratio dont uppercase cors to easily use it from routes fix indention comment fixes explicitely set allow credentials header to false dont depend on better controllers PR, fix that stuff later split cors methods to be in a seperate controller for exposing apis remove protected definitions from apicontroller since controller has it
* | | | [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.js
| * | | | 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
|\ \ \ \ | | | | | | | | | | Tags cleanup
| * | | | 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)
| * | | | | 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
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Be more strict in checking the resultCode of memcached hasKey function * owncloud/fix-memcached-hasKey: Memcached hasKey should test for success, the get can fail for other reasons.
| * | | | | Memcached hasKey should test for success, the get can fail for other reasons.Bart Visscher2014-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | One of the other failures is no running server.
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-0927-137/+186
| | | | | |
* | | | | | Merge pull request #8499 from owncloud/shareextstoragemountpointfixVincent Petry2014-05-083-6/+65
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix sharing of ext storage mount points
| * | | | | Fix getPathById for OracleVincent Petry2014-05-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added extra code to handle the case of Oracle which saves empty strings as null values.
| * | | | | Added unit test for sharing ext storage mount pointsVincent Petry2014-05-081-2/+55
| | | | | |