Roland Geider 3c749855d5 Merge branch 'master' into feature/nutrition-goals ...

# Conflicts:
#	lib/models/exercises/exercise.g.dart
#	lib/models/user/profile.g.dart
#	test/gallery/gallery_form_test.mocks.dart
#	test/gallery/gallery_screen_test.mocks.dart
#	test/measurements/measurement_provider_test.mocks.dart
#	test/nutrition/nutritional_plan_screen_test.mocks.dart
#	test/nutrition/nutritional_plans_screen_test.mocks.dart
#	test/user/provider_test.mocks.dart
#	test/weight/weight_provider_test.mocks.dart
#	test/workout/gym_mode_screen_test.mocks.dart
#	test/workout/workout_plan_screen_test.mocks.dart
#	test/workout/workout_plans_screen_test.mocks.dart
#	test/workout/workout_provider_test.mocks.dart
#	test/workout/workout_set_form_test.mocks.dart

2024-02-01 14:16:53 +01:00

..

alias.dart

fix(drift): built a model for exercise and fixes in fromSql type converter

2023-12-23 14:28:38 +05:30

alias.g.dart

fix(drift): built a model for exercise and fixes in fromSql type converter

2023-12-23 14:28:38 +05:30

category.dart

Run "dart format --line-length=100 ." to make the diff smaller

2023-12-23 16:40:05 +01:00

category.g.dart

Run "dart format --line-length=100 ." to make the diff smaller

2023-12-23 16:40:05 +01:00

comment.dart

Run "dart format --line-length=100 ." to make the diff smaller

2023-12-23 16:40:05 +01:00

comment.g.dart

fix(drift): built a model for exercise and fixes in fromSql type converter

2023-12-23 14:28:38 +05:30

equipment.dart

Run "dart format --line-length=100 ." to make the diff smaller

2023-12-23 16:40:05 +01:00

equipment.g.dart

Upgrade dependencies and recreate generated files

2021-11-10 15:16:25 +01:00

exercise_api.dart

Fixes for flutter typeahead 5.1.0

2024-01-29 12:07:26 +01:00

exercise_api.freezed.dart

Fixes for flutter typeahead 5.1.0

2024-01-29 12:07:26 +01:00

exercise_api.g.dart

Fixes for flutter typeahead 5.1.0

2024-01-29 12:07:26 +01:00

exercise.dart

Simplify generating translation objects

2023-12-30 17:55:52 +01:00

exercise.g.dart

Rename further occurrences of "exercise base" to just "exercise"

2023-12-26 21:38:07 +01:00

image.dart

Run "dart format --line-length=100 ." to make the diff smaller

2023-12-23 16:40:05 +01:00

image.g.dart

Run "dart format --line-length=100 ." to make the diff smaller

2023-12-23 16:40:05 +01:00

ingredient_api.dart

Fixes for flutter typeahead 5.1.0

2024-01-29 12:07:26 +01:00

ingredient_api.freezed.dart

Fixes for flutter typeahead 5.1.0

2024-01-29 12:07:26 +01:00

ingredient_api.g.dart

Fixes for flutter typeahead 5.1.0

2024-01-29 12:07:26 +01:00

language.dart

Run "dart format --line-length=100 ." to make the diff smaller

2023-12-23 16:40:05 +01:00

language.g.dart

Recreate generated files

2022-01-15 13:05:35 +01:00

muscle.dart

Rework exercise database

2023-12-26 17:03:20 +01:00

muscle.g.dart

Load English name of muscles as well

2022-06-21 12:40:33 +02:00

translation.dart

Further tweaking exercise cache handling

2023-12-28 17:48:15 +01:00

translation.g.dart

Merge branch 'master' into feature/nutrition-goals

2024-02-01 14:16:53 +01:00

variation.dart

Run "dart format --line-length=100 ." to make the diff smaller

2023-12-23 16:40:05 +01:00

variation.g.dart

Recreate generated files

2022-01-15 13:05:35 +01:00

video.dart

Add video player widget for exercise details

2022-01-29 12:43:50 +01:00

video.g.dart

Add video player widget for exercise details

2022-01-29 12:43:50 +01:00