wger-project/wger
1
0
Fork 0
mirror of https://github.com/wger-project/wger.git synced 2026-02-18 00:17:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,526 Commits 19 Branches 20 Tags
e7d4ffc2161c86ace77ea9d84fa7df60737cc162
Commit Graph

7526 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roland Geider
e7d4ffc216 Rename exercisebase model to exercise 2024-07-08 19:14:06 +02:00
Roland Geider
385df1d64f Rename exercise model to translation 2024-07-08 18:16:46 +02:00
Roland Geider
a0c5d300c4 Merge branch 'refs/heads/master' into feature/flexible-routines 
# Conflicts:
#	wger/utils/constants.py
 2024-07-08 12:05:30 +02:00
Roland Geider
3d5320e707 Merge pull request #1712 from wger-project/dependabot/github_actions/docker/setup-qemu-action-3.1.0 
Bump docker/setup-qemu-action from 3.0.0 to 3.1.0
 2024-07-07 11:35:58 +02:00
Github-actions
5eb44c3ed3 Automatic linting 2024-07-07 08:37:34 +00:00
Roland Geider
0049de342a Merge pull request #1687 from wger-project/feature/language-filter 
Allow deactivating the language filter when searching for ingredients and exercises
 2024-07-07 10:37:19 +02:00
Github-actions
06e9b99e6b Automatic linting 2024-07-07 08:31:53 +00:00
Roland Geider
f49f81b3a1 Fix test 2024-07-07 10:27:53 +02:00
Roland Geider
49f2caf8d9 Use the date and user information from the session 
This will need to be cleaned up a bit more in the future since there's still
redundant information
 2024-07-07 10:11:49 +02:00
Roland Geider
8210c8656d Merge branch 'refs/heads/master' into feature/language-filter 
# Conflicts:
#	wger/nutrition/api/views.py
#	wger/nutrition/tests/test_ingredient_overview.py
 2024-07-06 17:58:12 +02:00
Roland Geider
cc8a5528c2 Default to not using captcha 2024-07-06 17:57:00 +02:00
Roland Geider
8dec6b1352 Move back the ingredient overview, seems to be ok 2024-07-06 17:57:00 +02:00
Roland Geider
b5e3fe379c Merge pull request #1710 from wger-project/dependabot/pip/faker-26.0.0 
Bump faker from 25.2.0 to 26.0.0
 2024-07-06 17:56:13 +02:00
Roland Geider
00653c55da Merge pull request #1717 from wger-project/dependabot/pip/icalendar-5.0.13 
Bump icalendar from 5.0.12 to 5.0.13
 2024-07-06 12:10:57 +02:00
