Code

Compatibility with Django 4.0#458

Code

Merged

knabar merged 15 commits intoome:masterome/omero-web:masterfrom chris-allan:django-4-0chris-allan/omero-web:django-4-0Copy head branch name to clipboardMay 31, 2023

+395-376

Commits

Commits on Apr 24, 2023

• Allow Django 4.0.x

  chris-allan

  committed
  c9191f7

• Switch to force_str and clean up some py2 string handling

  chris-allan

  committed
  a7816aa

• Update to latest django-pipeline version

  chris-allan

  committed
  e0a7d68

• django.conf.urls.url --> django.urls.re_path

  chris-allan

  committed
  0f25d29

• django.utils.http.is_safe_url --> django.utils.http.url_has_allowed_host_and_scheme

  chris-allan

  committed
  d571038

• django.utils.translation.ugettext_lazy --> django.utils.translation.gettext_lazy

  chris-allan

  committed
  7d7375d

• django.utils.encoding.smart_text --> django.utils.encoding.smart_str

  chris-allan

  committed
  a9d38ad

• Add compatibility function for HttpRequest.is_ajax()

  chris-allan

  committed
  dfb1462

• ifequal a b --> if a == b

  chris-allan

  committed
  3ee4551

• ifnotequal a b --> if a != b

  chris-allan

  committed
  720aa22

• Add dependency on pytz

  chris-allan

  committed
  b394be4

Commits on May 1, 2023

• Merge remote-tracking branch 'origin/master' into django-4-0

  chris-allan

  committed
  2727112

Commits on May 11, 2023

• Merge remote-tracking branch 'origin/master' into django-4-0

  chris-allan

  committed
  a9211bd

Commits on May 31, 2023

• Revert "Allow Django 4.0.x"

  Show description for 7104be2
  chris-allan

  committed
  7104be2

• Revert "Update to latest django-pipeline version"

  Show description for b5b3c17
  chris-allan

  committed
  b5b3c17