Merge remote-tracking branch 'upstream/pull/5059'

Localisation updates from https://translatewiki.net.

Set min preview height when switching away from edit tab

Previously it was set when switching to a preview tab. Now that won't work correctly because we have one extra tab.

Switch away from help tab when help sidebar becomes visible

Move help card between pane/sidebar depending on sidebar visibility

Add richtext help tab

Use closest() instead of parents() when looking for richtext container

Remove unused richtext dom ids

Remove .richtext_preview css class

Remove .richtext_content css class

Remove .richtext_dopreview css class

Merge remote-tracking branch 'upstream/pull/5055'

Merge remote-tracking branch 'upstream/pull/5054'

Merge remote-tracking branch 'upstream/pull/5053'

Merge pull request #5019 from tomhughes/oauth2-cleanup

Add expiry for OAuth 2 grants and tokens

Merge pull request #5044 from mmd-osm/patch/rn1

JSON partial rendering in loop

Don't order by id when getting last records

Redirect to newly created diary comment

Lock note during status update to avoid race condition

Merge remote-tracking branch 'upstream/pull/5051'

Merge remote-tracking branch 'upstream/pull/5050'

Merge remote-tracking branch 'upstream/pull/5049'

Merge remote-tracking branch 'upstream/pull/5046'

Update bundle

Refactor copypasted invalid node attribute test code

Don't use XML::Parser when testing changeset upload diffResults

Always check the order when testing changeset queries

Merge branch 'pull/5045'

Localisation updates from https://translatewiki.net.

Set og:image:alt OpenGraph property

Add image_alt accessor to rich text

Users: avoid calling json.partial! in loop

Notes: avoid calling json.partial! in loop

Changeset: avoid XML rendering in loop

Messages: avoid calling json.partial! in loop

Changesets: avoid calling json.partial! in loop

Merge branch 'pull/5023'

Merge remote-tracking branch 'upstream/pull/5042'

Merge remote-tracking branch 'upstream/pull/5041'

Switch between richtext edit/preview using Bootstrap tab panes

Convert richtext edit/preview buttons into tabs

Change richtext edit/preview buttons type to non-submit

Skip images with missing src

Detect <img> images in markdown rich text

Merge remote-tracking branch 'upstream/pull/5040'

Merge remote-tracking branch 'upstream/pull/5039'

Bump rexml from 3.3.2 to 3.3.3

Bumps [rexml](https://github.com/ruby/rexml) from 3.3.2 to 3.3.3.
- [Release notes](https://github.com/ruby/rexml/releases)
- [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md)
- [Commits](https://github.com/ruby/rexml/compare/v3.3.2...v3.3.3)

---
updated-dependencies:
- dependency-name: rexml
  dependency-type: indirect
...

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

Bump qs from 6.12.3 to 6.13.0

Bumps [qs](https://github.com/ljharb/qs) from 6.12.3 to 6.13.0.
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.12.3...v6.13.0)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

Merge remote-tracking branch 'upstream/pull/5037'

Merge remote-tracking branch 'upstream/pull/5036'

Test plaintext trace emails

Test tags with &-encoded characters in trace emails

Merge branch 'pull/5031'

Localisation updates from https://translatewiki.net.

Don't pass width/height to user menu thumbnail

Merge branch 'pull/5035'

Trace picture with fixed size

GPX Import email in text format

Fixes #5025

Merge branch 'pull/5030'

Added bootstrap alert when body preview is empty

Fixes #3748. Added check to SiteController#preview to detect if (message, diary entry, diary entry comment) body is empty and if positive, returns rendered bootstrap alert "Nothing to preview" to be displayed in richtext_field.

Merge remote-tracking branch 'upstream/pull/4605'

Update bundle

Trace image with fixed size

Localisation updates from https://translatewiki.net.

Add Messages API

as discussed in [Issue #4509](https://wiki.openstreetmap.org/w/index.php?title=Messaging_API_proposal)
and documented in [Messaging API reference](https://wiki.openstreetmap.org/w/index.php?title=Messaging_API_proposal)

Merge branch 'pull/5020'

Merge remote-tracking branch 'upstream/pull/5027'

Bump eslint from 9.7.0 to 9.8.0

Bumps [eslint](https://github.com/eslint/eslint) from 9.7.0 to 9.8.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v9.7.0...v9.8.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

Merge remote-tracking branch 'upstream/pull/5022'

Merge remote-tracking branch 'upstream/pull/5021'

Merge remote-tracking branch 'upstream/pull/5016'

Move check_block_buttons method to other private methods

Allow revokers to edit revoked blocks

Simplify issue path helper calls

Move notes and blocks resources to api namespace

Merge remote-tracking branch 'upstream/pull/5018'

Merge remote-tracking branch 'upstream/pull/5017'

Convert tests using OAuth 1 tokens to use OAuth 2 tokens

Add expiry for OAuth 2 grants and tokens

Simplify api changeset path helper calls

Localisation updates from https://translatewiki.net.

Use assert_not_predicate instead of assert_not next to assert_predicate

Show edit links for revoked blocks to revokers

Merge remote-tracking branch 'upstream/pull/5014'

Merge remote-tracking branch 'upstream/pull/5013'

Merge remote-tracking branch 'upstream/pull/5012'

Show edit links for inactive blocks on block pages

Show edit links for inactive blocks in block lists

Allow to edit inactive blocks

Merge remote-tracking branch 'upstream/pull/5011'

Update bundle

Change diary comment post paths

Check diary entry edit/update ability using CanCanCan

Select closest value to remaining duration when editing a block

Localisation updates from https://translatewiki.net.

Only load the english resources for community index if they exist

Merge remote-tracking branch 'upstream/pull/5007'

Merge remote-tracking branch 'upstream/pull/5006'

Move auth provider icons to auth_providers subdirectory

Use Bootstrap collapse to toggle OpenID login form