Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Merge branch 'master' into feature/update-bootstrap-5.2

Roland Geider641d8db99824
diff --cc package.json
index 8759133ce,a8b21dbd1..44f6d6c85
--- a/package.json
+++ b/package.json
@@@ -17,12 -17,12 +17,12 @@@
"homepage": "https://github.com/wger-project/wger",
"dependencies": {
"Sortable": "RubaXa/Sortable#1.15.0",
- "bootstrap": "4.6.2",
+ "bootstrap": "5.2.2",
"components-font-awesome": "5.9.0",
- "d3": "^7.6.1",
+ "d3": "^7.8.2",
"datatables": "^1.10.18",
"devbridge-autocomplete": "^1.4.11",
- "jquery": "^3.6.1",
+ "jquery": "^3.6.3",
"masonry-layout": "^4.2.2",
"metrics-graphics": "^2.15.6",
"popper.js": "^1.16.1",
diff --cc requirements.txt
index 786992768,696e27dc5..c528aa183
--- a/requirements.txt
+++ b/requirements.txt
@@@ -3,14 -3,16 +3,17 @@@
#
# Application
-bleach[css]~=6.0
+bleach[css]~=5.0
+crispy-bootstrap5==0.7
- django-bootstrap-breadcrumbs~=0.9
+
+ # this is a fork of django-bootstrap-breadcrumbs
+ # we might need to think about migrating away from this completely
+ django-bootstrap-breadcrumbs2==1.0.0
django-formtools~=2.4
django-recaptcha~=3.0.0
- Django~=3.2
- django-activity-stream~=1.4
- django-axes==5.39.0
+ Django==4.1.5
+ django-activity-stream==1.4.2
+ django-axes==5.40.1
django-crispy-forms~=1.14
django-simple-history~=3.2
django-email-verification~=0.3.1
diff --cc wger/core/templates/language/overview.html
index 4eeb973df,fc9647cff..315b77519
--- a/wger/core/templates/language/overview.html
+++ b/wger/core/templates/language/overview.html
@@@ -7,20 -7,17 +7,17 @@@
{% block content %}
<div class="list-group">
{% for language in language_list %}
- <a href="{% url 'core:language:view' language.id %}" class="list-group-item">
- <span class="glyphicon glyphicon-chevron-right float-right"></span>
+ <a href="{% url 'core:language:view' language.id %}" class="list-group-item list-group-item-action">
+ <span class="glyphicon glyphicon-chevron-right float-end"></span>
- {% with 'images/icons/flag-'|add:language.short_name|add:'.svg' as flagname %}
- <img src="{% static flagname %}"
+ <img src="{% static language.static_path %}"
width="18"
alt="{% translate language.full_name %}"
- title="{% translate language.full_name %}"
- style="">
- {% endwith %}
+ title="{% translate language.full_name %}">
{{ language.full_name }}
</a>
- {% empty %}
+ {% empty %}
<a href="{% url 'core:language:add' %}" class="list-group-item">
- {% translate "Nothing found." %}<br>{% translate "Add one now." %}
+ {% translate "Nothing found." %}<br>{% translate "Add one now." %}
</a>
{% endfor %}
</div>