summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Return 500 and the exception message (on debug) on OCSJoas Schilling2021-10-221-3/+9
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* [tx-robot] updated from transifexNextcloud bot2021-10-2218-0/+252
| | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* Merge pull request #29345 from nextcloud/fix/profile-preview-cardPytal2021-10-213-41/+31
|\
| * Remove unused click handlerChristopher Ng2021-10-213-41/+31
|/ | | | | | | | - Handle long lines unbroken by white space - Cleanup Signed-off-by: Christopher Ng <chrng8@gmail.com> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
* Merge pull request #29362 from nextcloud/fix/groupfolder-copy-aclCarl Schwan2021-10-211-1/+4
|\ | | | | Fix security issues when copying groupfolder with advanced ACL
| * Fix security issues when copying groupfolder with advanced ACLCarl Schwan2021-10-211-1/+4
| | | | | | | | | | | | | | | | | | | | Using advanced ACL, it is possible that an user has access to a directory but not to a subdirectory, so the copying use Common::copyFromStorage instead of Local::copyFromStorage. Fix https://github.com/nextcloud/groupfolders/issues/1692 Signed-off-by: Carl Schwan <carl@carlschwan.eu>
* | Merge pull request #29343 from ↵Christoph Wurst2021-10-213-27/+26
|\ \ | | | | | | | | | | | | nextcloud/dependachristoph/composer/symfony-4.4.30-and-friends Bump Symfony family and friends to v4.4.30
| * | Bump Symfony family and friends to v4.4.30Christoph Wurst2021-10-213-32/+26
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #29332 from nextcloud/sendPasswordByMailJohn Molakvoæ2021-10-212-2/+17
|\ \ \
| * | | Adjust testtobiasKaminsky2021-10-211-1/+9
| | | | | | | | | | | | | | | | Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
| * | | Expose send_password_by_mail via capabilitiestobiasKaminsky2021-10-201-1/+8
| | | | | | | | | | | | | | | | Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
* | | | Merge pull request #23171 from nextcloud/enh/preview/move_to_bootstrapJohn Molakvoæ2021-10-218-2/+143
|\ \ \ \
| * | | | Move preview provider registration to bootstrapRoeland Jago Douma2021-10-218-2/+143
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Merge pull request #29355 from nextcloud/fix/carl/loging-button-arrowLouis2021-10-211-1/+0
|\ \ \ \ \ | | | | | | | | | | | | Fix login button alignment
| * | | | | Fix login button alignmentCarl Schwan2021-10-211-1/+0
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Carl Schwan <carl@carlschwan.eu>
* | | | | Merge pull request #29256 from ↵Julien Veyssier2021-10-215-46/+72
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | nextcloud/fix/noid/harmonize-appstoreenabled-check Fix appstoreenabled check
| * | | | Fix unit testsJoas Schilling2021-10-212-41/+67
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | fix appstoreenabled check in Fetcher so it's coherent with AppSettingsControllerJulien Veyssier2021-10-183-5/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
* | | | | Merge pull request #29346 from nextcloud/fix/biography-resizeLouis2021-10-213-5/+5
|\ \ \ \ \ | | | | | | | | | | | | Allow resize of Biography/About box
| * | | | | Allow textarea resizeChristopher Ng2021-10-203-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
* | | | | | Merge pull request #29351 from nextcloud/automated/noid/psalm-baseline-updateLouis2021-10-211-5/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | [Automated] Update psalm-baseline.xml
| * | | | | Update psalm baselinenextcloud-command2021-10-211-5/+0
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: GitHub <noreply@github.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2021-10-2174-64/+1070
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | Merge pull request #29342 from nextcloud/fix/noid/upgrade-22.2-to-23blizzz2021-10-201-1/+1
|\ \ \ \ \ | | | | | | | | | | | | allow upgrading from 22.2.x
| * | | | | allow upgrading from 22.2.xArthur Schiwon2021-10-201-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | Merge pull request #27196 from ↵John Molakvoæ2021-10-201-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | nextcloud/fix/ApiControllerTest-testShowHiddenFiles
| * | | | Fix setUserValue bool test on testShowHiddenFiles & testCropImagePreviewsJohn Molakvoæ (skjnldsv)2021-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #29330 from nextcloud/fix/missing-profile-config-defaultsblizzz2021-10-201-44/+53
|\ \ \ \ \ | |_|/ / / |/| | | | Populate missing profile config defaults
| * | | | Populate defaults into exising profile configChristopher Ng2021-10-201-39/+49
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com>
| * | | | CleanupChristopher Ng2021-10-201-5/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com>
* | | | | Merge pull request #29334 from ↵John Molakvoæ2021-10-204-7/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | nextcloud/fix/dav-availability-settings-duplicate-slots
| * | | | | Prevent duplicate CalDAV availability slots for recurring slotsChristoph Wurst2021-10-204-7/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is the same time slot for more than one day, then we wrote two recurring AVAILABILITY components before. With this patch equal blocks are combined into one recurring component. This makes the generated rules more compact and easier to work with. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #28314 from nextcloud/sharing-ibootstrapChristoph Wurst2021-10-207-166/+102
|\ \ \ \ \ \ | | | | | | | | | | | | | | move files_sharing to IBootStrap
| * | | | | | fix federated sharingRobin Appelman2021-10-191-34/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | update testsRobin Appelman2021-10-193-19/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | use the correct navigation manager for the sharesRobin Appelman2021-10-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | call setupSharingMenus againRobin Appelman2021-10-191-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | move files_sharing to IBootStrapRobin Appelman2021-10-193-102/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | Merge pull request #29320 from ↵Christoph Wurst2021-10-201-1/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/28261/fix-basic-auth-for-oauth-token-endpoint Fix basic auth for OAuth token endpoint
| * | | | | | | Fix basic auth for OAuth token endpointJoas Schilling2021-10-191-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't try to login when a client is trying to get a OAuth token. OAuth needs to support basic auth too, so the login is not valid inside Nextcloud and the Login exception would ruin it. Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | Merge pull request #29269 from ↵Joas Schilling2021-10-2013-43/+178
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/feature/28751/provide-contactsmenu-as-ocs-simple Add an OCS endpoint for the hovercard contact actions
| * | | | | | | | Change origin field to appIdJoas Schilling2021-10-207-33/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | | Do not remove current user on findOneJohn Molakvoæ2021-10-202-28/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
| * | | | | | | | Add appName to contactsmenu action APIJohn Molakvoæ2021-10-205-5/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
| * | | | | | | | Add an OCS endpoint for the hovercard contact actionsJoas Schilling2021-10-204-0/+88
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | Merge pull request #29313 from nextcloud/fix/status-menu-updateCarl Schwan2021-10-208-30/+56
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix status menu item not listening to status change events
| * | | | | | | | Fix status menu item not listening to status change eventsCarl Schwan2021-10-208-30/+56
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it so that the status menu item listens to user_status:status.updated events even when they are triggered outside of the user status modal. Signed-off-by: Carl Schwan <carl@carlschwan.eu> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
* | | | | | | | Merge pull request #29260 from nextcloud/fix/user_status_enumeration2Joas Schilling2021-10-206-7/+213
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Respect user enumeration settings in user status lists
| * | | | | | | | Add integration tests for user_status APIJonas Meurer2021-10-203-0/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonas Meurer <jonas@freesources.org>
| * | | | | | | | Respect user enumeration settings in user status listsJonas Meurer2021-10-203-7/+101
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So far, the functions to find user statuses listed didn't respect user enumeration settings (`shareapi_allow_share_dialog_user_enumeration` and `shareapi_restrict_user_enumeration_to_group` core app settings). Fix this privacy issue by returning an empty list in case `shareapi_allow_share_dialog_user_enumeration` is unset or `shareapi_restrict_user_enumeration_to_group` is set. In the long run, we might want to return users from common groups if `shareapi_restrict_user_enumeration_to_group` is set. It's complicated to implement this in a way that scales, though. See the discussion at https://github.com/nextcloud/server/pull/27879#pullrequestreview-753655308 for details. Also, don't register the user_status dashboard widget at all if `shareapi_allow_share_dialog_user_enumeration` is unset or `shareapi_restrict_user_enumeration_to_group` is set. Fixes: #27122 Signed-off-by: Jonas Meurer <jonas@freesources.org>