Roland Geider 0711e199da Merge branch 'master' into feature/exercise-crowdsourcing ...

# Conflicts:
#	lib/models/exercises/exercise.g.dart
#	pubspec.lock
#	pubspec.yaml
#	test/gallery/gallery_screen_test.mocks.dart
#	test/measurements/measurement_provider_test.mocks.dart
#	test/nutrition/nutritional_plan_form_test.mocks.dart
#	test/workout/workout_form_test.mocks.dart
#	test/workout/workout_set_form_test.mocks.dart

2022-07-01 09:47:52 +02:00

..

auth

Add workaround for the AndroidMetadata checks

2021-11-08 10:55:16 +01:00

exercises

Load English name of muscles as well

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

fixtures

Load English name of muscles as well

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

gallery

Automatic linting

2022-05-20 17:10:27 +00:00

measurements

Merge branch 'master' into feature/exercise-crowdsourcing

2022-07-01 09:47:52 +02:00

nutrition

Automatic linting

2022-05-20 17:10:27 +00:00

other

Merge branch 'master' into feature/exercise-crowdsourcing

2022-07-01 09:47:52 +02:00

user

Rework user profile endpoint handling

2022-05-12 19:13:56 +02:00

weight

Organize tests in own folders

2021-11-08 09:42:32 +01:00

workout

Automatic linting

2022-05-20 17:10:27 +00:00

utils.dart

Merge branch 'master' into feature/exercise-crowdsourcing

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