Merge pull request #42052 from nextcloud/fix/carddav/create-sab-concurrently

Merge pull request #49039 from nextcloud/jtr/fix-ipv6-zone-ids-link-local

fix(carddav): Handle race for SAB creation better

* Accept non repeatable read and INSERT conflict by another read
* Handle replication edge case

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

Merge pull request #46222 from nextcloud/fix/task-processing-api-controller/dont-use-plus

Merge pull request #49015 from nextcloud/fix/openapi/array-syntax

Merge pull request #48721 from nextcloud/feat/allow-getter-setter-decl-fors

Merge pull request #49102 from nextcloud/dependabot/npm_and_yarn/multi-2299424a7d

Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>

build(deps): bump cookie and socket.io

Bumps [cookie](https://github.com/jshttp/cookie) and [socket.io](https://github.com/socketio/socket.io). These dependencies needed to be updated together.

Updates `cookie` from 0.4.2 to 0.7.2
- [Release notes](https://github.com/jshttp/cookie/releases)
- [Commits](https://github.com/jshttp/cookie/compare/v0.4.2...v0.7.2)

Updates `socket.io` from 4.7.5 to 4.8.1
- [Release notes](https://github.com/socketio/socket.io/releases)
- [Changelog](https://github.com/socketio/socket.io/blob/main/CHANGELOG.md)
- [Commits](https://github.com/socketio/socket.io/compare/socket.io@4.7.5...socket.io@4.8.1)

---
updated-dependencies:
- dependency-name: cookie
  dependency-type: indirect
- dependency-name: socket.io
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Merge pull request #49094 from nextcloud/chore/nextcloud-dialogs-master

chore(deps): Update `@nextcloud/dialogs` to v6.0.1

Merge pull request #48933 from nextcloud/clear-pending-two-factor-tokens-also-from-configuration

Clear pending two factor tokens also from configuration

fix: Handle exception when clearing previously removed two factor tokens

If a token was already removed from the database but not from the
configuration clearing the tokens will try to remove it again from the
database, which caused a DoesNotExistException to be thrown.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>

fix: Clear pending two factor tokens also from configuration

Otherwise as the tokens were removed from the database but not from the
configuration the next time that the tokens were cleared the previous
tokens were still got from the configuration, and trying to remove them
again from the database ended in a DoesNotExistException being thrown.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>

chore: Compile assets

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

chore(deps): Update `@nextcloud/dialogs` to v6.0.1

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

Merge pull request #48792 from nextcloud/chore/update_mysql_setup_check_i18n

fix(OpenAPI): Adjust array syntax to avoid ambiguities

Signed-off-by: provokateurin <kate@provokateurin.de>

Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>

Merge pull request #48621 from nextcloud/feat/issue-3786-allow-shared-calendars

feat: Allow shared calendars as appointment conflict calendars

Merge branch 'master' into feat/issue-3786-allow-shared-calendars

Merge pull request #49072 from nextcloud/backport/49057/master

chore: Update code owners

Merge pull request #49075 from nextcloud/bugfix/noid/fix-oauth2-owncloud-migration

fix(owncloud): Fix ownCloud migration with oauth2 app

Merge pull request #48737 from nextcloud/fix/broken-event-notifications

fix(caldav): broken activity rich objects

fix(tests): Add  IpAddressClassifier v6 zone ID test

Signed-off-by: Josh <josh.t.richards@gmail.com>

fix(tests): Add RemoteAddress v6 zone ID test

Signed-off-by: Josh <josh.t.richards@gmail.com>

fix(owncloud): Fix ownCloud migration with oauth2 app

Signed-off-by: Joas Schilling <coding@schilljs.com>

Merge pull request #49051 from nextcloud/rakekniven-patch-1

chore(i18n): Fix grammar

chore: Fix maintainer of federation app

Signed-off-by: Joas Schilling <coding@schilljs.com>

Merge pull request #49065 from nextcloud/enh/noid/update-o.c.u-wording

docs: update overwrite.cli.url wording

Merge pull request #48723 from nextcloud/fix/caldav/event-reader-duration

fix(caldav): duration handling in the event reader class

Merge pull request #47425 from nextcloud/fix/avoid-invalid-share-on-transfer-ownership

fix: promote re-shares when deleting the parent share

docs: update overwrite.cli.url wording

Signed-off-by: Simon L. <szaimen@e.mail.de>

Merge pull request #49053 from nextcloud/fix/noid/update-codeowners-nfebe

chore: Change Fenn-CS to nfebe

Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>

chore: Change Fenn-CS to nfebe

Signed-off-by: Marcel Müller <marcel-mueller@gmx.de>

chore(i18n): Fix grammar

Reported at Transifex

Signed-off-by: rakekniven <2069590+rakekniven@users.noreply.github.com>

Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>

Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>

Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>

fix(net): Add IPv6 zone handling to IpAddressClassifier

Signed-off-by: Josh <josh.t.richards@gmail.com>

fix(security): Handle IPv6 zone IDs used in link-local addresses

Signed-off-by: Josh <josh.t.richards@gmail.com>

fix(security): Handle IPv6 zone IDs used in link-local addresses

Signed-off-by: Josh <josh.t.richards@gmail.com>

Merge pull request #49009 from nextcloud/fix/noid/set-ext-pwd-as-sensitive

fix(files-external): set password as sensitive

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>

Merge pull request #49000 from nextcloud/dependabot/composer/giggsey/libphonenumber-for-php-lite-8.13.48

build(deps): Bump giggsey/libphonenumber-for-php-lite from 8.13.45 to 8.13.48

Merge pull request #49023 from nextcloud/new-julius

chore: rename julius

build(deps): Bump giggsey/libphonenumber-for-php-lite from 8.13.45 to 8.13.48

Signed-off-by: Joas Schilling <coding@schilljs.com>

chore: rename julius

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>

Merge pull request #49017 from nextcloud/fix/48415/do-not-rename-main-share-link

fix(ShareEntryLinkList): Append new links to the end of list

chore(assets): Recompile assets

Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>

fix(ShareEntryLinkList): Append new links to the end of list

Currently new shares are added to beginning of the share list in the UI
messing up the ordering with the original (first) looking like the most
recent and the most recent looking like the original share. This error
disappears on refresh.

Resolves : https://github.com/nextcloud/server/issues/48415

Signed-off-by: fenn-cs <fenn25.fn@gmail.com>

Merge pull request #48989 from nextcloud/dependabot/composer/aws/aws-sdk-php-3.324.13

build(deps): Bump aws/aws-sdk-php from 3.311.2 to 3.324.13 for PHP 8.4 compat

Merge pull request #48991 from nextcloud/fix/password-field-sharing

fix(files_sharing): Password field must not be required if already set

Merge pull request #48992 from nextcloud/fix/add-password-confirmation-to-save-global-creds

fix: add PasswordConfirmationRequired to saveGlobalCredentials

Merge pull request #48990 from nextcloud/ci/noid/update-integration-test-stuff

ci: Align integration test dependencies with 3rdparty/ for PHP 8.4 compatibility

fix: add PasswordConfirmationRequired to saveGlobalCredentials

Co-authored-by: yemkareems <yemkareems@gmail.com>
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

Merge pull request #48986 from nextcloud/feat/systemtags-missing-attrs

chore: Compile assets

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

fix(files_sharing): Password field must not be required if already set

If there is already a password, there is no need to require the password
in the setting ('newPassword'). It is only required for new shares.

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

Merge pull request #48559 from nextcloud/fix/recently_active_pgsql

build(deps): Bump aws/aws-sdk-php from 3.311.2 to 3.324.13

Signed-off-by: Joas Schilling <coding@schilljs.com>

chore(setupchecks): update translation for MySQL row format check

Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>

ci: Bump behat/behat as well

Signed-off-by: Joas Schilling <coding@schilljs.com>

fix(sharding): typo in addOrderBy

Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>

fix(users): improve recently active search

- Remove DISTINCT clause to fix PgSQL
- Join user table only if necessary
- Don't show people who never connected in active list
- Add test

Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>

fix(users): use correct active user count

Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>

Merge pull request #42610 from hellodarkness/patch-1

Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>

ci: Align integration test dependencies with 3rdaprty/

Signed-off-by: Joas Schilling <coding@schilljs.com>

Merge pull request #48982 from nextcloud/dependabot/composer/sabre/dav-4.7.0

build: Update Sabre/DAV and siblings to PHP 8.4 compatible versions

build: Update Sabre/DAV and siblings to PHP 8.4 compatible versions

Signed-off-by: Joas Schilling <coding@schilljs.com>

Merge pull request #48665 from nextcloud/feat/settings/app_api_apps_management

feat(settings): migrate AppAPI ExApps management to settings

chore(assets): Recompile assets

Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>

chore(assets): Recompile assets

Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>

chore(assets): Recompile assets

Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>

fix(ci): eslint fix, minor correction after rebase

Signed-off-by: Andrey Borysenko <andrey18106x@gmail.com>

fix: loading state reactivity

Signed-off-by: Andrey Borysenko <andrey18106x@gmail.com>

fix(ci): fix eslint errors

Signed-off-by: Andrey Borysenko <andrey18106x@gmail.com>

fix(ci): psalm, suppress undefined for viewApps

Signed-off-by: Andrey Borysenko <andrey18106x@gmail.com>

fix: address review comments

Signed-off-by: Andrey Borysenko <andrey18106x@gmail.com>

WIP: remove app_api_apps vuex store

Signed-off-by: Andrey Borysenko <andrey18106x@gmail.com>

WIP: migrate to Pinia, minor fixes

Signed-off-by: Andrey Borysenko <andrey18106x@gmail.com>

WIP: address review comments, small fixes

Signed-off-by: Andrey Borysenko <andrey18106x@gmail.com>

fix(ci): suppress UndefinedClass for AppAPI related classes since it's bundled

Signed-off-by: Andrey Borysenko <andrey18106x@gmail.com>

fix(ci): resolve eslint errors

Signed-off-by: Andrey Borysenko <andrey18106x@gmail.com>

WIP: minor fixes

Signed-off-by: Andrey Borysenko <andrey18106x@gmail.com>

WIP: add missing state checks

Signed-off-by: Andrey Borysenko <andrey18106x@gmail.com>

WIP: use global mutation, since app_api_apps is namespaced

Signed-off-by: Andrey Borysenko <andrey18106x@gmail.com>

WIP: add Daemon badge in app sidebar (2)

Signed-off-by: Andrey Borysenko <andrey18106x@gmail.com>

feat(settings): migrate AppAPI ExApps management (1)

Signed-off-by: Andrey Borysenko <andrey18106x@gmail.com>

feat(app_api): add initial state data for AppAPI UI part

Signed-off-by: Andrey Borysenko <andrey18106x@gmail.com>
# Conflicts:
# apps/settings/lib/Controller/AppSettingsController.php

# Conflicts:
# apps/settings/lib/Controller/AppSettingsController.php

chore(systemtags): add missing migration attributes

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>

Merge pull request #46151 from nextcloud/enh/do-not-enforce-cache-for-cli

fix: adjust `compromized` British wording

Co-authored-by: Kate <26026535+provokateurin@users.noreply.github.com>
Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>

Merge pull request #48725 from nextcloud/chore/remove-old-test

chore: Compile assets

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

test: Add proper styles for Cypress component tests

This also fixes Typescript issue but requires to slightly
adjust the Navigation test as the progress bar is not visible (because it is overlayed by another element).

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

refactor(federatedfilesharing): Replace deprecated functions

* Replace deprecated OC dialogs methods
* Replace deprecated global jQuery with axios
* Replace deprecated jQuery event with event bus
* Add component + unit tests for new dialog

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

Merge pull request #48572 from nextcloud/fix/align-avatar-visibility