Fix wording of client sessions

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>

Format Nextcloud Talk clients sessions.

Signed-off-by: Ivan Sein <ivan@nextcloud.com>

Merge pull request #12355 from nextcloud/version/noid/15.0.0beta2

15.0.0 Beta 2

15.0.0 Beta 2

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

Merge pull request #12467 from nextcloud/bugfix/11901/show-thumbnail-on-rename

Show thumbnail on rename

Enhance jsunit tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

Merge pull request #12458 from nextcloud/bugfix/dav_shares_hickup

fixes dav share issue with owner

fix caldav tests

Signed-off-by: Georg Ehrke <developer@georgehrke.com>

Merge pull request #12466 from nextcloud/fix/sting-doctype-casing

Fix string doctype casing

Merge pull request #12421 from nextcloud/bugfix/noid/icons-cacher-app-prefix

Prefix icon variables with app name to avoid conflicts

Show thumbnail on rename

* does not hide thumbnail when rename is shown
* fixes layout for grid and list view
* fixes #11901

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

Fix string doc type casing

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

Prefix icon variables with app name to avoid conflicts

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Merge pull request #12292 from nextcloud/fix/2947/lapse-sizelimit-error

avoid logging of "Partial search results returned: Sizelimit exceeded…"

Merge pull request #12447 from nextcloud/bugfix/12446/fix-oracle-install-again

Shorten index name of calendar changes table

Merge pull request #11200 from nextcloud/bugfix/2954/interaction-with-groups-containing-a-slash

Fix interaction with groups that contain a slash

Fix interaction with groups that contain a slash

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

[tx-robot] updated from transifex

fixes dav share issue with owner

Signed-off-by: Georg Ehrke <developer@georgehrke.com>

Merge pull request #12448 from nextcloud/bugfix/noid/dav-loadapps

Load apps that have a dav type set before the dav server plugins

Merge pull request #12457 from nextcloud/fix/noid/fix-phpdoc

Update PHPDoc to fix typos

Update PHPDoc to fix typos

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

Merge pull request #12417 from nextcloud/bugfix/noid/app-files_external-replace-insertIfNotExist

Fix UniqueConstraintViolationException while insert into files_external config tables

Merge pull request #12456 from nextcloud/move_to_github_bot

Sign-off check is now handled by a github app

Merge pull request #12454 from nextcloud/list-shrink-fix

Fix breakpoint and shrinking of the content + list

Sign-off check is now handled by a github app

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Merge pull request #12455 from nextcloud/twofactor-backup-settings

Don't register twofactor_backup settings as "regular" settings

Merge pull request #12450 from nextcloud/fix/11868/decryption_hardening

Throw exception if decryption fails

Allow apps to use the variables too

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

twofactor auth settings are not regular settings

Signed-off-by: Robin Appelman <robin@icewind.nl>

Log invalid settings class

Signed-off-by: Robin Appelman <robin@icewind.nl>

Fix breakpoint and shrinking of the content + list

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Fix UniqueConstraintViolationException while insert into files_external config tables

* followup to #12371

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

Throw exception if decryption fails

For #11868

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Load apps that have a dav type set before the dav server plugins

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Shorten index name of calendar changes table

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

[tx-robot] updated from transifex

Merge pull request #12398 from nextcloud/fix/12378

change "Download" to "Download all files" for shared folders

Merge pull request #12275 from nextcloud/bugfix/11975/oracle_calendar_subscriptions_source

Fix Calendarsubscriptions source column change on Oracle

Fix Calendarsubscriptions source column change on Oracle

Signed-off-by: Georg Ehrke <developer@georgehrke.com>

Merge pull request #12439 from nextcloud/vcard_uid_repair_postgres

Fix SetVcardDatabaseUID when using postgresql

Fix SetVcardDatabaseUID when using postgresql

Signed-off-by: Robin Appelman <robin@icewind.nl>

[tx-robot] updated from transifex

Merge pull request #12359 from nextcloud/ie11-width-fix

Fix IE rule for min width

Merge pull request #12418 from nextcloud/bugfix/noid/do-not-show-integrity-warning-always

Remove outdated integrity warning on each page

Merge pull request #12419 from nextcloud/bugfix/noid/group-creation-replace-insertIfNotExist

Fix UniqueConstraintViolationException while insert into oc_groups

Merge pull request #12420 from nextcloud/bugfix/noid/icons-cacher-not-found

Ignore icons if the file could not be found

Merge pull request #11942 from nextcloud/techdebt/noid/use-count-function

Use the defined func()->count() instead of manual counting

Fix UniqueConstraintViolationException while insert into oc_groups

* fixes race condition in insert
* fixes potentiaol deadlock

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

