Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use latest django LTS, 4.2 #1591

Merged
merged 4 commits into from
May 10, 2024
Merged

Use latest django LTS, 4.2 #1591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e10db3b
Update django version
jimbonothing64 May 10, 2024
aeca0aa
Replace django-activeurl with django-active-link
jimbonothing64 May 10, 2024
01a9810
Update markdownx
jimbonothing64 May 10, 2024
028b619
Remove django-active-link
jimbonothing64 May 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions dthm4kaiako/config/settings/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@
'allauth.socialaccount',
'rest_framework',
'markdownx',
'django_activeurl',
'mapwidgets',
'captcha',
'django_filters',
Expand Down Expand Up @@ -364,15 +363,6 @@
'Image': ['.jpg', '.jpeg', '.gif', '.png', '.tif', '.tiff']
}

# django-activeurl
# ------------------------------------------------------------------------------
ACTIVE_URL_KWARGS = {
'css_class': 'active',
'parent_tag': 'li',
'menu': 'yes',
'ignore_params': 'no'
}

# django-rest-framework
# ------------------------------------------------------------------------------
REST_FRAMEWORK = {
Expand Down
4 changes: 1 addition & 3 deletions dthm4kaiako/templates/base-branded.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% extends "base-core.html" %}

{% load static i18n activeurl svg %}
{% load static i18n svg %}

{% block body %}
<nav id="primary-navbar" class="navbar navbar-expand-md navbar-dark">
Expand All @@ -19,7 +19,6 @@

<div class="collapse navbar-collapse" id="navbarPrimaryContent">
{% if request %}
{% activeurl %}
<ul class="navbar-nav w-100">
<li class="nav-item resources-navbar">
<a class="nav-link" href="{% url 'resources:home' %}">Resources</a>
Expand Down Expand Up @@ -51,7 +50,6 @@
{% endif %}
{% endcomment %}
</ul>
{% endactiveurl %}
{% endif %}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion dthm4kaiako/templates/base-unbranded.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% extends "base-core.html" %}

{% load static i18n activeurl svg %}
{% load static i18n svg %}

{% block body %}
{% block navbar %}
Expand Down
2 changes: 1 addition & 1 deletion dthm4kaiako/templates/poet/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% extends "base-unbranded.html" %}

{% load static activeurl %}
{% load static %}

{% block title %}POET - dthm4kaiako.ac.nz{% endblock title %}

Expand Down
7 changes: 3 additions & 4 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Django
django==3.2.25
django-activeurl==0.2.0 # https://github.com/hellysmile/django-activeurl
django==4.2.13
django-allauth==0.62.1
django-anymail[mailgun]==8.6
django-autoslug==1.9.9 # https://github.com/justinmayer/django-autoslug
Expand All @@ -12,10 +11,10 @@ django-filebrowser-no-grappelli==4.0.2
django-filter==21.1 # https://github.com/carltongibson/django-filter/
django-inline-svg==0.1.1
django-ipware==7.0.1
django-markdownx==3.0.1 # https://github.com/neutronX/django-markdownx
django-markdownx==4.0.7 # https://github.com/neutronX/django-markdownx
django-map-widgets==0.4.2 # https://github.com/erdem/django-map-widgets
django-model-utils==4.5.1 # https://github.com/jazzband/django-model-utils
django-modelclone==0.7.1
django-modelclone-next==0.8.2
django-recaptcha==3.0.0
django-tinymce==4.0.0 # https://github.com/jazzband/django-tinymce
djangorestframework==3.15.1 # https://github.com/encode/django-rest-framework
Expand Down
Loading