Commit Graph

888 Commits

Author SHA1 Message Date
Morris Jobke 804020bb6d Merge pull request #7363 from owncloud/optimize-startup-queries
Optimize some queries that are always executed when loading base.php
2014-05-19 01:21:37 +02:00
Bernhard Posselt 9e36c33104 use fetch method instead of fetchRow because fetchRow is only an owncloud internal alias that exists purely for compability 2014-05-14 01:09:48 +02:00
Thomas Müller 5fb94bf76f Merge pull request #8542 from owncloud/phpdoc-improvements
PHPDoc Improvements
2014-05-13 23:23:11 +02:00
Lukas Reschke b0381cfe12 Add tests for other types that PHP might cast
Addition to https://github.com/owncloud/core/pull/8572
2014-05-13 22:01:11 +02:00
Robin McCorkell 875a8acedf Fix Scrutinizer errors about missing user backend 2014-05-13 19:08:14 +01:00
Thomas Müller f5bc680f9c Merge pull request #8572 from owncloud/core-getabsolutepathwithzero
Fixed getAbsolutePath case when path is "0"
2014-05-13 17:41:18 +02:00
Vincent Petry bab8c1f8e5 Fixed getAbsolutePath case when path is "0"
Make sure to correctly check for string emptiness when the passed path
is "0".
2014-05-13 17:38:46 +02:00
Bernhard Posselt a152e320f6 make it possible to omit parameters and use the default parameters from the controller method 2014-05-13 10:40:49 +02:00
Thomas Müller 1d18fd4e6d Merge pull request #8482 from owncloud/public-logger
Make logger available in the container
2014-05-12 16:40:58 +02:00
Thomas Müller 93dbb39e77 adding unit test for message interpolation 2014-05-12 14:17:36 +02:00
Morris Jobke 2054837d01 Merge pull request #8541 from owncloud/hardenIsSubDirectory
Harden issubdirectory()
2014-05-12 01:42:25 +02:00
Morris Jobke 6499995474 Merge pull request #8477 from owncloud/better-controllers
Better appframework controllers
2014-05-12 01:07:49 +02:00
Morris Jobke 7a6ff56b13 Merge pull request #8274 from owncloud/appframework-db
Port database layer from appframework to core
2014-05-12 00:12:19 +02:00
Bernhard Posselt 63f2f16b85 use new controllermethodreflector for corsmiddleware 2014-05-11 17:55:59 +02:00
Bernhard Posselt 1d45239c65 adjust license headers to new mail address 2014-05-11 17:54:08 +02:00
Bernhard Posselt cb666c18d6 rename formatter to responder, formatResponse to buildResponse 2014-05-11 17:54:08 +02:00
Bernhard Posselt d8da79cab0 add test for not failing when adding more comments after type parameters, do not limit x-www-form-urlencoded to POST 2014-05-11 17:54:08 +02:00
Bernhard Posselt 80648da431 implement most of the basic stuff that was suggested in #8290 2014-05-11 17:54:08 +02:00
Bernhard Posselt a252f59cd4 Merge pull request #8504 from owncloud/cors-middleware
Add cors middleware
2014-05-11 16:54:34 +02:00
Lukas Reschke fd5b2d11d6 Rename issubdirectory to isSubDirectory 2014-05-11 15:50:59 +02:00
Bernhard Posselt 9a4d204b55 add cors middleware
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
2014-05-09 23:34:41 +02:00
Lukas Reschke 1083085e6e Merge pull request #7546 from owncloud/no_freaking_tag_dupes
Tags cleanup
2014-05-09 22:10:45 +02:00
Bart Visscher f569c721a6 Merge branch 'master' into optimize-startup-queries
Conflicts:
	apps/files_sharing/lib/sharedstorage.php
	tests/lib/group/manager.php

removed hasFilesSharedWith from lib/public/share.php and
sharedstorage.php to fix merge
2014-05-07 17:54:38 +02:00
Vincent Petry 75d81eefc1 Merge pull request #8223 from owncloud/fix_linkToPublic
Fix linkToPublic and linkToAbsolute.
2014-05-07 14:40:59 +02:00
Vincent Petry 1a454f61ed Merge pull request #8386 from owncloud/fix_6946_master
Fix 6946 master
2014-05-05 14:08:45 +02:00
Morris Jobke 623161b9a9 Merge pull request #8023 from flyser/master
Fix setting the max-upload-size for really large values.
2014-05-03 11:49:38 +02:00
Joas Schilling ced2a4fcf2 Remove unneccessary statement from test 2014-04-29 10:42:49 +02:00
Joas Schilling 39bf700790 Update tests to test for create and update aswell 2014-04-29 10:34:28 +02:00
Arthur Schiwon 837a02184b the group manager calls exists check less often, adjust test accordingly 2014-04-28 19:19:37 +02:00
Arthur Schiwon 45e42c25de Group Database backend must not gather user details itself but ask user
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
2014-04-28 13:49:56 +02:00
Lukas Reschke 96c06c14d8 Merge pull request #8341 from owncloud/template-tests-output-buffering
Improve Template Tests by Removing Manual Output Buffering
2014-04-26 12:29:36 +02:00
Robin Appelman 4109521cce remove outdated test 2014-04-25 12:24:18 +02:00
Robin Appelman 6c20a014ea merge master into webdav-injection 2014-04-25 11:47:06 +02:00
Andreas Fischer f45080e811 Use PHPUnit's expectOutputString() instead of performing output buffering. 2014-04-24 15:45:07 +02:00
Andreas Fischer 88778b569e Split testP() tests into multiple methods. 2014-04-24 15:36:02 +02:00
Andreas Fischer 0d3ddd9e11 Remove redundant test case for non-HTML string. 2014-04-24 15:34:09 +02:00
Andreas Fischer f9091a8584 Merge pull request #8304 from owncloud/add-xss-tests
Add unit tests for arrays and quotationmark

* owncloud/add-xss-tests:
  Remove uneeded newline
  Fix indentation
  Add unit tests for arrays and "
2014-04-24 15:09:36 +02:00
Bjoern Schiessle 6650be9913 add setting to set default expire date 2014-04-24 13:34:31 +02:00
Bernhard Posselt 5199e4508a dont update entity and dont run an update query if an entity wasnt changed at all 2014-04-23 13:43:17 +02:00
Lukas Reschke 9d3b639ce6 Remove uneeded newline 2014-04-22 20:11:34 +02:00
Lukas Reschke 589c74e176 Fix indentation 2014-04-22 20:10:46 +02:00
Lukas Reschke f07180639c Add unit tests for arrays and "
OC_Util::sanitizeHTML() also supports array but we actually had no unit test for it. Additionally this commit introduces a test for escaping " into &quot;
2014-04-22 20:09:55 +02:00
Robin Appelman 3821a09689 merge master into webdav-injection 2014-04-22 12:25:49 +02:00
Bernhard Posselt 7e447f4f42 make download and redirectresponse public 2014-04-20 16:12:46 +02:00
Bernhard Posselt 309aa3bcd2 fix phpdoc for entities 2014-04-20 02:55:59 +02:00
Bernhard Posselt 4a7e0561ca move db into iservercontainer 2014-04-19 19:30:12 +02:00
Bernhard Posselt 0fe4db0992 remove unusued variable 2014-04-19 16:02:15 +02:00
Bernhard Posselt f4bc5ee863 remove unusued variable 2014-04-19 16:00:19 +02:00
Bernhard Posselt 93237d87ec fix scrutinizer issues 2014-04-19 15:25:36 +02:00
Bernhard Posselt f260951825 port database layer from appframework to core 2014-04-19 14:56:16 +02:00