Commit Graph

30595 Commits

Author SHA1 Message Date
Joas Schilling 8756a22c60 Fix more things 2016-02-19 09:43:11 +01:00
Thomas Müller 8e36678873 Fix PHPDoc 2016-02-19 09:43:11 +01:00
Scrutinizer Auto-Fixer 0d0151a3e1 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-02-19 09:43:11 +01:00
Thomas Müller ae2304f23f Merge pull request #22405 from owncloud/gdrive-mimetype-and-office-fixes
Fix GDrive handling of office files
2016-02-19 09:13:35 +01:00
Thomas Müller f6e61a296f Merge pull request #22424 from owncloud/add-generic-csrf-protection-to-webdav
Require CSRF token for non WebDAV authenticated requests
2016-02-19 09:13:00 +01:00
C Montero-Luque 99051cdbe5 9.0.0 beta 2 2016-02-18 14:39:05 -05:00
Thomas Müller 48f6ae0b2d Merge pull request #22493 from owncloud/issue_22467
getRootFolder should not setup the FS for any user
2016-02-18 16:46:00 +01:00
Thomas Müller 2a9b0aaaa1 Merge pull request #22482 from owncloud/getowner-cache
cache result for getowner
2016-02-18 16:45:40 +01:00
Thomas Müller d1ef43481d Merge pull request #22444 from owncloud/fix-federated-share-delete
get the actual user instead of a federated cloud id
2016-02-18 16:44:57 +01:00
Thomas Müller f9f66a996e Merge pull request #22496 from owncloud/jenkins-22355
Fix on shared groups assignment.
2016-02-18 16:44:27 +01:00
Thomas Müller 22541b73c5 Merge pull request #22422 from owncloud/issue-17230-better-promotion-of-app-updates
Make app updates better visible (part1)
2016-02-18 16:44:01 +01:00
Thomas Müller d2f4b4b421 Merge pull request #22489 from owncloud/bump-zipstreamer
Bump Zipstreamer
2016-02-18 16:43:36 +01:00
Thomas Müller 6c4cdddba8 Merge pull request #21610 from owncloud/quota-sharedfile
Fix quota check for single shared files
2016-02-18 14:25:32 +01:00
Roeland Jago Douma b539bb15e1 Make scrutinizer happy 2016-02-18 14:25:18 +01:00
Thomas Müller cdb1aea809 Merge pull request #22498 from owncloud/fedshare-testremote-after-404
Properly trigger testRemote after getting a 404 from remote fed share
2016-02-18 14:24:55 +01:00
Thomas Müller 99d6a6b230 Merge pull request #22497 from owncloud/fix-redirect-response
set correct http status code in redirect response
2016-02-18 14:24:12 +01:00
Roeland Jago Douma 7abb8693a1 getRootFolder should not setup the FS for any user
Fixes #22467

This can go wrong when an app (take the ldap app) DIs something that
needs the rootFolder. This break if we use cookie auth since then we
know the user at that point and thus try to setup the fs for that user.

However if there are then incomming shares from an ldap user they will
fails since the user manager can't find them yet.

