Commit graph

6282 commits

Author SHA1 Message Date
Robin McCorkell
bd3bf4b507 Change parameter order of implode 2014-05-13 19:08:14 +01:00
Robin McCorkell
8ab01599a9 Use OC_User_Interface instead of OC_User_Backend 2014-05-13 19:08:14 +01:00
Lukas Reschke
7e448a376f Fix PHPDoc and typos
Some things my IDE complained about while creating a custom backend.

Fix PHPDoc and typos

Some things my IDE complained about while creating a custom backend.

Conflicts:
	lib/private/group/database.php
	lib/private/group/dummy.php
	lib/private/group/example.php
2014-05-13 19:08:14 +01:00
Robin McCorkell
3bed3d2a23 Change parameter type for useBackend 2014-05-13 19:08:14 +01:00
Robin McCorkell
87b548ed91 Fix all PHPDoc types and variable names, in /lib 2014-05-13 19:08:14 +01:00
Robin McCorkell
a7ae2e874a Squash 'a | b' into 'a|b', in /lib 2014-05-13 19:08:14 +01:00
Robin McCorkell
b5bc37d2e4 Fix @return array PHPDocs, in /lib 2014-05-13 19:08:14 +01:00
Robin McCorkell
b653ad164b Replace @returns with @return, in /lib 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
Björn Schießle
b8de1e5d71 Merge pull request #8398 from owncloud/enc_backup_keys
backup the encryption key after the encryption was disabled
2014-05-13 09:25:16 -04:00
Bjoern Schiessle
a9ac11718e backup the encryption key after the encryption was disabled so that the user
can restore them if needed
2014-05-13 12:35:25 +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
Vincent Petry
e3f6abf1f0 Merge pull request #8546 from owncloud/fix-preview-orientation-encrypted-master
Rotate thumbnail when encryption is enabled
2014-05-13 10:27:41 +02:00
Jenkins for ownCloud
a60db322c2 [tx-robot] updated from transifex 2014-05-13 01:55:41 -04:00
Thomas Müller
408189b7e4 Merge pull request #8556 from owncloud/kill-legacy-code-master
Kill legacy code master
2014-05-12 20:55:24 +02:00
Lukas Reschke
aea44ee0d5 Merge pull request #8538 from owncloud/make-my-ide-less-complain-about-ldap
Use proper PHPDoc and variable names in the LDAP lib
2014-05-12 19:31:43 +02:00
Thomas Müller
ee8a7b53da Merge pull request #8553 from owncloud/fix-8549-master
adding X-Robots-Tag to all responses of ownCloud + move addSecurityHeade...
2014-05-12 17:45:08 +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
f5ed92bf31 remove legacy aka deprecated code: OC_Cache_FileGlobalGC 2014-05-12 16:34:47 +02:00
Thomas Müller
e0dd69e4e6 remove legacy aka deprecated code: OC_FilesystemView 2014-05-12 16:30:39 +02:00
Thomas Müller
33987eea83 remove legacy aka deprecated code: OC_Cache 2014-05-12 16:23:33 +02:00
Thomas Müller
4dd1a49a68 remove legacy aka deprecated code: OC_Filesystem 2014-05-12 16:20:07 +02:00
Thomas Müller
3cd32dcb7c adding X-Robots-Tag to all responses of ownCloud + move addSecurityHeaders() to OC_Response, which seems to be a more reasonable place 2014-05-12 15:14:01 +02:00
Morris Jobke
9d95fff427 fix missing spaces 2014-05-12 13:32:03 +02:00
Thomas Müller
da0e37ef03 Rotate thumbnail when encryption is enabled
When a picture is encrypted, save it to a temporary file first so that
the PHP function for rotation can access it as file.
2014-05-12 11:27:39 +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
Lukas Reschke
cd3ed01483 Fix Typo
I guess that should be `default` and not `defautl`, wondering how this ever worked.
2014-05-11 15:24:42 +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