aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* 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-197-83/+84
|\ \ | | | | | | Require CSRF token for non WebDAV authenticated requests
| * | Require CSRF token for non WebDAV authenticated requestsLukas Reschke2016-02-187-83/+84
| | |
* | | 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 #21610 from owncloud/quota-sharedfileThomas Müller2016-02-184-19/+158
|\ \ \ | | | | | | | | 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.
| * | | 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.
* | | | 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 #22399 from owncloud/issue-22394-index-names-for-oracleThomas Müller2016-02-181-0/+9
|\ \ \ \ | | | | | | | | | | Add index names so Doctrine does not use a too long random string
| * | | | 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 #16783 from owncloud/handle-redirects-globalThomas Müller2016-02-172-14/+0
|\ \ \ \ | | | | | | | | | | Adding global error handler for ajax calls which run into redirection…
| * | | | Add handler for global ajax errorsVincent Petry2016-02-152-14/+0
| |/ / /
* | | / remove global credentialsRobin Appelman2016-02-179-272/+3
| |_|/ |/| |
* | | Merge pull request #22451 from owncloud/use-proper-user-folderThomas Müller2016-02-171-6/+10
|\ \ \ | | | | | | | | Handles null as return code and uses proper UserFolder in trashbin
| * | | Handles null as return code and uses proper UserFolder in trashbinMorris Jobke2016-02-161-6/+10
| | | |
* | | | Merge pull request #22435 from owncloud/trashbin-hook-nouserThomas Müller2016-02-171-2/+5
|\ \ \ \ | | | | | | | | | | Don't resize trash when no user
| * | | | Don't resize trash when no userVincent Petry2016-02-161-2/+5
| | | | | | | | | | | | | | | | | | | | Happens when overwriting files on federated shares.
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-17366-74/+2810
| |/ / / |/| | |
* | | | Merge pull request #22432 from owncloud/files_external-backendsThomas Müller2016-02-164-185/+4
|\ \ \ \ | |/ / / |/| | | remove login credentails and user provided backends
| * | | remove login credentails and user provided backendsRobin Appelman2016-02-164-185/+4
| | |/ | |/|
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-16174-0/+1076
| | |
* | | Adding transifex to new core appsThomas Müller2016-02-165-0/+0
|/ /
* | Merge pull request #22398 from owncloud/fix-card-propertiesThomas Müller2016-02-164-15/+18
|\ \ | | | | | | Queries on the cards table by uri require the addressbook as well
| * | Queries on the cards table by uri require the addressbook as well - fixes #22284Thomas Müller2016-02-154-15/+18
| |/
* | Merge pull request #22400 from owncloud/files-select-closesidebarThomas Müller2016-02-162-9/+36
|\ \ | | | | | | Close file detail sidebar when selecting/unselecting files
| * | Close file detail sidebar when selecting/unselecting filesVincent Petry2016-02-152-9/+36
| |/ | | | | | | | | Interacting with the checkboxes, also "Select all" will automatically close the sidebar now.
* | Merge pull request #22385 from ↵Thomas Müller2016-02-161-1/+1
|\ \ | | | | | | | | | | | | owncloud/issue-22384-invalid-content-location-on-commenting Posting a comment replies with invalid location URL
| * | Deduplicate slashesJoas Schilling2016-02-151-1/+1
| | |
* | | Merge pull request #22392 from owncloud/create-default-calendar-and-addressbookThomas Müller2016-02-162-2/+44
|\ \ \ | | | | | | | | On login we create a default calendar and a default addressbook for t…
| * | | On login we create a default calendar and a default addressbook for the user ↵Thomas Müller2016-02-152-2/+44
| | |/ | |/| | | | | | | - fixes #22360
* | | Merge pull request #22403 from owncloud/improved-error-handlingThomas Müller2016-02-165-9/+41
|\ \ \ | | | | | | | | Remove background job if the server accepted to ask for the shared secret
| * | | forbidden (403) is a valid return status, don't log the whole exception in ↵Bjoern Schiessle2016-02-152-4/+12
| | | | | | | | | | | | | | | | this case
| * | | throw exception if we don't find a token for a given serverBjoern Schiessle2016-02-151-0/+6
| | | |
| * | | Remove background job if the server accepted to ask for the shared secretBjoern Schiessle2016-02-152-5/+23
| |/ / | | | | | | | | | | | | | | | If we don't remove it the server will later ask the remote server to ask for the shared secret which will result in a error log message on the remote server and in some circumstances maybe even to a failure
* / / [tx-robot] updated from transifexJenkins for ownCloud2016-02-166-0/+42
|/ /
* | Merge pull request #22337 from owncloud/new_reshare_no_initiatorThomas Müller2016-02-151-4/+4
|\ \ | | | | | | On backend hickups don't crash OCS output