summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #22593 from owncloud/swift-docker-fixThomas Müller2016-02-242-277/+1
|\ | | | | Enable upstream entrypoint changes with Ceph Docker
| * Enable upstream entrypoint changes with Ceph DockerRobin McCorkell2016-02-232-277/+1
| |
* | Merge pull request #22592 from owncloud/fix-response-headerThomas Müller2016-02-241-17/+0
|\ \ | | | | | | Add header for attachment disposition only once
| * | Drop unneeded use statementsMorris Jobke2016-02-231-4/+0
| | |
| * | Add header for attachment disposition only onceLukas Reschke2016-02-231-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | Recent refactorings have resulted in the header being added twice, this makes browsers ignore the header which removes any security gains. This changeset adds the header only once and adds integration tests ensuring the correct header in future. https://github.com/owncloud/core/issues/22577
* | | Merge pull request #22569 from owncloud/issue-22566-too-much-mapping-entriesThomas Müller2016-02-231-11/+11
|\ \ \ | |_|/ |/| | Allow defining a limit and offset for getObjectIdsForTags
| * | Fix dav unit testsJoas Schilling2016-02-231-11/+11
| |/
* | Merge pull request #22582 from owncloud/case-insensitive-contact-searchThomas Müller2016-02-232-3/+3
|\ \ | | | | | | Case insensitive contact search
| * | Case insensitive search in contacts - fixes #22575Thomas Müller2016-02-222-3/+3
| |/
* | Merge pull request #22516 from owncloud/core-cumulativenotificationsThomas Müller2016-02-233-2/+11
|\ \ | |/ |/| Accumulate notifications instead of blinking
| * Fix unit tests affected by side effectsVincent Petry2016-02-222-1/+6
| | | | | | | | | | | | | | | | The notification tests were not restoring the clock properly, but indirectly helped other tests pass. Since now we're restoring the clock properly, the other tests were fixed to still work.
| * Accumulate notifications instead of blinkingVincent Petry2016-02-221-1/+5
| | | | | | | | | | This makes it possible to display multiple notifications. If the options.type is set to "error", it will also add a close button.
* | Make non-public-method protectedJoas Schilling2016-02-222-9/+9
|/
* Merge pull request #22536 from owncloud/add-integration-tests-for-tagsThomas Müller2016-02-224-6/+285
|\ | | | | Add integration tests for tags plus fix permissions
| * Check if user has permission to create such a tagLukas Reschke2016-02-194-6/+285
| | | | | | | | Fixes https://github.com/owncloud/core/issues/22512
* | Merge pull request #22555 from owncloud/jenkins-19978Thomas Müller2016-02-221-0/+3
|\ \ | | | | | | Show username when writing "Insufficient storage" into owncloud.log
| * | Solution for Proposal #19974Pierre Jochem2016-02-221-0/+3
| |/ | | | | | | Show username when writing into owncloud.log
* | Fix public page footer position in IEVincent Petry2016-02-221-0/+5
| | | | | | | | | | | | | | | | The content element needs hasLayout, so triggering it with a display attribute. Without this, the #content element's height would be as high as the window's height instead of adjusting itself to its contents' height.
* | Fixes pagination in IEMorris Jobke2016-02-221-1/+0
|/ | | | | * tested in Firefox, Chrome, Safari, IE and Edge with folder and file shares * fixes #20044
* Merge pull request #22503 from owncloud/issue_22500Thomas Müller2016-02-191-0/+3
|\ | | | | When (re-)sharing an incomming federated share set the corrent owner
| * make sure that the file name doesn't end with a trailing slash. Can for ↵Bjoern Schiessle2016-02-191-0/+3
| | | | | | | | example happen single files shared across servers
* | Merge pull request #22509 from owncloud/add-filesplugin-to-new-webdav-endpointThomas Müller2016-02-191-0/+4
|\ \ | | | | | | Add FilesPlugin
| * | Add FilesPlugin - fixes #22507Thomas Müller2016-02-191-0/+4
| | |
* | | Merge pull request #22348 from owncloud/issue-21812-calendar-old-caldav-urlThomas Müller2016-02-194-5/+90
|\ \ \ | |/ / |/| | Fix old calendar dav urls
| * | Add correct principals for the current user before ACL checkJoas Schilling2016-02-193-3/+77
| | |
| * | Convert the old principal to the new principal before getting calendarsJoas Schilling2016-02-191-2/+13
| | |
* | | Merge pull request #22515 from owncloud/webdav_checksum_only_for_filesThomas Müller2016-02-191-5/+7
|\ \ \ | |/ / |/| | Only add checksum headers for 'real' files
| * | Only add checksum headers for filesRoeland Jago Douma2016-02-191-5/+7
| |/ | | | | | | | | We can only add the checksum header for real ownCloud files (so we have a fileinfo object etc).
* | Merge pull request #22198 from owncloud/birthday-calendarThomas Müller2016-02-1914-41/+548
|\ \ | |/ |/| Sync a users contacts birthday to the users birthday calendar
| * Adding cli command to sync birthday calendarThomas Müller2016-02-186-14/+171
| |
| * Prevent deletion of birthday calendarThomas Müller2016-02-183-8/+8
| |
| * Sync a users contacts birthday to the users birthday calendarThomas Müller2016-02-1810-38/+388
| |
* | 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
| | | |