dependabot[bot]
2a4b63debd Bump icalendar from 5.0.12 to 5.0.13 
Bumps [icalendar](https://github.com/collective/icalendar) from 5.0.12 to 5.0.13.
- [Release notes](https://github.com/collective/icalendar/releases)
- [Changelog](https://github.com/collective/icalendar/blob/main/CHANGES.rst)
- [Commits](https://github.com/collective/icalendar/compare/v5.0.12...v5.0.13)

---
updated-dependencies:
- dependency-name: icalendar
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-07-05 23:15:54 +00:00
dependabot[bot]
96ff866513 Bump faker from 25.2.0 to 26.0.0 
Bumps [faker](https://github.com/joke2k/faker) from 25.2.0 to 26.0.0.
- [Release notes](https://github.com/joke2k/faker/releases)
- [Changelog](https://github.com/joke2k/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/joke2k/faker/compare/v25.2.0...v26.0.0)

---
updated-dependencies:
- dependency-name: faker
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-07-05 12:33:32 +00:00
Roland Geider
dc9009e8e2 Merge pull request #1716 from wger-project/dependabot/pip/django-debug-toolbar-4.4.3 
Bump django-debug-toolbar from 4.3.0 to 4.4.3
 2024-07-05 14:31:15 +02:00
dependabot[bot]
396ede6780 Bump django-debug-toolbar from 4.3.0 to 4.4.3 
Bumps [django-debug-toolbar](https://github.com/jazzband/django-debug-toolbar) from 4.3.0 to 4.4.3.
- [Release notes](https://github.com/jazzband/django-debug-toolbar/releases)
- [Changelog](https://github.com/jazzband/django-debug-toolbar/blob/main/docs/changes.rst)
- [Commits](https://github.com/jazzband/django-debug-toolbar/compare/4.3...4.4.3)

---
updated-dependencies:
- dependency-name: django-debug-toolbar
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-07-04 23:44:05 +00:00
Roland Geider
bb99d6ec5f Also expose other ingredient source information over the API 2024-07-04 15:23:44 +02:00
Roland Geider
1af701b476 Allow need_log_to_apply to be nullable as well 2024-07-04 15:18:04 +02:00
florent4014
5b93fe844d Translated using Weblate (French) 
Currently translated at 93.4% (681 of 729 strings)

Translation: wger Workout Manager/Web App
Translate-URL: https://hosted.weblate.org/projects/wger/web/fr/
 2024-07-04 08:09:20 +00:00
dependabot[bot]
2ab58cc1f3 Bump docker/setup-qemu-action from 3.0.0 to 3.1.0 
Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/docker/setup-qemu-action/releases)
- [Commits](https://github.com/docker/setup-qemu-action/compare/v3.0.0...v3.1.0)

---
updated-dependencies:
- dependency-name: docker/setup-qemu-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-07-03 23:03:24 +00:00
Roland Geider
9d07f2969f Merge pull request #1708 from wger-project/dependabot/pip/djangorestframework-3.15.2 
Bump djangorestframework from 3.15.1 to 3.15.2
 2024-06-30 15:31:07 +02:00
Roland Geider
4005375bc1 Expose remaining clot config objects over the API 2024-06-27 23:24:05 +02:00
Github-actions
deb47e09ea Automatic linting 2024-06-27 14:33:41 +00:00
Roland Geider
ac327b6e3f Disallow api for web crawlers 2024-06-27 16:33:20 +02:00
Roland Geider
fa1b7124fc Use correct cache key 2024-06-27 16:30:15 +02:00
Roland Geider
a8e94a5a80 Expose the logs for the routine 2024-06-26 19:28:10 +02:00
dependabot[bot]
b07f8d7a42 Bump djangorestframework from 3.15.1 to 3.15.2 
Bumps [djangorestframework](https://github.com/encode/django-rest-framework) from 3.15.1 to 3.15.2.
- [Release notes](https://github.com/encode/django-rest-framework/releases)
- [Commits](https://github.com/encode/django-rest-framework/compare/3.15.1...3.15.2)

---
updated-dependencies:
- dependency-name: djangorestframework
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-06-25 23:49:57 +00:00
Roland Geider
1cd27e06bd Small improvements to the text representation of the slot 2024-06-25 23:22:22 +02:00
Roland Geider
d38aa1f822 Merge pull request #1706 from wger-project/dependabot/pip/coverage-7.5.4 
Bump coverage from 7.5.1 to 7.5.4
 2024-06-25 22:21:16 +02:00
Roland Geider
ca93342f0f Merge pull request #1699 from wger-project/dependabot/github_actions/docker/build-push-action-6 
Bump docker/build-push-action from 5 to 6
 2024-06-25 17:38:16 +02:00
dependabot[bot]
bcd209d648 Bump coverage from 7.5.1 to 7.5.4 
Bumps [coverage](https://github.com/nedbat/coveragepy) from 7.5.1 to 7.5.4.
- [Release notes](https://github.com/nedbat/coveragepy/releases)
- [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst)
- [Commits](https://github.com/nedbat/coveragepy/compare/7.5.1...7.5.4)

---
updated-dependencies:
- dependency-name: coverage
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-06-24 23:58:25 +00:00
Roland Geider
7795c6e747 Add endpoint that returns the day data for a complete iteration 2024-06-21 16:13:38 +02:00
Roland Geider
0b1f82d506 Finally rename DayNg to just Day 2024-06-21 14:51:47 +02:00
Roland Geider
1454d4a0bf Remove unused views 2024-06-21 13:52:50 +02:00
Roland Geider
0e19fdf6a4 Fix migration 2024-06-21 13:27:17 +02:00
Roland Geider
d67c206459 Remove more old workout models 2024-06-21 13:27:04 +02:00
Roland Geider
728364dd73 Start removing the old workout models 2024-06-21 09:25:13 +02:00
Roland Geider
c4c6563357 Remove trigger field 
This wasn't being used
 2024-06-20 15:56:26 +02:00
Roland Geider
039346ffc4 Consistently name functions 2024-06-20 15:41:32 +02:00
Roland Geider
9d804f437c Add RiR to RPE conversion 2024-06-20 12:06:12 +02:00
Roland Geider
d8eba56f29 Add some tests for the gym and display modes 2024-06-20 10:48:50 +02:00
Roland Geider
d78d9d069a Improve workout day output 
This makes it easier to show a more compact representation in overviews,
templates, etc. The version for the gym mode with each set (specially in
supersets) is available from a different endpoint
 2024-06-19 21:46:33 +02:00
Roland Geider
03c8dc36b6 Don't use an em dash to separate the sets 
This is too similar to the regular dash used for ranges
 2024-06-19 20:20:53 +02:00
Roland Geider
bea884c251 Add the possibility to configure ranges for weight, reps and rest time 2024-06-19 17:43:03 +02:00
Roland Geider
0e499039cc Merge pull request #1700 from wger-project/dependabot/pip/django-compressor-approx-eq-4.5 
Update django-compressor requirement from ~=4.4 to ~=4.5
 2024-06-19 14:57:15 +02:00
dependabot[bot]
ddbec8134f Update django-compressor requirement from ~=4.4 to ~=4.5 
Updates the requirements on [django-compressor](https://github.com/django-compressor/django-compressor) to permit the latest version.
- [Changelog](https://github.com/django-compressor/django-compressor/blob/develop/docs/changelog.txt)
- [Commits](https://github.com/django-compressor/django-compressor/compare/4.4...4.5)

---
updated-dependencies:
- dependency-name: django-compressor
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-06-18 23:37:51 +00:00
Roland Geider
8996f9c668 Merge pull request #1698 from wger-project/dependabot/pip/django-axes-ipware--6.5.0 
Bump django-axes[ipware] from 6.4.0 to 6.5.0
 2024-06-18 18:02:49 +02:00
dependabot[bot]
ae9f32dc55 Bump docker/build-push-action from 5 to 6 
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5 to 6.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v5...v6)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-06-17 23:47:54 +00:00