Roland Geider 9f66815e10 Merge branch 'master' into feature/gym-mode ...

# Conflicts:
#	lib/widgets/routines/gym_mode/navigation.dart
#	pubspec.lock
#	test/exercises/contribute_exercise_image_test.mocks.dart
#	test/exercises/contribute_exercise_test.mocks.dart
#	test/nutrition/nutritional_meal_form_test.mocks.dart
#	test/nutrition/nutritional_plan_form_test.mocks.dart

2025-11-19 19:18:45 +01:00

..

ingredient_image_thumbnails.dart

Use correct json key names

2025-09-24 12:26:41 +02:00

ingredient_image_thumbnails.g.dart

Move to riverpod three

2025-11-11 13:22:18 +01:00

ingredient_image.dart

Use the regular ingredient endpoint, instead of the special search one

2025-09-24 01:35:03 +02:00

ingredient_image.g.dart

Add generated files

2025-10-08 12:45:37 +02:00

ingredient_weight_unit.dart

dcm fix --only-rules=prefer-declaring-const-constructor lib

2024-06-07 14:59:00 +03:00

ingredient_weight_unit.g.dart

Move to riverpod three

2025-11-11 13:22:18 +01:00

ingredient.dart

Use the regular ingredient endpoint, instead of the special search one

2025-09-24 01:35:03 +02:00

ingredient.g.dart

Move to riverpod three

2025-11-11 13:22:18 +01:00

log.dart

Properly handle timezones

2025-11-18 16:30:52 +01:00

log.g.dart

Properly handle timezones

2025-11-18 16:30:52 +01:00

meal_item.dart

Merge pull request #593 from wger-project/log-fractional-meals

2024-05-29 11:20:47 +02:00

meal_item.g.dart

Add generated files

2025-10-08 12:45:37 +02:00

meal.dart

Better handling of time zones

2025-05-26 11:13:53 +02:00

meal.g.dart

Add generated files

2025-10-08 12:45:37 +02:00

nutritional_goals.dart

Recreate generated files and reformat the repo

2025-10-09 17:39:02 +02:00

nutritional_plan.dart

Properly handle timezones

2025-11-18 16:30:52 +01:00

nutritional_plan.g.dart

Properly handle timezones

2025-11-18 16:30:52 +01:00

nutritional_values.dart

Recreate generated files and reformat the repo

2025-10-09 17:39:02 +02:00

weight_unit.dart

dcm fix --only-rules=prefer-declaring-const-constructor lib

2024-06-07 14:59:00 +03:00

weight_unit.g.dart

Recreate generated files and reformat the repo

2025-10-09 17:39:02 +02:00