Now getRootFolder does not setup the fs for any user.
2016-02-18 13:55:54 +01:00
v1r0x ec6e8c1ab6 fix unit test 2016-02-18 12:39:19 +01:00
Vincent Petry e1dbae1467 Properly trigger testRemote after getting a 404 from remote fed share
Whenever a remote fed share's shareinfo call returns a 404, don't
directly assume the storage is not available by throwing
StorageNotAvailableException. We need to properly throw
NotFoundException to trigger the later logic that calls testRemote()
that verifies that the 404 is not from a broken server but really from
an obsolete share.
2016-02-18 11:57:03 +01:00
v1r0x 534071f4b2 set correct http status code
Was intended to respond with a 303 (See other) status code instead of 307 (Temporary Redirect).
2016-02-18 11:56:09 +01:00
Lukas Reschke 22ce23628b Bump Zipstreamer 2016-02-18 11:27:27 +01:00
Leonardo Diez 04b5956fc8 Fix on shared groups assignment. 2016-02-18 11:22:28 +01:00
Lukas Reschke 9b3c4e8dc4 Require CSRF token for non WebDAV authenticated requests 2016-02-18 11:18:36 +01:00
Thomas Müller 73d46afc3c Merge pull request #22399 from owncloud/issue-22394-index-names-for-oracle
Add index names so Doctrine does not use a too long random string
2016-02-18 11:18:32 +01:00
Thomas Müller bba8875fb5 Merge pull request #22434 from owncloud/share_ocs_api_handle_invalid_shares
OCS Share API should not return invalid shares
2016-02-18 11:17:41 +01:00
Thomas Müller 9d24de0ceb Merge pull request #22478 from owncloud/external-missing-auth
dont die when missing an auth backend
2016-02-18 11:17:19 +01:00
Bjoern Schiessle 8985181305 get the actual user instead of a federated cloud id
$view->getUidAndFilename($filename); returns the federated cloud id in case of
a federated share. But in this case we need the local user who "owns" the file
which is the current logged in user in case of a federated share
2016-02-18 10:17:00 +01:00
Bjoern Schiessle ac1c3d27b7 get the actual user instead of a federated cloud id
$view->getUidAndFilename($filename); returns the federated cloud id in case of
a federated share. But in this case we need the local user who "owns" the file
which is the current logged in user in case of a federated share
2016-02-18 10:16:59 +01:00
Thomas Müller 3a97a0ad7f Merge pull request #22475 from owncloud/fix-js-issues
Fixes code analysis issues
2016-02-18 10:14:31 +01:00
Thomas Müller 8798f85e88 Merge pull request #22418 from owncloud/issue-22393-filelist-plugins-for-other-views
Show the comments and tags on the share filters
2016-02-18 10:14:20 +01:00
Thomas Müller bfd4a9548b Merge pull request #22408 from owncloud/gdrive-remove-mimetype-detection
Fix GDrive mime type detection with encryption
2016-02-18 10:14:01 +01:00
Joas Schilling 6374472e2e No more static 2016-02-18 10:12:23 +01:00
Thomas Müller a345c49d12 Merge pull request #22491 from pra85/patch-1
Fix a typo in Readme
2016-02-18 09:56:40 +01:00
Joas Schilling 87746e4ae8 Make app updates better visible 2016-02-18 09:55:11 +01:00
Prayag Verma bf5fe98487 Fix a typo in Readme
`diffrent` → `different`
2016-02-18 09:41:55 +05:30
Robin Appelman f309bc960d cache result for getowner 2016-02-17 19:14:46 +01:00
Robin Appelman 65a283f967 dont die when missing an auth backend 2016-02-17 16:51:40 +01:00
Thomas Müller 4422f9c9ef Merge pull request #22446 from owncloud/3rdparty-adjustment
Add new patchwork references
2016-02-17 15:59:14 +01:00
Vincent Petry ceaefc2c54 Defer quota check in web UI when overwriting shared file
When receiving a shared file, the quota for that file counts in the
owner's storage, not the current user's storage.

To make it possible to overwrite the file even when the current user
doesn't have enough space, the quota check is deferred for such files.
2016-02-17 15:38:21 +01:00
Morris Jobke d55cfb4f89 Fixes code analysis issues 2016-02-17 15:19:42 +01:00
Thomas Müller 9c1248521a Merge pull request #22340 from owncloud/allow-licensephp-for-app-repos-aswell
Allow license.php for app repos aswell
2016-02-17 15:09:30 +01:00
Thomas Müller 7af7d18cfa Merge pull request #16783 from owncloud/handle-redirects-global
Adding global error handler for ajax calls which run into redirection…
2016-02-17 14:49:04 +01:00
Thomas Müller add696b057 Merge pull request #22468 from owncloud/files_external-global
remove global credentials
2016-02-17 14:41:30 +01:00
Thomas Müller 904db15f47 Merge pull request #22470 from owncloud/minimum-phpunit-4.4
Minimum phpunit 4.4
2016-02-17 14:20:37 +01:00
Thomas Müller 9afa4bf696 Kill no longer used autotest.cmd 2016-02-17 14:02:24 +01:00
Thomas Müller 3c65b898b2 We require minimum PHPUnit 4.4 2016-02-17 14:01:57 +01:00
Roeland Jago Douma 670557ffbb Add unit tests for formatShare 2016-02-17 13:55:39 +01:00
Roeland Jago Douma 2aa0b885f6 OCS Share API should not return invalid shares
Since we have lazy shares it can happen that a share is actually
invalid. See https://github.com/owncloud/core/issues/20908

This add checks for the get methods to handle the NotFound exception.
2016-02-17 13:55:39 +01:00
Robin Appelman c2c6caee93 remove global credentials 2016-02-17 13:55:27 +01:00
Lukas Reschke a5a4e6f89f Add new patchwork references
CI for https://github.com/owncloud/3rdparty/pull/249
2016-02-17 13:28:30 +01:00