Roland Geider
|
badc3257d0
|
Merge branch 'master' into feature/exercise-crowdsourcing
# Conflicts:
# assets/images/muscles/back.svg
# assets/images/muscles/main/muscle-1.svg
# assets/images/muscles/main/muscle-10.svg
# assets/images/muscles/main/muscle-11.svg
# assets/images/muscles/main/muscle-12.svg
# assets/images/muscles/main/muscle-13.svg
# assets/images/muscles/main/muscle-14.svg
# assets/images/muscles/main/muscle-15.svg
# assets/images/muscles/main/muscle-16.svg
# assets/images/muscles/main/muscle-2.svg
# assets/images/muscles/main/muscle-3.svg
# assets/images/muscles/main/muscle-4.svg
# assets/images/muscles/main/muscle-5.svg
# assets/images/muscles/main/muscle-6.svg
# assets/images/muscles/main/muscle-7.svg
# assets/images/muscles/main/muscle-8.svg
# assets/images/muscles/main/muscle-9.svg
# assets/images/muscles/secondary/muscle-1.svg
# assets/images/muscles/secondary/muscle-10.svg
# assets/images/muscles/secondary/muscle-11.svg
# assets/images/muscles/secondary/muscle-12.svg
# assets/images/muscles/secondary/muscle-13.svg
# assets/images/muscles/secondary/muscle-14.svg
# assets/images/muscles/secondary/muscle-15.svg
# assets/images/muscles/secondary/muscle-16.svg
# assets/images/muscles/secondary/muscle-2.svg
# assets/images/muscles/secondary/muscle-3.svg
# assets/images/muscles/secondary/muscle-4.svg
# assets/images/muscles/secondary/muscle-5.svg
# assets/images/muscles/secondary/muscle-6.svg
# assets/images/muscles/secondary/muscle-7.svg
# assets/images/muscles/secondary/muscle-8.svg
# assets/images/muscles/secondary/muscle-9.svg
# lib/helpers/consts.dart
# lib/l10n/app_en.arb
# lib/models/exercises/exercise.dart
# lib/models/exercises/exercise.g.dart
# lib/providers/exercises.dart
# lib/widgets/exercises/exercises.dart
# pubspec.lock
# pubspec.yaml
# test/exercises/exercises_detail_widget_test.dart
# test/nutrition/nutritional_plan_form_test.mocks.dart
# test/workout/workout_set_form_test.mocks.dart
|
2022-02-19 22:07:47 +01:00 |
|
Roland Geider
|
d78fa35de8
|
Filter by exercise bases in overview
|
2022-02-02 19:12:01 +01:00 |
|
Adrian Halko
|
3b8aaf99d5
|
Added forgotten nutritional_plans.dart which contains changed ingredients with codes.
|
2021-12-01 10:36:48 +01:00 |
|
Roland Geider
|
025c9393cd
|
Merge branch 'master' into feature/exercise-crowdsourcing
# Conflicts:
# test/base_provider_test.mocks.dart
# test/gallery_screen_test.mocks.dart
# test/measurements/measurement_categories_screen_test.mocks.dart
# test/measurements/measurement_provider_test.mocks.dart
# test/nutritional_plan_form_test.mocks.dart
# test/workout_form_test.mocks.dart
# test/workout_set_form_test.mocks.dart
|
2021-11-03 20:28:06 +01:00 |
|
Github-actions
|
a2ae840c62
|
Automatic linting
|
2021-10-23 13:46:41 +00:00 |
|
Roland Geider
|
6a19a0697e
|
Merge pull request #105 from sandimilohanic/master
add reference from log to meal
|
2021-10-23 15:44:52 +02:00 |
|
Sandi Milohanić
|
364b37c106
|
Correction reference mealId in log
|
2021-10-23 07:37:14 +02:00 |
|
Roland Geider
|
2d8d864f27
|
Merge branch 'master' into feature/exercise-crowdsourcing
# Conflicts:
# lib/main.dart
# lib/models/exercises/exercise.dart
# lib/providers/exercises.dart
# lib/providers/nutrition.dart
# lib/widgets/exercises/exercises.dart
# lib/widgets/workouts/forms.dart
# lib/widgets/workouts/gym_mode.dart
# pubspec.lock
# test/base_provider_test.mocks.dart
# test/gallery_screen_test.mocks.dart
# test/gym_mode_screen_test.dart
# test/measurements/measurement_categories_screen_test.mocks.dart
# test/measurements/measurement_provider_test.mocks.dart
# test/nutritional_plan_form_test.mocks.dart
# test/workout_form_test.mocks.dart
# test/workout_set_form_test.dart
# test/workout_set_form_test.mocks.dart
|
2021-10-16 12:40:01 +02:00 |
|
Marvin M
|
9d479e89b0
|
const_constructors
info: Prefer const with constant constructors. prefer_const_constructors
|
2021-10-07 20:40:09 +02:00 |
|
Roland Geider
|
dae1e39ea7
|
Merge pull request #89 from ThilinaTCH/master
Allow user to give meals a description #70
|
2021-10-03 21:54:27 +02:00 |
|
Thilina Herath
|
7da45e93f7
|
test: update meal tests to include name property
|
2021-10-03 11:19:08 +08:00 |
|
Marvin M
|
45a2a5f857
|
Fixes pt 1
|
2021-10-01 17:18:17 +02:00 |
|
Yair Chen
|
b11fcda216
|
create unit tests fro findByFilters and generate mocks
|
2021-09-15 16:46:04 +03:00 |
|
Roland Geider
|
e62b03e8a8
|
Further work on reworking the exercise provider
|
2021-09-13 20:52:08 +02:00 |
|
Roland Geider
|
0462e41b20
|
Expand test for nutrition diary detail view
|
2021-08-17 11:45:52 +02:00 |
|
Roland Geider
|
c191b3e27e
|
Wrap detail diary widget in a card
This is needed because the icon button needs a parent that is a Material widget
|
2021-08-17 11:24:34 +02:00 |
|
Roland Geider
|
6646640b9c
|
Show set notes on the workout and the gym mode
https://github.com/wger-project/wger/issues/702
|
2021-07-17 13:25:04 +02:00 |
|
Roland Geider
|
b13a9472e7
|
Correctly set the category for test exercises...
|
2021-07-08 18:25:23 +02:00 |
|
Github-actions
|
c877e436b0
|
Automatic linting
|
2021-06-22 21:10:15 +00:00 |
|
Github-actions
|
7492b53c67
|
Automatic linting
|
2021-06-20 13:09:24 +00:00 |
|
Roland Geider
|
70e0620fe1
|
Don't make the +/- buttons part of the input field
This only makes the field focused which makes the keyboard appear, which is
exactly what we want to avoid when using the shortcuts
|
2021-06-15 16:30:12 +02:00 |
|
Roland Geider
|
123f64d0eb
|
Add some tests for the picture gallery
|
2021-05-11 13:18:20 +02:00 |
|
Roland Geider
|
6ab3e26db4
|
Rename workout description to name
|
2021-05-06 13:18:32 +02:00 |
|
Roland Geider
|
90c1f3c3b6
|
Add simple test for exercise detail widget
|
2021-04-28 10:45:31 +02:00 |
|
Roland Geider
|
f67cb1797b
|
Calculates reps for a set locally
This saves us unneeded round trips to the server
See #14
|
2021-04-24 13:58:14 +02:00 |
|
Roland Geider
|
8c31f2ef09
|
Add more tests
|
2021-04-21 22:05:50 +02:00 |
|
Roland Geider
|
5051c28c40
|
Test that old logs are shown in the gym mode
|
2021-04-19 16:31:57 +02:00 |
|
Roland Geider
|
7e2ba3468d
|
Show past logs in gym mode
See #13
|
2021-04-15 13:28:12 +02:00 |
|
Roland Geider
|
9988807c25
|
Move data to test data folder
|
2021-04-15 11:05:35 +02:00 |
|
Roland Geider
|
d2a7733703
|
Add simple widget test for gym mode screen
|
2021-04-14 20:28:49 +02:00 |
|