Commit graph

6257 commits

Author SHA1 Message Date
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
Morris Jobke
9d95fff427 fix missing spaces 2014-05-12 13:32:03 +02:00
Thomas Müller
d853c60d7e adding interpolation as requested by PSR-3 2014-05-12 10:54:09 +02:00
Jenkins for ownCloud
f4e8de3cbb [tx-robot] updated from transifex 2014-05-12 01:55:44 -04: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
474b8f071d Fix typo 2014-05-11 17:54:09 +02:00
Bernhard Posselt
3e58a767ad Fix method signature 2014-05-11 17:54:09 +02:00
Bernhard Posselt
fcb1aa36f0 default to null to not fail if type is not annotated via phpdoc 2014-05-11 17:54:09 +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
c590244fa1 add private property for reflector in security middleware 2014-05-11 17:54:08 +02:00
Bernhard Posselt
ede7325772 fix broken if 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
4dca2038bf add request to dispatcher class 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
Lukas Reschke
a40e49cae5 Harden issubdirectory()
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
2014-05-11 15:49:19 +02:00
Bernhard Posselt
e05192a23d Fix method signature 2014-05-11 14:03:58 +02:00
Bernhard Posselt
3af30625ab Make db connection protected 2014-05-11 12:54:44 +02:00
Jenkins for ownCloud
b6d76e9985 [tx-robot] updated from transifex 2014-05-11 01:57:00 -04:00
Jenkins for ownCloud
05ea8c8a10 [tx-robot] updated from transifex 2014-05-10 01:55:50 -04: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
Bernhard Posselt
b4298c68ca - make logger available in the container
- inject logger class into log
- adding PHPDoc comments and fixing typos
2014-05-09 23:26:20 +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
Andreas Fischer
bd4d315d78 Merge pull request #8512 from owncloud/fix-memcached-hasKey
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.
2014-05-09 12:41:46 +02:00
Jenkins for ownCloud
9919ec48df [tx-robot] updated from transifex 2014-05-09 01:55:42 -04:00
Vincent Petry
6e7c274d2e Merge pull request #8499 from owncloud/shareextstoragemountpointfix
Fix sharing of ext storage mount points
2014-05-08 22:35:01 +02:00
Bart Visscher
88225db4af Memcached hasKey should test for success, the get can fail for other reasons.
One of the other failures is no running server.
2014-05-08 18:11:29 +02:00
Vincent Petry
05dc694c5c Fix getPathById for Oracle
Added extra code to handle the case of Oracle which saves empty strings
as null values.
2014-05-08 13:33:55 +02:00
Andreas Fischer
8ede209ea3 Merge pull request #8493 from owncloud/we-certainly-don't-want-type-juggling-on-that
Use strict type comparison

* owncloud/we-certainly-don't-want-type-juggling-on-that:
  Use strict type comparison
2014-05-08 13:02:48 +02:00
Vincent Petry
390549c286 Merge pull request #8221 from owncloud/type-hinting-sharing
Type hinting fixes for sharing
2014-05-08 09:30:50 +02:00
Bart Visscher
9f88141bcd Use 'boolean' as type instead of 'bool' 2014-05-07 20:46:08 +02:00
Lukas Reschke
c4109d9aef Use strict type comparison
We certainly don't want to have type juggling on that.
2014-05-07 15:11:42 +02:00
Lukas Reschke
254fa5eb22 Merge pull request #8488 from owncloud/sabre-notfoundloglevel
Some expected Sabre exceptions are now logged with DEBUG level
2014-05-07 15:05:17 +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
4a493c8835 Some expected Sabre exceptions are now logged with DEBUG level 2014-05-07 11:43:50 +02:00
Vincent Petry
d16bb09aed Merge pull request #8045 from josh4trunks/nginx_x-accel_send_uri
Send URI instead of filepath to NGINX for X-Accel
2014-05-06 18:41:06 +02:00
Bart Visscher
72864d1c53 Typo 2014-05-06 18:05:06 +02:00
Morris Jobke
9411ba2acd Merge pull request #8459 from owncloud/fix-getUserFolder
fix getUserFolder() of server container
2014-05-05 23:08:42 +02:00
Morris Jobke
91a5e728c0 fix getUserFolder() of server container 2014-05-05 18:15:48 +02:00
Robin Appelman
578eb33c20 Dont create borders around previews when scaling up is disabled 2014-05-05 14:54:34 +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
Thomas Müller
341fcdc37a Merge pull request #8407 from owncloud/scale-pics-on-public-sharing-master
Images on public sharing get downscaled to increase use experience - thi...
2014-05-05 10:12:40 +02:00
Thomas Müller
d2754af7c3 Merge pull request #8442 from owncloud/fix-typo
Fix typo and PHPDoc
2014-05-05 10:03:47 +02:00
Jenkins for ownCloud
51d1e6c8b1 [tx-robot] updated from transifex 2014-05-05 01:55:47 -04:00
Lukas Reschke
5cfc9d973d Fix PHP Doc and use readable variable name 2014-05-04 13:02:58 +02:00