3e58a767ad
Fix method signature
2014-05-11 17:54:09 +02:00
fcb1aa36f0
default to null to not fail if type is not annotated via phpdoc
2014-05-11 17:54:09 +02:00
1d45239c65
adjust license headers to new mail address
2014-05-11 17:54:08 +02:00
cb666c18d6
rename formatter to responder, formatResponse to buildResponse
2014-05-11 17:54:08 +02:00
c590244fa1
add private property for reflector in security middleware
2014-05-11 17:54:08 +02:00
ede7325772
fix broken if
2014-05-11 17:54:08 +02:00
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
4dca2038bf
add request to dispatcher class
2014-05-11 17:54:08 +02:00
80648da431
implement most of the basic stuff that was suggested in #8290
2014-05-11 17:54:08 +02:00
a252f59cd4
Merge pull request #8504 from owncloud/cors-middleware
...
Add cors middleware
2014-05-11 16:54:34 +02:00
fd5b2d11d6
Rename issubdirectory to isSubDirectory
2014-05-11 15:50:59 +02:00
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
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
e05192a23d
Fix method signature
2014-05-11 14:03:58 +02:00
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
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
1083085e6e
Merge pull request #7546 from owncloud/no_freaking_tag_dupes
...
Tags cleanup
2014-05-09 22:10:45 +02:00
e5ee84ca9b
- update permissions
...
- change xml tag to perm
2014-05-09 17:18:43 +02:00
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
6e7c274d2e
Merge pull request #8499 from owncloud/shareextstoragemountpointfix
...
Fix sharing of ext storage mount points
2014-05-08 22:35:01 +02:00
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
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
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
390549c286
Merge pull request #8221 from owncloud/type-hinting-sharing
...
Type hinting fixes for sharing
2014-05-08 09:30:50 +02:00
9f88141bcd
Use 'boolean' as type instead of 'bool'
2014-05-07 20:46:08 +02:00
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
c4109d9aef
Use strict type comparison
...
We certainly don't want to have type juggling on that.
2014-05-07 15:11:42 +02:00
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
75d81eefc1
Merge pull request #8223 from owncloud/fix_linkToPublic
...
Fix linkToPublic and linkToAbsolute.
2014-05-07 14:40:59 +02:00
4a493c8835
Some expected Sabre exceptions are now logged with DEBUG level
2014-05-07 11:43:50 +02:00
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
72864d1c53
Typo
2014-05-06 18:05:06 +02:00
9411ba2acd
Merge pull request #8459 from owncloud/fix-getUserFolder
...
fix getUserFolder() of server container
2014-05-05 23:08:42 +02:00
91a5e728c0
fix getUserFolder() of server container
2014-05-05 18:15:48 +02:00
578eb33c20
Dont create borders around previews when scaling up is disabled
2014-05-05 14:54:34 +02:00
1a454f61ed
Merge pull request #8386 from owncloud/fix_6946_master
...
Fix 6946 master
2014-05-05 14:08:45 +02:00
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
5cfc9d973d
Fix PHP Doc and use readable variable name
2014-05-04 13:02:58 +02:00
6f57911b44
Does also take int or string
2014-05-04 13:01:57 +02:00
d091cca636
Fix typo
2014-05-04 12:53:06 +02:00
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
906061a07b
Merge pull request #8171 from owncloud/fix-import
...
be nice and use a relative import so people can use the class without fi...
2014-05-02 22:43:19 +02:00
9e18be6422
Merge pull request #8377 from youngguns-nl/issue_8376
...
RecursiveDirectoryIterator does not work on NFS
2014-05-02 18:45:09 +02:00
c92c577b5e
- Introduce isShared() and isMounted() on FileInfo class
...
- Reuse these methods on determineIcon()
- Generate permission string for the desktop client
- expose {http://owncloud.org/ns }permissions as additional WebDAV property containing the permission string
2014-05-02 17:37:16 +02:00
20893cc3b3
Images on public sharing get downscaled to increase use experience - this will speed up loading time
...
- adding keep aspect to core/ajax/preview.php
- remove duplicate method Preview::show()
- no more hard coded mimetype of preview
- remove .png from the preview urls
- keep old route preview.png for backwards compatibility
- aspect preserving previews are now cached
2014-05-02 17:02:57 +02:00
50f49c57b5
Some more params are optional
2014-05-01 18:11:30 +02:00
11404b2b12
Merge pull request #8391 from owncloud/router-parameter-sorting
...
Preserve keys when sorting parameters when generatings urls
2014-04-30 15:10:36 +02:00
4481a8412c
Merge pull request #8132 from owncloud/issue/8131
...
Issue/8131 Fix emitting of filesystem related hooks
2014-04-30 13:57:44 +02:00
77e6278d09
Preserve keys when sorting parameters when generatings urls
2014-04-29 11:55:19 +02:00
b95aa43a5d
Merge pull request #8285 from owncloud/better_getmountby_handling
...
Handle return values better from Filesystem::getMountBy*
2014-04-29 11:22:11 +02:00
c060f6ec7b
Deduplicate code
2014-04-29 10:34:28 +02:00
c1caaa6241
Correctly emit create/update hooks when a large file is being created/update
...
after being uploaded in .part files
Fix #8131
2014-04-29 10:34:27 +02:00
4fa9e46d2b
Emit a new hook, when a file is being updated only
...
The write-hook also is triggered for created files
Fix #8131
2014-04-29 10:34:26 +02:00
6935364b33
add class Pimple to autloader
2014-04-28 20:57:44 +02:00
e7c6111ae3
Update outdated comment
2014-04-28 20:23:18 +02:00
e8a287f5bb
refs #8376 ; spaces=>tabs
2014-04-28 19:52:06 +02:00
54f482ff9c
refs #8376 ; added comment and applied patch on other files
2014-04-28 19:32:25 +02:00
66b1ad0a9b
Merge branch 'master' into type-hinting-sharing
...
Conflicts:
apps/files_sharing/lib/share/file.php
apps/files_sharing/tests/api.php
lib/private/share/share.php
2014-04-28 17:59:41 +02:00
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
d7ec1fe447
rewind iterator before iteration starts
2014-04-28 13:05:20 +02:00
b68098ebba
remove preview office fallback as it makes too much trouble and generates inacceptable results
2014-04-28 12:05:10 +02:00
d8be9d96ed
fixes #8376
2014-04-28 10:20:24 +02:00
5fd776debf
Merge pull request #7473 from owncloud/append-error-document
...
Remove .htaccess creation code
2014-04-28 08:50:42 +02:00
7c0370105a
Fix wrong var name
2014-04-26 11:15:09 +02:00
fc9371ae10
Merge branch 'master' into contactsmanager-register
...
Conflicts:
lib/private/contactsmanager.php
2014-04-26 10:55:25 +02:00
7599fa94ce
Merge pull request #8350 from owncloud/share-search-mime
...
fix search by mime for shared single files
2014-04-25 15:54:36 +02:00
5194f014c9
Merge pull request #7504 from owncloud/webdav-injection
...
Proper injection of filesystem view into the webdav connector
2014-04-25 14:42:43 +02:00
194ea66cb5
Merge branch 'master' into share-search-mime
2014-04-25 14:04:41 +02:00
672a8248ce
Correct the path returned by getFolderContent for substorages
2014-04-25 13:56:45 +02:00
456ca0cf7d
fix paths of searchByMime results on substorages
2014-04-25 12:31:44 +02:00
6c20a014ea
merge master into webdav-injection
2014-04-25 11:47:06 +02:00
77e3d067f0
Better handle return values from Filesystem::getMountBy*
...
getMountByStorageId and getMountByNumericId return an empty array on error,
which should be detected to avoid possible errors. This commit also adds in
some new logging points and throws to aid debugging
2014-04-25 09:50:34 +01:00
1cafd1e3b9
Merge pull request #8337 from owncloud/flv-to-mimes
...
Add flv to known mimetypes
2014-04-24 19:09:01 +02:00
f520305848
Merge pull request #8026 from owncloud/remove_shared_folder
...
remove the "Shared" folder
2014-04-24 18:45:45 +02:00
fc4be3d0ad
Add flv to known mimetypes
2014-04-24 19:09:31 +03:00
35321c7d41
add additional rows to the select statement, 'stime' is needed for the expire check
2014-04-24 15:18:25 +02:00
6650be9913
add setting to set default expire date
2014-04-24 13:34:31 +02:00
cd0c5990f8
properly quote etags
2014-04-24 11:12:39 +02:00
49b44e7e22
Normalize paths when moving properties
2014-04-24 11:12:39 +02:00
ff0dab6e92
This adds one more missing untranslated text from lib/share
...
Also displays the untrusted domain warning in English
2014-04-24 01:42:18 +02:00
4ba6f4839d
fixing typos and PHPDoc
2014-04-23 15:36:01 +02:00
e77d89fc4b
Revert changes to OC_Connector_Sabre_Server
2014-04-23 14:21:09 +02:00
c8801a41d8
Merge pull request #8324 from owncloud/expired-link-error
...
Fix error when viewing expired link
2014-04-23 14:13:44 +02:00
b312d38d38
remove hard-coded shared folder
2014-04-23 12:59:22 +02:00
7ef8f6d352
always allow to rename the share mount point
2014-04-23 12:54:26 +02:00
93469ca468
make it possible to move files out of a shared mount point
2014-04-23 12:54:26 +02:00
fb88aba8f4
some fixes to make the gallery work, this made it necessary to adjust some tests and the encryption code
2014-04-23 12:54:26 +02:00
652d417a58
we don't allow to share a folder if it contains a share mount point
2014-04-23 12:54:26 +02:00
bffcbac7a7
allow to rename group share mount points
2014-04-23 12:54:25 +02:00
dfb69e9418
allow user to delete shared files/folders
2014-04-23 12:54:25 +02:00
4c840cb61d
fix target generation for group shares
2014-04-23 12:54:25 +02:00
ed981294f1
fix share api tests
2014-04-23 12:54:25 +02:00
27c5a978f9
we no longer need to handle the Shared folder different from any other folder
2014-04-23 12:54:25 +02:00
c4e0fb75a4
add api to get shares from a specific user
2014-04-23 12:54:24 +02:00
a02fb3722b
user should be able to rename/delete shared files if the owner allowed it
2014-04-23 12:54:24 +02:00
72bbb9ca20
allow to remove and change mount points
2014-04-23 12:54:24 +02:00
cfc52ccc3d
add some action items
2014-04-23 12:54:24 +02:00
3d0661a1e7
Fix error when viewing expired link
2014-04-23 12:54:18 +02:00
704b9e6a0d
Merge pull request #8009 from owncloud/feature/add-sharing-target
...
Add option to getUsersSharingFile() to get the paths for the shared users
2014-04-23 12:49:06 +02:00
535e6ff71f
Merge pull request #7617 from nishiki/cache_user
...
Cache user
2014-04-23 12:32:30 +02:00
dcc48f9b46
Merge pull request #8068 from wakeup/fix-share.php-string-extraction
...
Make lib/** share.php strings extractable for translation
2014-04-23 09:58:10 +02:00
b42ce6c30a
Prevent error if previously cached data doesn't have an etag
2014-04-22 15:24:38 +02:00
6e857de6b7
Make lib/** share.php strings extractable for translation
...
They were not ready for translation as they had no placeholders
and/nor wrapper function to be translated
This should fix : #8011
2014-04-22 14:56:44 +02:00
0330481c5e
Merge pull request #8263 from LEDfan/add-key-to-contacts
...
Add key to every contact
2014-04-22 14:20:53 +02:00
efff7dd2a4
Change key to addressbook-key
2014-04-22 12:46:09 +02:00
3821a09689
merge master into webdav-injection
2014-04-22 12:25:49 +02:00
0ebb4662ec
Merge pull request #8281 from owncloud/public-responses
...
make download and redirectresponse public
2014-04-22 00:08:04 +02:00
e88731a477
Some more PHPDoc fixes
2014-04-21 15:44:54 +02:00
f2f5a53d36
Merge pull request #7988 from owncloud/routing-cache-webroot
...
Keep cached urls with different hostnames or baseurls seperate
* owncloud/routing-cache-webroot:
Sort parameters and cast to int
add delimiter between host and baseurl
Keep cached urls with different hostnames or baseurls seperate
2014-04-20 18:27:23 +02:00
7e447f4f42
make download and redirectresponse public
2014-04-20 16:12:46 +02:00
f2e5494edc
Merge pull request #8203 from owncloud/correct-link
...
Use direct link instead of JS
* owncloud/correct-link:
Link to previous directory
Use direct link instead of JS
2014-04-20 15:58:53 +02:00
e930ce6436
Add type hinting
2014-04-20 00:55:01 +02:00
0c736feaba
remove useless import
2014-04-19 19:31:49 +02:00
4a7e0561ca
move db into iservercontainer
2014-04-19 19:30:12 +02:00
95a83233a9
fix doc strings for db facade
2014-04-19 15:32:17 +02:00
f260951825
port database layer from appframework to core
2014-04-19 14:56:16 +02:00
b78c1373b6
Add key to every contact
2014-04-18 14:30:44 +02:00
9583549556
camelCase vars in OC\ContactsManager
2014-04-17 17:56:23 +02:00
707658c00a
Merge pull request #8205 from owncloud/fix-8202
...
Add one more LOWER.
2014-04-17 16:10:33 +02:00
a2a0eb370b
Merge pull request #8222 from owncloud/type-hinting
...
Type hinting fixes
2014-04-17 16:08:15 +02:00
13b463cc17
Merge pull request #8189 from Xenopathic/misc_fixes
...
Various fixes
2014-04-17 11:56:51 +01:00
8a0c8a1956
Merge pull request #8240 from owncloud/thumbnail-on-short-videos-master
...
videos which are shorter then 5 seconds will now get a proper thumbnail ...
2014-04-17 11:15:05 +02:00
5a1a056c6d
Merge pull request #8183 from owncloud/move-security-headers
...
Move security headers
2014-04-16 23:46:20 +02:00
81c23b02da
Link to previous directory
2014-04-16 21:10:14 +02:00
a4389340b8
escape $second + update PHPDoc
2014-04-16 19:45:55 +02:00
d0f8cc20c5
videos which are shorter then 5 seconds will now get a proper thumbnail at 1 second
2014-04-16 17:16:03 +02:00
da99e403bc
Also fix linkToAbsolute
2014-04-16 14:30:24 +02:00
6fe3fd4a0b
Fix linkToPublic. Refs #8218
2014-04-15 23:04:35 +02:00
a4b7f5155f
Fix PHPdoc in lib/private
...
using scrutinizer patch
2014-04-15 22:55:20 +02:00
8bc7174bdc
Merge pull request #8104 from owncloud/lukepolo-master
...
Added the ability to Drag and Drop folders [chrome]
2014-04-15 21:39:32 +02:00
a9bf3df82d
Fix PHPdoc in OC\Share\Share and OCP\Share
2014-04-15 21:05:44 +02:00
8322a9e5c2
Merge pull request #8210 from owncloud/enhance-assets-management-master
...
adding checks and log messages regarding the assets folder
2014-04-15 20:07:07 +02:00
295b75cca9
merge master into webdav-injection
2014-04-15 20:05:43 +02:00
c82adb8c5d
merge master into webdav-injection
2014-04-15 20:03:00 +02:00
ffab31e3ee
Merge pull request #8197 from owncloud/secure_mimetypes
...
White-list known secure mime types. Refs. #8184
2014-04-15 19:50:33 +02:00
64679b2e62
Remove limit and offset manipulation when getting users or groups, because it does not work when more than one user or group backend. Fixing it would be too costly performancewise, so we switch back to the model used in OC 5: limit and offset are effective per backend, and not a general constraint
2014-04-15 17:46:48 +02:00
714343cd74
Add Bart to PgSqlTools copyright.
2014-04-15 16:29:43 +02:00
02726acbc8
adding checks and log messages regarding the assets folder
2014-04-15 16:26:12 +02:00
7f77b08098
Sort parameters and cast to int
2014-04-15 15:48:02 +02:00
bd37010f35
Merge remote-tracking branch 'owncloud/master' into db-convert-tool
...
* owncloud/master: (61 commits)
[tx-robot] updated from transifex
Make email display name change translatable again
Ignore jquery.multiselect.js - it's 3rdparty
javascript code cleanup + fixing syntax errors
Revert "close-button for share_dropdown"
close-button for share_dropdown
[tx-robot] updated from transifex
The latest developer manual link
The latest developer manual link
p() and print_unescaped() also take arrays as parameter
Check whether the user has permissions to add personal storage backends
[tx-robot] updated from transifex
Fix a wrong WebDAV Warning with self-signed-certs
fix translation link
upda mailinglist address
fix contribute link
default to GET request when no method is set to fix unittests, also set parsed json parameters on the post attribute
Correctly process request parameters other than GET or POST, dont use globals in the class but inject it
[tx-robot] updated from transifex
use references for middleware to fix problems on 5.3
...
2014-04-15 15:44:44 +02:00
e125dc60cd
introduce new function to force a language
2014-04-15 15:12:25 +02:00
2dbb2db7e0
Merge pull request #7780 from owncloud/share-file-exists
...
Verify that a file exists before we share it
2014-04-15 11:23:17 +02:00
91d40f5033
remove unneeded LOWER. Fixes #8202
2014-04-14 22:19:21 +03:00
340089f270
Merge pull request #8059 from owncloud/countUsersInGroup
...
add optional countUsersInGroup method to group backends
2014-04-14 20:45:12 +02:00
9046f7b2f8
Merge pull request #8178 from owncloud/fix-request-parameters
...
Correctly process request parameters other than GET or POST, dont use gl...
2014-04-14 20:42:26 +02:00
2bda3f9ae0
Use direct link instead of JS
...
Due to our CSP policy this link won’t work as it it considered as
inline Javascript.
This commit replaces the link with a static link to the files app.
Reimplementation of #8067 - fixes #7742
2014-04-14 20:16:52 +02:00
9cc41a2460
Move PostgreSQL sequence resynchronisation out into PgSqlTools class.
2014-04-14 18:37:47 +02:00
2fb68c120b
Added explanation to mimetypes.list.php to avoid future confusion.
2014-04-14 18:21:19 +02:00
51e47319ef
White-list known secure mime types. Refs. #8184
2014-04-14 17:17:50 +02:00
fe364656a4
Merge pull request #8181 from owncloud/fix_wrong_webdav_warning
...
Fix a wrong WebDAV Warning with self-signed-certs
2014-04-14 16:53:06 +02:00
Bernhard Posselt
Bernhard Posselt
Lukas Reschke
Thomas Müller
Andreas Fischer
Vincent Petry
Bart Visscher
Morris Jobke
Robin Appelman
icewind1991
Joas Schilling
Volkan Gezer
Sjors van der Pluijm
Arthur Schiwon
Georg Ehrke
Sjors van der Pluijm
Robin McCorkell
Björn Schießle
Victor Dubiniuk
Volkan Gezer
Tobia De Koninck
Jörn Friedrich Dreyer
Thomas Tanghus