Roland Geider 7bb9ac28fd Merge branch 'master' into feature/ingredient-images ...

# Conflicts:
#	lib/main.dart
#	lib/models/exercises/exercise.g.dart
#	lib/widgets/core/core.dart
#	pubspec.lock
#	test/gallery/gallery_screen_test.mocks.dart
#	test/measurements/measurement_categories_screen_test.mocks.dart
#	test/measurements/measurement_provider_test.mocks.dart
#	test/nutrition/nutritional_plan_form_test.mocks.dart
#	test/other/base_provider_test.mocks.dart
#	test/workout/workout_form_test.mocks.dart
#	test/workout/workout_set_form_test.mocks.dart

2023-02-08 12:48:00 +01:00

..

auth

Improved Login Interface #264

2022-10-20 23:32:31 +05:30

exercises

Refactor add_exercise_screen.dart

2023-02-07 20:30:09 +01:00

fixtures

Merge branch 'master' into feature/ingredient-images

2023-02-08 12:48:00 +01:00

gallery

Automatic linting

2023-02-06 19:35:13 +00:00

measurements

Automatic linting

2023-02-06 19:35:13 +00:00

nutrition

Merge branch 'master' into feature/ingredient-images

2023-02-08 12:48:00 +01:00

other

Automatic linting

2023-02-06 19:35:13 +00:00

user

Refactor add_exercise_screen.dart

2023-02-07 20:30:09 +01:00

weight

Add paginated fetches

2023-02-06 20:33:39 +01:00

workout

Refactor add_exercise_screen.dart

2023-02-07 20:30:09 +01:00

utils.dart

Merge branch 'master' into feature/exercise-crowdsourcing

2022-01-15 12:58:02 +01:00