Update form.html - "und" instead "and" in English

See merge request !1025

Update dependency django-colorfield to ^0.7.0

See merge request !1022

Resolve "Max length for allowed_scopes is much too low"

Closes #687

See merge request !1010

Merge branch '688-clientprotectedresourcemixin-allows-access-if-no-allowed_scopes-are-set' into 'master'

Resolve "ClientProtectedResourceMixin allows access if no allowed_scopes are set"

Closes #688

See merge request !1011

Merge branch 'master' into '688-clientprotectedresourcemixin-allows-access-if-no-allowed_scopes-are-set'

# Conflicts:
#   CHANGELOG.rst

Resolve "Items in sidenav do not yield to uploaded logo"

Closes #649

See merge request !1020

Pin javascript dependencies

See merge request !1012

makemessages: Add support for Ukrainian and Russian.

See merge request !1013

Update dependency django-bleach to v2

See merge request AlekSIS/official/AlekSIS-Core!1007

Bump dependency on django-maintenance-mode

Closes #648

See merge request !1009

Merge branch '683-attributeerror-at-about-anonymoususer-object-has-no-attribute-person' into 'master'

Resolve "AttributeError at /about/: 'AnonymousUser' object has no attribute 'person'"

Closes #683

See merge request AlekSIS/official/AlekSIS-Core!1006

Resolve "Add possibility to create Ical feeds for all apps"

Closes #658

See merge request !975

Merge branch '682-scheduled-notifications-are-shown-on-the-dashboard-at-the-wrong-time' into 'master'

Resolve "Scheduled notifications are shown on the dashboard at the wrong time"

Closes #682

See merge request AlekSIS/official/AlekSIS-Core!1005

Jonathan Weth authored 3 years ago and Julian committed 3 years ago

Apply suggestion from @hansegucker

Translations update from Weblate

See merge request AlekSIS/official/AlekSIS-Core!1002

Currently translated at 100.0% (663 of 663 strings)

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

Update translation files

See merge request !1001