Hangzhi Yu authored 2 years ago and Jonathan Weth committed 2 years ago

(cherry picked from commit fce5c228675796113c1b00b4a0b399ace2878210)

Update dependency django-allauth to ^0.53.0

See merge request !1200

Merge branch '808-apps-should-be-able-to-register-urls-for-api-stuff-which-are-not-mounted-under-django' into 'master'

Resolve "Apps should be able to register URLs for API stuff which are not mounted under /django/"

Closes #808

See merge request !1191

Remove duplicate changelog entries

See merge request !1197

Add changelog for 2.12.2 - 2.12.3

See merge request !1196

Merge branch '813-resize-listener-for-iframe-in-legacybasetemplate-does-not-trigger-in-some-cases' into 'release-3.0'

Resolve "Resize listener for IFrame in LegacyBaseTemplate does not trigger in some cases"

See merge request !1195

Update dependency django-ipware to v5

See merge request !1192

Resolve "Change default Apollo network policy to cache-and-network"

See merge request !1194

# Conflicts:
#   CHANGELOG.rst

Merge branch '809-sw-delivers-offline-fallback-page-when-status-code-is-not-between-200-299-response-ok' into 'release-3.0'

Resolve "SW delivers offline fallback page when status code is not between 200-299 (response.ok)"

See merge request !1193

Translations update from Weblate

See merge request !1187

Currently translated at 100.0% (628 of 628 strings)

Translation: AlekSIS/AlekSIS-Core
Translate-URL: https://translate.edugit.org/projects/aleksis/aleksis-core/de/

Update translation files

See merge request !1186

Activate WebAuthn and redesign 2FA profile page

See merge request !1099