Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #8542 from owncloud/phpdoc-improvements | Thomas Müller | 2014-05-13 | 2 | -21/+34 |
|\ | | | | | PHPDoc Improvements | ||||
| * | Fix Scrutinizer errors about missing user backend | Robin McCorkell | 2014-05-13 | 2 | -21/+34 |
| | | |||||
* | | Add tests for other types that PHP might cast | Lukas Reschke | 2014-05-13 | 1 | -0/+2 |
|/ | | | Addition to https://github.com/owncloud/core/pull/8572 | ||||
* | Merge pull request #8572 from owncloud/core-getabsolutepathwithzero | Thomas Müller | 2014-05-13 | 1 | -0/+18 |
|\ | | | | | Fixed getAbsolutePath case when path is "0" | ||||
| * | Fixed getAbsolutePath case when path is "0" | Vincent Petry | 2014-05-13 | 1 | -0/+18 |
| | | | | | | | | | | Make sure to correctly check for string emptiness when the passed path is "0". | ||||
* | | make it possible to omit parameters and use the default parameters from the ↵ | Bernhard Posselt | 2014-05-13 | 2 | -9/+37 |
|/ | | | | controller method | ||||
* | Merge pull request #8482 from owncloud/public-logger | Thomas Müller | 2014-05-12 | 1 | -0/+40 |
|\ | | | | | Make logger available in the container | ||||
| * | adding unit test for message interpolation | Thomas Müller | 2014-05-12 | 1 | -0/+40 |
| | | |||||
* | | Merge pull request #8541 from owncloud/hardenIsSubDirectory | Morris Jobke | 2014-05-12 | 1 | -4/+4 |
|\ \ | | | | | | | Harden issubdirectory() | ||||
| * | | Rename issubdirectory to isSubDirectory | Lukas Reschke | 2014-05-11 | 1 | -4/+4 |
| |/ | |||||
* | | Merge pull request #8477 from owncloud/better-controllers | Morris Jobke | 2014-05-12 | 19 | -131/+395 |
|\ \ | | | | | | | Better appframework controllers | ||||
| * | | use new controllermethodreflector for corsmiddleware | Bernhard Posselt | 2014-05-11 | 1 | -5/+15 |
| | | | |||||
| * | | adjust license headers to new mail address | Bernhard Posselt | 2014-05-11 | 17 | -20/+20 |
| | | | |||||
| * | | rename formatter to responder, formatResponse to buildResponse | Bernhard Posselt | 2014-05-11 | 2 | -6/+6 |
| | | | |||||
| * | | add test for not failing when adding more comments after type parameters, do ↵ | Bernhard Posselt | 2014-05-11 | 2 | -2/+2 |
| | | | | | | | | | | | | not limit x-www-form-urlencoded to POST | ||||
| * | | implement most of the basic stuff that was suggested in #8290 | Bernhard Posselt | 2014-05-11 | 6 | -107/+361 |
| | | | |||||
* | | | Merge pull request #8274 from owncloud/appframework-db | Morris Jobke | 2014-05-12 | 3 | -0/+681 |
|\ \ \ | |/ / |/| | | Port database layer from appframework to core | ||||
| * | | dont update entity and dont run an update query if an entity wasnt changed ↵ | Bernhard Posselt | 2014-04-23 | 2 | -1/+24 |
| | | | | | | | | | | | | at all | ||||
| * | | fix phpdoc for entities | Bernhard Posselt | 2014-04-20 | 2 | -4/+9 |
| | | | |||||
| * | | move db into iservercontainer | Bernhard Posselt | 2014-04-19 | 2 | -1/+3 |
| | | | |||||
| * | | remove unusued variable | Bernhard Posselt | 2014-04-19 | 1 | -6/+0 |
| | | | |||||
| * | | remove unusued variable | Bernhard Posselt | 2014-04-19 | 1 | -1/+0 |
| | | | |||||
| * | | fix scrutinizer issues | Bernhard Posselt | 2014-04-19 | 2 | -12/+23 |
| | | | |||||
| * | | port database layer from appframework to core | Bernhard Posselt | 2014-04-19 | 3 | -0/+647 |
| | | | |||||
* | | | Merge pull request #8504 from owncloud/cors-middleware | Bernhard Posselt | 2014-05-11 | 4 | -3/+135 |
|\ \ \ | |_|/ |/| | | Add cors middleware | ||||
| * | | add cors middleware | Bernhard Posselt | 2014-05-09 | 4 | -3/+135 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | Merge pull request #7546 from owncloud/no_freaking_tag_dupes | Lukas Reschke | 2014-05-09 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Tags cleanup | ||||
| * | | Yet another cleanup | Thomas Tanghus | 2014-03-05 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #8223 from owncloud/fix_linkToPublic | Vincent Petry | 2014-05-07 | 2 | -0/+218 |
|\ \ \ | | | | | | | | | Fix linkToPublic and linkToAbsolute. | ||||
| * | | | Remove unused var | Thomas Tanghus | 2014-04-16 | 1 | -5/+0 |
| | | | | |||||
| * | | | Add tests for linkTo, linkToPublic, linkToRemote, linkToRemoteBase | Thomas Tanghus | 2014-04-16 | 2 | -0/+223 |
| | | | | |||||
* | | | | Merge pull request #8386 from owncloud/fix_6946_master | Vincent Petry | 2014-05-05 | 3 | -24/+55 |
|\ \ \ \ | | | | | | | | | | | Fix 6946 master | ||||
| * | | | | the group manager calls exists check less often, adjust test accordingly | Arthur Schiwon | 2014-04-28 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Group Database backend must not gather user details itself but ask user | Arthur Schiwon | 2014-04-28 | 3 | -24/+55 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backends. This is a port to master from PR #7745 remove OC_GROUP_BACKEND_GET_DISPLAYNAME option for group backends Conflicts: lib/private/group/backend.php LDAP: getDisplayNamesInGroup is not an option for group backends anymore Conflicts: apps/user_ldap/group_ldap.php apps/user_ldap/group_proxy.php clean up group backends Conflicts: lib/private/group/database.php remove now unnecessary test implement getDisplayNames in group manager adjust user manager tests test for group manager's displayNamesInGroup trim must not be used in empty in PHP < 5.5 keep the constant to not provoke PHP warnings Conflicts: lib/private/group/backend.php | ||||
* | | | | | Merge pull request #8023 from flyser/master | Morris Jobke | 2014-05-03 | 1 | -0/+22 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix setting the max-upload-size for really large values. | ||||
| * | | | | | Add unit tests for OC_Helper::phpFileSize function | Fabian Henze | 2014-04-07 | 1 | -0/+22 |
| | | | | | | |||||
* | | | | | | Remove unneccessary statement from test | Joas Schilling | 2014-04-29 | 1 | -2/+0 |
| | | | | | | |||||
* | | | | | | Update tests to test for create and update aswell | Joas Schilling | 2014-04-29 | 1 | -13/+35 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #8341 from owncloud/template-tests-output-buffering | Lukas Reschke | 2014-04-26 | 1 | -35/+15 |
|\ \ \ \ \ | | | | | | | | | | | | | Improve Template Tests by Removing Manual Output Buffering | ||||
| * | | | | | Use PHPUnit's expectOutputString() instead of performing output buffering. | Andreas Fischer | 2014-04-24 | 1 | -26/+11 |
| | | | | | | |||||
| * | | | | | Split testP() tests into multiple methods. | Andreas Fischer | 2014-04-24 | 1 | -1/+3 |
| | | | | | | |||||
| * | | | | | Remove redundant test case for non-HTML string. | Andreas Fischer | 2014-04-24 | 1 | -9/+2 |
| | | | | | | |||||
* | | | | | | remove outdated test | Robin Appelman | 2014-04-25 | 1 | -18/+0 |
| | | | | | | |||||
* | | | | | | merge master into webdav-injection | Robin Appelman | 2014-04-25 | 3 | -8/+89 |
|\| | | | | | |||||
| * | | | | | Merge pull request #8304 from owncloud/add-xss-tests | Andreas Fischer | 2014-04-24 | 2 | -8/+35 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add unit tests for arrays and quotationmark * owncloud/add-xss-tests: Remove uneeded newline Fix indentation Add unit tests for arrays and " | ||||
| | * | | | | | Remove uneeded newline | Lukas Reschke | 2014-04-22 | 1 | -1/+0 |
| | | | | | | | |||||
| | * | | | | | Fix indentation | Lukas Reschke | 2014-04-22 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Add unit tests for arrays and " | Lukas Reschke | 2014-04-22 | 2 | -9/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | OC_Util::sanitizeHTML() also supports array but we actually had no unit test for it. Additionally this commit introduces a test for escaping " into " | ||||
| * | | | | | | add setting to set default expire date | Bjoern Schiessle | 2014-04-24 | 1 | -0/+54 |
| |/ / / / / | |||||
* | | | | | | merge master into webdav-injection | Robin Appelman | 2014-04-22 | 4 | -10/+3 |
|\| | | | | |