wger-project/wger
1
0
Fork 0
mirror of https://github.com/wger-project/wger.git synced 2026-02-19 07:50:55 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,463 Commits 19 Branches 20 Tags
8210c8656d1770ffdbc55b224f2a346df6bbdf28
Commit Graph

7463 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
dependabot[bot]
a640906802 Bump django-axes[ipware] from 6.4.0 to 6.5.0 
Bumps [django-axes[ipware]](https://github.com/jazzband/django-axes) from 6.4.0 to 6.5.0.
- [Release notes](https://github.com/jazzband/django-axes/releases)
- [Changelog](https://github.com/jazzband/django-axes/blob/master/CHANGES.rst)
- [Commits](https://github.com/jazzband/django-axes/compare/6.4.0...6.5.0)

---
updated-dependencies:
- dependency-name: django-axes[ipware]
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-06-14 23:13:00 +00:00
Roland Geider
e68afe7fc3 Cache the ingredient list view and increase count method (only postgres) 
While this caches the whole page and not parts of it (so things like the
currently logged user will be shown), this should get us some breathing room
while we find a permanent solution
 2024-06-14 12:36:52 +02:00
Roland Geider
eb14b3df4f Merge pull request #1686 from wger-project/dependabot/pip/django-simple-history-approx-eq-3.7 
Update django-simple-history requirement from ~=3.5 to ~=3.7
 2024-06-14 11:28:46 +02:00
Roland Geider
14f16abf54 Merge pull request #1691 from wger-project/dependabot/pip/ruff-0.4.8 
Bump ruff from 0.4.4 to 0.4.8
 2024-06-13 10:26:11 +02:00
Roland Geider
6c0f97aa19 Merge pull request #1695 from JLaField/master 
Fixed a typo
 2024-06-12 10:19:08 +02:00
JLaField
7a36ff164f Add JLaField to AUTHORS.rst 2024-06-11 23:20:27 -07:00
JLaField
d645493919 Fixed a typo 2024-06-11 22:49:59 -07:00
JLaField
4b5feaec34 Fixed a typo 2024-06-11 22:41:28 -07:00
dependabot[bot]
e08437d523 Update django-simple-history requirement from ~=3.5 to ~=3.7 
Updates the requirements on [django-simple-history](https://github.com/jazzband/django-simple-history) to permit the latest version.
- [Release notes](https://github.com/jazzband/django-simple-history/releases)
- [Changelog](https://github.com/jazzband/django-simple-history/blob/master/CHANGES.rst)
- [Commits](https://github.com/jazzband/django-simple-history/compare/3.5.0...3.7.0)

---
updated-dependencies:
- dependency-name: django-simple-history
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-06-07 13:45:17 +00:00
Roland Geider
e50ffea80a Merge pull request #1684 from wger-project/dependabot/pip/requests-2.32.3 
Bump requests from 2.32.0 to 2.32.3
 2024-06-07 15:44:58 +02:00
Roland Geider
bcc6bf5dd1 Also comment the pagination for now 2024-06-06 13:04:47 +02:00
Roland Geider
56d8f11c07 Move ingredient list to admin section 
This is (probably) causing a lot of traffic due to the different search bots
crawling the 2 million entries. If we replace this, we should add some form
of caching anyway
 2024-06-06 09:15:12 +02:00
dependabot[bot]
03a05a65b8 Bump ruff from 0.4.4 to 0.4.8 
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.4.4 to 0.4.8.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](https://github.com/astral-sh/ruff/compare/v0.4.4...v0.4.8)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-06-05 23:30:42 +00:00
Roland Geider
1599d86227 Fix string 2024-06-05 12:42:58 +02:00
Roland Geider
7d2165b6bf Also catch ValueErrors when extracting info from OFF 2024-06-05 11:39:53 +02:00
Roland Geider
a844397fbe Add language switch option for traditional chinese 2024-06-05 11:37:06 +02:00
Roland Geider
c0099fb34c Update frontend translations 2024-06-05 11:32:58 +02:00
Roland Geider
0f387a15b9 Catch ReadTimeout exception and set the timeout to 3 seconds 2024-06-05 11:32:28 +02:00
Yi-Han Hsiung
4e2d1ce1cb Translated using Weblate (Chinese (Simplified)) 
Currently translated at 80.5% (587 of 729 strings)

Translation: wger Workout Manager/Web App
Translate-URL: https://hosted.weblate.org/projects/wger/web/zh_Hans/
 2024-06-05 10:09:11 +02:00
Roland Geider
0e713d627d The same procedure as last year, Miss Sophie? 
Same procedure as every year, James.
 2024-05-31 18:04:24 +02:00
Roland Geider
0457a8c980 Fix tests 2024-05-31 07:29:07 +02:00
Roland Geider
1336947b89 Merge pull request #1606 from wger-project/dependabot/npm_and_yarn/d3-7.9.0 
Bump d3 from 7.8.5 to 7.9.0
 2024-05-30 21:55:42 +02:00
Github-actions
e612f2d0bb Automatic linting 2024-05-30 19:29:51 +00:00
Roland Geider
7e6b91e059 Remove NutritionSitemap for now 
This doesn't really work with 2 million entries and causes memory and timeout errors,
but there might be some way to add pagination or such
 2024-05-30 21:29:31 +02:00
Roland Geider
b62be5025c Get rid of "fields min_value in DecimalField should be Decimal type" error 2024-05-30 21:29:31 +02:00
Roland Geider
92f1618dce Move django-extensions to requirements_dev.txt 2024-05-30 21:29:31 +02:00
Roland Geider
83e4d8cb10 Merge pull request #1634 from wger-project/dependabot/pip/gunicorn-22.0.0 
Bump gunicorn from 21.2 to 22.0.0
 2024-05-30 20:56:11 +02:00