Do not fail if the icon file doesn't exists

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Merge pull request #12413 from nextcloud/bugfix/9305/oc_file_locks-unique-constraint

Fix UniqueConstraintViolationException while insert into oc_file_locks

Remove outdated integrity warning on each page

* integrity warning is shown during update and in the admin setup checks
* there is also the plan to retire this old way of notification

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

Merge pull request #12411 from nextcloud/bugfix/6160/oc_filecache-unique-constraint

Fix UniqueConstraintViolationException while insert into oc_filecache

Fix UniqueConstraintViolationException while insert into oc_file_locks

* fixes #9305 by not being prone to the race condition in insertIfNotExists
* fixes #6899 by not using a query that can result in a deadlock
* replaces the insertIfNotExists call with an insert which is wrapped into a try-catch block
* followup to #12371

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

Merge pull request #12409 from nextcloud/admin-vue-approval-fix

Use nextcloud-password-confirmation

Fix UniqueConstraintViolationException while insert into oc_filecache

* fixes #6160 by not being prone to the race condition in insertIfNotExists
* fixes #12228 by not using a query that can result in a deadlock
* replaces the insertIfNotExists call with an insert which is wrapped into a try-catch block

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

Merge pull request #12371 from nextcloud/bugfix/12369/catch-unique-constraint-violation-exception-in-insertIfNotExist

Catch UniqueConstraintViolationException inside insertIfNotExist

fixup! Use nextcloud-password-confirmation

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

fixup! Use nextcloud-password-confirmation

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Exception is not thrown anymore

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

Merge pull request #12408 from nextcloud/bugfix/noid/icon-cacher-update

Make sure to always load the latest icons-vars.css file

Use nextcloud-password-confirmation

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Merge pull request #12384 from nextcloud/fix/12357/public-share-scrollbar

Reduces the footer link padding

Make sure to always load the latest icons-vars.css file

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Merge pull request #12389 from nextcloud/fix-dav-groupid

Fix displayName return of dav groups request

[tx-robot] updated from transifex

Merge pull request #12388 from nextcloud/inline-input-confirm-margin-fix

Fix inline input confirm margin

Merge pull request #12385 from nextcloud/fix/12356/grid-toggle-fix

Fixes the grid toggle for none folder shares

[tx-robot] updated from transifex

change "Download" to "Download all files" for shared folders

fixes #12378

Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>

Fix displayName return of dav groups request

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Fix inline input confirm margin

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

[tx-robot] updated from transifex

Fixes the grid toggle for none folder shares

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>

Fixes the footer #12357

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>

Merge pull request #12358 from nextcloud/bugfix/noid/wrong-update-check-version

Check for compatible apps from the appstore fails

Add deprecation message ofr insertIfNotExist

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

Catch UniqueConstraintViolationException inside insertIfNotExist

This is the most common case for the usage of this method.

See also https://github.com/nextcloud/server/issues/12369 and the linked tickets.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

Adjust unit tests

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

[tx-robot] updated from transifex

Merge pull request #12349 from nextcloud/feature/noid/populate-notification-message-with-the-comment

Populate the mention-notification with the actual message

Merge pull request #12352 from nextcloud/adjust-acceptance-tests-to-changes-in-public-share-page-menu

Adjust acceptance tests to changes in public share page menu

Fix IE rule for min width

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Use the defined func()->count() instead of manual counting

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

Improve style of incompatible apps list

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

Merge pull request #12335 from nextcloud/fix/12319/respect-fixed-usernames

do not offer to change display name or password, if not possible.

Use the version number when checking the appstore for compatible updates

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

Fix overlapping update button in notifications

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

Adjust acceptance tests to changes in public share page menu

The "Download" item in the menu of public share pages is no longer shown
in wide (>768px) windows (although the element is in the DOM and shown
if resized to a narrow window).

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

Merge pull request #12310 from nextcloud/version/noid/15.0.0beta1

15.0.0 beta 1

Populate the mention-notification with the actual message

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

15.0.0 beta 1

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

Merge pull request #12348 from nextcloud/fix/basic_csp_no_longer_deprecated

Basic CSP no longer deprecated

Merge pull request #10059 from nextcloud/feature/1497/cache_webcal_calendars

cache webcal calendars on server

Basic CSP no longer deprecated

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Merge pull request #12313 from nextcloud/generated-avatar-major-cleanup

Clear avatar cache with frontend repair

Clear avatar cache with frontend repair

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

[tx-robot] updated from transifex

Merge pull request #12342 from nextcloud/bugfix/noid/ie11-appcontent

Add fix for IE11 flexbox height bug

do not offer to change display name or password, if not possible.

Fixes #12319

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>