Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' into feature/update-bootstrap-5.2
Roland Geider1b695c1696f1
diff --cc package.jsonindex 3a42d1fb2,4348eed9e..08ab2bc26--- a/package.json+++ b/package.json@@@ -17,9 -17,9 +17,9 @@@"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.8.2",+ "d3": "^7.8.3","datatables": "^1.10.18","devbridge-autocomplete": "^1.4.11","jquery": "^3.6.4",diff --cc requirements.txtindex 9c5134bd6,c6e05e993..edeb55068--- a/requirements.txt+++ b/requirements.txt@@@ -29,10 -30,9 +31,10 @@@ invoke==2.0.pillow==9.4.0reportlab==3.6.12requests==2.28.2- tzdata==2022.7+ tzdata==2023.2+# AWS#boto3diff --cc wger/core/templates/template.htmlindex 2ac68a4c6,a5293f338..e4d453593--- a/wger/core/templates/template.html+++ b/wger/core/templates/template.html@@@ -23,8 -23,10 +23,9 @@@<html lang="{{ language.short_name }}"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>+ <meta http-equiv="content-language" content="{{ i18n_language.code }}"><meta charset="utf-8">- <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">- <meta name="author" content="Roland Geider">+ <meta name="viewport" content="width=device-width, initial-scale=1"><!-- OpenGraph -->{% block opengraph %}diff --cc wger/settings_global.pyindex fea2af0a9,83b21ef04..dffd75a58--- a/wger/settings_global.py+++ b/wger/settings_global.py@@@ -78,7 -78,9 +78,9 @@@ INSTALLED_APPS =# Form renderer helper'crispy_forms',- 'crispy_bootstrap4',+ 'crispy_bootstrap5',+ # note: bs3 can be deleted when we solve https://github.com/wger-project/wger/issues/1127+ 'crispy_bootstrap3',# REST-API'rest_framework',