aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #22511 from owncloud/add-integration-tests-for-commentsLukas Reschke2016-02-195-2/+531
|\ | | | | Add integration tests for comments
| * Add integration tests for commentsLukas Reschke2016-02-195-2/+531
|/ | | | | | This adds integration tests for the comments. Especially with regard to the permission handling, didn't find any problem in it. Fixes https://github.com/owncloud/core/issues/22367
* Merge pull request #22529 from owncloud/tags-styleThomas Müller2016-02-191-4/+32
|\ | | | | improve tags interface styling
| * improve tags interface stylingJan-Christoph Borchardt2016-02-191-4/+32
| |
* | Merge pull request #22503 from owncloud/issue_22500Thomas Müller2016-02-193-11/+105
|\ \ | | | | | | 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
| * | 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 #22518 from owncloud/checkdeletebeforecopyinsteadofrenameThomas Müller2016-02-192-0/+8
|\ \ \ | | | | | | | | Check delete permission before attemping copy+delete
| * | | Check delete permission before attemping copy+deleteVincent Petry2016-02-192-0/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | Some move operations when cross-storage will be replaced by copy and delete. Before attempting this, first check whether the source storage has delete permissions. This also prevents renaming system-wide external storages.
* | | Merge pull request #22410 from owncloud/fix_22119Thomas Müller2016-02-192-33/+40
|\ \ \ | | | | | | | | Do not copy skeleton on avatar access
| * | | Do not copy skeleton on avatar accessRoeland Jago Douma2016-02-162-33/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22119 Just try to get the folder of the user. If it is not there a NotFoundException will be thrown. Which will be handled by the avatar endpoint.
* | | | 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 #22521 from owncloud/mssql-is-not-support-since-agesThomas Müller2016-02-191-37/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove old adapter - mssql is not supported
| * | | | | Remove old adapter - mssql is not supportedJoas Schilling2016-02-191-37/+0
| |/ / / /
* | | | | 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 #22218 from owncloud/occ-no-extra-messagesThomas Müller2016-02-192-2/+23
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Add global --no-warnings option to occ…
| * | | | | Add global --no-warning option to occ in order not to pollute output with ↵Victor Dubiniuk2016-02-192-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | warnings
* | | | | | 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 #22487 from owncloud/hidden-text-for-informationThomas Müller2016-02-191-0/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add hidden text to issue templates
| * | | | | | Add hidden text to issue templatesLukas Reschke2016-02-181-0/+7
| | | | | | | | | | | | | | | | | | | | | Explains that this is a bug tracker + links to owncloud.org/support
* | | | | | | Merge pull request #22472 from owncloud/scrutinizer-patch-1Thomas Müller2016-02-198-14/+21
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Scrutinizer Auto-Fixes
| * | | | | | Fix even moreRoeland Jago Douma2016-02-191-1/+2
| | | | | | |
| * | | | | | Fix more thingsJoas Schilling2016-02-194-7/+7
| | | | | | |
| * | | | | | Fix PHPDocThomas Müller2016-02-191-1/+1
| | | | | | |
| * | | | | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2016-02-198-16/+22
| | |/ / / / | |/| | | | | | | | | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
* | | | | | 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-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)
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 03:52:26 +0000