aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* When (re-)sharing an incomming federated share set the corrent ownerRoeland Jago Douma2016-02-192-11/+102
| | | | | | | | | | | | Incomming federated shares are a special kind. We mount them as normal webdav shares but we do supply owner info with the federated cloud id of the share owner. Since we do not yet have the new resharing behaviour on federated shares we need to set the correct owner. Which will allow sharing and proper mounting for other users. fixes #22500
* Merge pull request #22405 from owncloud/gdrive-mimetype-and-office-fixesThomas Müller2016-02-191-4/+13
|\ | | | | Fix GDrive handling of office files
| * Fix GDrive handling of office filesVincent Petry2016-02-151-4/+13
| | | | | | | | | | | | | | | | | | | | 1) Properly detect empty file extension, can be null. 2) When renaming part file to final file, use the correct file name without extension, if it exists 3) When renaming a file, do not delete the original file if it had the same id, which can happen with part files
* | Merge pull request #22424 from owncloud/add-generic-csrf-protection-to-webdavThomas Müller2016-02-199-85/+90
|\ \ | | | | | | Require CSRF token for non WebDAV authenticated requests
| * | Require CSRF token for non WebDAV authenticated requestsLukas Reschke2016-02-189-85/+90
| | |
* | | 9.0.0 beta 2v9.0.0beta2C Montero-Luque2016-02-181-2/+2
| | |
* | | Merge pull request #22493 from owncloud/issue_22467Thomas Müller2016-02-184-13/+9
|\ \ \ | | | | | | | | getRootFolder should not setup the FS for any user
| * | | Make scrutinizer happyRoeland Jago Douma2016-02-182-3/+2
| | | |
| * | | getRootFolder should not setup the FS for any userRoeland Jago Douma2016-02-183-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #22482 from owncloud/getowner-cacheThomas Müller2016-02-181-1/+6
|\ \ \ \ | | | | | | | | | | cache result for getowner
| * | | | No more staticJoas Schilling2016-02-181-5/+4
| | | | |
| * | | | cache result for getownerRobin Appelman2016-02-171-1/+7
| | | | |
* | | | | Merge pull request #22444 from owncloud/fix-federated-share-deleteThomas Müller2016-02-183-79/+152
|\ \ \ \ \ | | | | | | | | | | | | get the actual user instead of a federated cloud id
| * | | | | get the actual user instead of a federated cloud idBjoern Schiessle2016-02-181-15/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $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
| * | | | | get the actual user instead of a federated cloud idBjoern Schiessle2016-02-182-64/+109
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | $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
* | | | | Merge pull request #22496 from owncloud/jenkins-22355Thomas Müller2016-02-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix on shared groups assignment.
| * | | | | Fix on shared groups assignment.Leonardo Diez2016-02-181-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #22422 from ↵Thomas Müller2016-02-182-1/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-17230-better-promotion-of-app-updates Make app updates better visible (part1)
| * | | | | Make app updates better visibleJoas Schilling2016-02-182-1/+12
| | |_|/ / | |/| | |
* | | | | Merge pull request #22489 from owncloud/bump-zipstreamerThomas Müller2016-02-181-0/+0
|\ \ \ \ \ | | | | | | | | | | | | Bump Zipstreamer
| * | | | | Bump ZipstreamerLukas Reschke2016-02-181-0/+0
| | |/ / / | |/| | |
* | | | | Merge pull request #21610 from owncloud/quota-sharedfileThomas Müller2016-02-185-24/+180
|\ \ \ \ \ | | | | | | | | | | | | Fix quota check for single shared files
| * | | | | Defer quota check in web UI when overwriting shared fileVincent Petry2016-02-172-9/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | Don't apply quota in stream wrapper for part filesVincent Petry2016-02-171-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When overwriting shared files as recipient, the part file is written on the uploader's storage before overwriting the target file. If the uploader has no quota left, they should still be able to overwrite that file with Webdav. To make this work, they need to be able to write the part file to their own storage first.
| * | | | | Check the quota on the actual file's storage in dav quota pluginVincent Petry2016-02-172-10/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix quota plugin to use the correct file name when chunking When chunking, the file name is the compound name, so need to convert it to the correct final file name before doing the free space check. This ensures that in the case of shared files, the correct storage is used for the quota check.
* | | | | | Merge pull request #22498 from owncloud/fedshare-testremote-after-404Thomas Müller2016-02-181-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Properly trigger testRemote after getting a 404 from remote fed share
| * | | | | | Properly trigger testRemote after getting a 404 from remote fed shareVincent Petry2016-02-181-0/+3
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge pull request #22497 from owncloud/fix-redirect-responseThomas Müller2016-02-182-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | set correct http status code in redirect response
| * | | | | fix unit testv1r0x2016-02-181-1/+1
| | | | | |
| * | | | | set correct http status codev1r0x2016-02-181-1/+1
|/ / / / / | | | | | | | | | | Was intended to respond with a 303 (See other) status code instead of 307 (Temporary Redirect).
* | | | | Merge pull request #22399 from owncloud/issue-22394-index-names-for-oracleThomas Müller2016-02-182-0/+20
|\ \ \ \ \ | | | | | | | | | | | | Add index names so Doctrine does not use a too long random string
| * | | | | Make sure our index names fit in oracleJoas Schilling2016-02-161-0/+11
| | | | | |
| * | | | | Add index names so Doctrine does not use a too long random stringJoas Schilling2016-02-151-0/+9
| | |_|_|/ | |/| | |
* | | | | Merge pull request #22434 from owncloud/share_ocs_api_handle_invalid_sharesThomas Müller2016-02-182-7/+356
|\ \ \ \ \ | | | | | | | | | | | | OCS Share API should not return invalid shares
| * | | | | Add unit tests for formatShareRoeland Jago Douma2016-02-171-0/+325
| | | | | |
| * | | | | OCS Share API should not return invalid sharesRoeland Jago Douma2016-02-172-7/+31
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge pull request #22478 from owncloud/external-missing-authThomas Müller2016-02-181-0/+7
|\ \ \ \ \ | |_|_|_|/ |/| | | | dont die when missing an auth backend
| * | | | dont die when missing an auth backendRobin Appelman2016-02-171-0/+7
| | |_|/ | |/| |
* | | | Merge pull request #22475 from owncloud/fix-js-issuesThomas Müller2016-02-181-2/+2
|\ \ \ \ | | | | | | | | | | Fixes code analysis issues
| * | | | Fixes code analysis issuesMorris Jobke2016-02-171-2/+2
| | | | |
* | | | | Merge pull request #22418 from ↵Thomas Müller2016-02-182-9/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-22393-filelist-plugins-for-other-views Show the comments and tags on the share filters
| * | | | | Show the comments and tags on the share filtersJoas Schilling2016-02-162-9/+8
| | | | | |
* | | | | | Merge pull request #22408 from owncloud/gdrive-remove-mimetype-detectionThomas Müller2016-02-181-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix GDrive mime type detection with encryption
| * | | | | | Fix GDrive mime type detection with encryptionVincent Petry2016-02-151-1/+2
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | When encryption is enabled, GDrive would think that all files are text files. This fix falls back to the extension based detection when a non-special mime type is returned
* | | | | | Merge pull request #22491 from pra85/patch-1Thomas Müller2016-02-181-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Fix a typo in Readme
| * | | | | Fix a typo in ReadmePrayag Verma2016-02-181-1/+1
|/ / / / / | | | | | | | | | | `diffrent` → `different`
* | | | | Merge pull request #22446 from owncloud/3rdparty-adjustmentThomas Müller2016-02-171-0/+0
|\ \ \ \ \ | |_|_|/ / |/| | | | Add new patchwork references
| * | | | Add new patchwork referencesLukas Reschke2016-02-171-0/+0
| | | | | | | | | | | | | | | | | | | | CI for https://github.com/owncloud/3rdparty/pull/249
* | | | | Merge pull request #22340 from owncloud/allow-licensephp-for-app-repos-aswellThomas Müller2016-02-171-9/+53
|\ \ \ \ \ | | | | | | | | | | | | Allow license.php for app repos aswell
| * | | | | Check the mailmap file of core as wellJoas Schilling2016-02-171-1/+28
| | | | | |