Roland Geider 56cdffb010 Merge branch 'master' into feature/gym-mode ...

# Conflicts:
#	integration_test/3_gym_mode.dart
#	ios/Podfile.lock
#	lib/screens/gym_mode.dart
#	pubspec.yaml

2025-12-02 12:35:32 +01:00

..

add_exercise_screen.dart

Make the app work better on wider screens

2025-12-01 13:44:25 +01:00

auth_screen.dart

Small cleanups and optimizations

2025-12-01 23:00:23 +01:00

configure_plates_screen.dart

Make the app work better on wider screens

2025-12-01 13:44:25 +01:00

dashboard.dart

Make the app work better on wider screens

2025-12-01 13:44:25 +01:00

exercise_screen.dart

Make the app work better on wider screens

2025-12-01 13:44:25 +01:00

exercises_screen.dart

Make the app work better on wider screens

2025-12-01 13:44:25 +01:00

form_screen.dart

Make the app work better on wider screens

2025-12-01 13:44:25 +01:00

gallery_screen.dart

Make the app work better on wider screens

2025-12-01 13:44:25 +01:00

gym_mode.dart

Merge branch 'master' into feature/gym-mode

2025-12-02 12:35:32 +01:00

home_tabs_screen.dart

Small cleanups and optimizations

2025-12-01 23:00:23 +01:00

log_meal_screen.dart

Properly handle timezones

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

log_meals_screen.dart

Formatting

2025-06-23 11:40:47 +02:00

measurement_categories_screen.dart

Make the app work better on wider screens

2025-12-01 13:44:25 +01:00

measurement_entries_screen.dart

Make the app work better on wider screens

2025-12-01 13:44:25 +01:00

nutritional_diary_screen.dart

Make the app work better on wider screens

2025-12-01 13:44:25 +01:00

nutritional_plan_screen.dart

Recreate generated files and reformat the repo

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

nutritional_plans_screen.dart

Make the app work better on wider screens

2025-12-01 13:44:25 +01:00

routine_edit_screen.dart

Make the app work better on wider screens

2025-12-01 13:44:25 +01:00

routine_list_screen.dart

Make the app work better on wider screens

2025-12-01 13:44:25 +01:00

routine_logs_screen.dart

Merge branch 'master' into feature/gym-mode

2025-12-02 12:35:32 +01:00

routine_screen.dart

Make the app work better on wider screens

2025-12-01 13:44:25 +01:00

splash_screen.dart

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

2024-06-20 15:55:28 +03:00

update_app_screen.dart

Refactor app version handling and update authentication flow

2025-03-28 17:22:36 +01:00

weight_screen.dart

Make the app work better on wider screens

2025-12-01 13:44:25 +01:00