Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' into feature/update-bootstrap-5.2
Roland Geiderc77a97f74dd0
diff --cc .github/workflows/ci.ymlindex bfa555d8e,ee5ee4f3d..29a6cc90d--- a/.github/workflows/ci.yml+++ b/.github/workflows/ci.yml@@@ -21,6 -21,6 +21,15 @@@ jobssteps:- uses: actions/checkout@v3++++ - name: Cache dependencies++ uses: actions/[email protected]++ with:++ path: ~/.cache/pip++ key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}++ restore-keys: |++ ${{ runner.os }}-pip-++- name: Set up Python ${{ matrix.python-version }}uses: actions/setup-python@v4with:diff --cc package.jsonindex 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.txtindex 786992768,bc8ba82de..9e8326110--- a/requirements.txt+++ b/requirements.txt@@@ -3,14 -3,16 +3,17 @@@## Application- bleach[css]~=5.0+ bleach[css]~=6.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.0django-formtools~=2.4django-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.1django-crispy-forms~=1.14django-simple-history~=3.2django-email-verification~=0.3.1