Roland Geider eedc249cea Merge branch 'master' into feature/powersync-test ...

# Conflicts:
#	lib/models/body_weight/weight_entry.dart
#	lib/models/body_weight/weight_entry.g.dart
#	lib/models/workouts/log.dart
#	lib/models/workouts/log.g.dart
#	lib/models/workouts/session.g.dart
#	pubspec.lock
#	pubspec.yaml
#	test/exercises/contribute_exercise_image_test.mocks.dart
#	test/exercises/contribute_exercise_test.dart
#	test/exercises/contribute_exercise_test.mocks.dart
#	test/nutrition/nutritional_meal_form_test.mocks.dart
#	test/nutrition/nutritional_plan_form_test.mocks.dart
#	test/weight/weight_model_test.dart
#	test/weight/weight_provider_test.dart
#	test_data/body_weight.dart

2025-11-25 21:23:22 +01:00

..

body_weight.dart

Merge branch 'master' into feature/powersync-test

2025-11-25 21:23:22 +01:00

exercises.dart

Remove the json serializable decorators, not needed anymore

2025-10-26 00:23:38 +02:00

gallery.dart

dcm fix --only-rules=prefer-trailing-comma lib test test_data integration_test

2024-09-18 16:00:43 +03:00

measurements.dart

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

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

nutritional_plans.dart

fix tests

2025-06-28 17:02:22 +02:00

profile.dart

Use the user's preferred unit for body weight

2024-01-23 16:33:32 +01:00

routines.dart

Cleanup some of the models

2025-11-08 23:07:40 +01:00

screenshots_exercises.dart

dcm fix --only-rules=unnecessary-trailing-comma lib test test_data

2024-09-18 16:01:10 +03:00