Commit Graph

1703 Commits

Author SHA1 Message Date
Malay Pandit
b431d4f100 creating a secondary graph for energy value 2023-04-17 02:53:28 +05:30
Roland Geider
8460d2fc0f Merge pull request #367 from 12people/master
Linux/macOS support
2023-04-15 12:20:52 +02:00
Roland Geider
bf7e2e8956 Move platform check to helper
Also, use TargetPlatform since it it better suited for tests (and seems to
be now the recommended way of checking this for UI elements)
2023-04-15 12:17:08 +02:00
Roland Geider
e377db76fa Explicitly return null 2023-04-15 11:32:44 +02:00
Ivan Katkov
31f840d586 Translated using Weblate (Russian)
Currently translated at 70.7% (157 of 222 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/ru/
2023-04-14 11:52:55 +02:00
Github-actions
9933f84d18 Bump version to 1.5.4+31 1.5.4 2023-04-09 10:57:13 +00:00
Roland Geider
2d7e35c0db Fix JSON response 2023-04-09 12:03:24 +02:00
Roland Geider
0c7b80137e Link to ingredient product 2023-04-09 12:00:13 +02:00
Roland Geider
d79645a6f5 The ingredient ID is an integer, not a string 2023-04-09 11:40:40 +02:00
Roland Geider
525fc8efd3 Fix typo 2023-04-09 11:29:55 +02:00
Roland Geider
fe957e4981 Fix variable name 2023-04-09 11:15:35 +02:00
Github-actions
f82ab0793e Automatic linting 2023-04-09 08:59:27 +00:00
Roland Geider
f7ac8b716b Merge branch 'master' into 12people-master
# Conflicts:
#	lib/widgets/nutrition/widgets.dart
#	pubspec.lock
2023-04-09 10:57:43 +02:00
Roland Geider
9cf5725e94 Update pubspec.lock 2023-04-09 10:55:38 +02:00
Github-actions
d241d7afe1 Automatic linting 2023-04-08 21:51:26 +00:00
Roland Geider
f220ea5305 Merge pull request #214 from wger-project/feature/ingredient-images
Add ingredient images
2023-04-08 23:49:39 +02:00
Roland Geider
65dd284f8f Fix test 2023-04-08 23:44:47 +02:00
Roland Geider
e7a9c0f41e Merge pull request #371 from wger-project/dependabot/pub/shared_preferences-2.1.0
Bump shared_preferences from 2.0.20 to 2.1.0
2023-04-08 23:37:06 +02:00
Javier
41b18b7ae1 Translated using Weblate (Spanish)
Currently translated at 100.0% (222 of 222 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/es/
2023-04-05 00:39:00 +02:00
facu-d
c07d208d6b Translated using Weblate (Spanish)
Currently translated at 99.5% (221 of 222 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/es/
2023-04-03 19:38:30 +02:00
Roland Geider
01048b092e Merge pull request #370 from wger-project/dependabot/pub/cider-0.1.5
Bump cider from 0.1.4 to 0.1.5
2023-04-03 09:58:00 +02:00
Roland Geider
135b016787 Merge pull request #372 from wger-project/dependabot/pub/mockito-5.4.0
Bump mockito from 5.3.2 to 5.4.0
2023-04-03 09:57:47 +02:00
dependabot[bot]
f0b9d24dcd Bump mockito from 5.3.2 to 5.4.0
Bumps [mockito](https://github.com/dart-lang/mockito) from 5.3.2 to 5.4.0.
- [Release notes](https://github.com/dart-lang/mockito/releases)
- [Changelog](https://github.com/dart-lang/mockito/blob/master/CHANGELOG.md)
- [Commits](https://github.com/dart-lang/mockito/compare/5.3.2...5.4.0)

---
updated-dependencies:
- dependency-name: mockito
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-03 01:28:12 +00:00
dependabot[bot]
7113ba67a5 Bump shared_preferences from 2.0.20 to 2.1.0
Bumps [shared_preferences](https://github.com/flutter/packages/tree/main/packages/shared_preferences) from 2.0.20 to 2.1.0.
- [Release notes](https://github.com/flutter/packages/releases)
- [Commits](https://github.com/flutter/packages/commits/shared_preferences-v2.1.0/packages/shared_preferences)

---
updated-dependencies:
- dependency-name: shared_preferences
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-03 01:27:50 +00:00
dependabot[bot]
46239345f4 Bump cider from 0.1.4 to 0.1.5
Bumps [cider](https://github.com/f3ath/cider) from 0.1.4 to 0.1.5.
- [Release notes](https://github.com/f3ath/cider/releases)
- [Changelog](https://github.com/f3ath/cider/blob/master/CHANGELOG.md)
- [Commits](https://github.com/f3ath/cider/compare/0.1.4...0.1.5)

---
updated-dependencies:
- dependency-name: cider
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-03 01:27:25 +00:00
Roland Geider
edd86f7e0e Merge pull request #368 from wger-project/dependabot/pub/shared_preferences-2.0.20
Bump shared_preferences from 2.0.18 to 2.0.20
2023-03-27 14:11:44 +02:00
dependabot[bot]
7b1ddaf0d7 Bump shared_preferences from 2.0.18 to 2.0.20
Bumps [shared_preferences](https://github.com/flutter/packages/tree/main/packages/shared_preferences) from 2.0.18 to 2.0.20.
- [Release notes](https://github.com/flutter/packages/releases)
- [Commits](https://github.com/flutter/packages/commits/shared_preferences-v2.0.20/packages/shared_preferences)

---
updated-dependencies:
- dependency-name: shared_preferences
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-27 01:30:32 +00:00
Github-actions
00c7f27e0c Automatic linting 2023-03-23 22:28:32 +00:00
Mirek Mazel
e0d7894771 Flatpak generator: fix for XML version list 2023-03-23 23:27:04 +01:00
Github-actions
47fa743b4a Automatic linting 2023-03-23 13:46:57 +00:00
Mirek Mazel
da485ecab2 Removing "todo" comments 2023-03-23 14:45:32 +01:00
Mirek Mazel
9ad8d809a0 Merge pull request #1 from 12people/patch-1
Fixing bug #293
2023-03-22 17:30:38 +01:00
Mirek Mazel
f7f3072352 Fixing bug #293 2023-03-22 17:29:22 +01:00
Mirek Mazel
e2e8884c6a Adding myself to AUTHORS.md 2023-03-22 17:00:54 +01:00
Mirek Mazel
b86fdfe696 Appdata changed to pass "appstream-glib validate" 2023-03-22 15:39:00 +01:00
Miroslav Mazel
4e6643bd3c Resources for Flatpak generation 2023-03-22 13:50:46 +01:00
Miroslav Mazel
1bf103f93c Better macOS icon support 2023-03-22 13:31:12 +01:00
Miroslav Mazel
58494e6607 README: New Linux and macOS env. var. instructions 2023-03-22 11:56:28 +01:00
Miroslav Mazel
e470b8809d Platform conditions for image_picker library 2023-03-22 11:55:36 +01:00
Miroslav Mazel
f388e1e7ca Removing unused camera library 2023-03-21 21:23:11 +01:00
Miroslav Mazel
0613f6eb23 Platform check for flutter_barcode_scanner library 2023-03-21 21:22:23 +01:00
Miroslav Mazel
283605eb4b Platform check for videos library 2023-03-21 21:22:07 +01:00
Miroslav Mazel
f32bd1be0f Auto-generated macOS files 2023-03-21 21:13:27 +01:00
Miroslav Mazel
66cd5639e8 Auto-generated Linux files 2023-03-21 21:08:06 +01:00
Miroslav Mazel
7aeed3bde5 Prep Linux/macOS support: package_info_plus package + env variables instead of AndroidMetadata 2023-03-21 21:06:37 +01:00
Roland Geider
6197e4dd2a Use paginated api when fetching log entries 2023-03-20 17:17:53 +01:00
Roland Geider
984df49c41 Add switch to search for ingredients in English as well 2023-03-20 17:14:12 +01:00
Roland Geider
fa8dd7e46f Fix merge errors 2023-03-20 14:19:29 +01:00
Roland Geider
b60e19cb16 Merge branch 'master' into feature/ingredient-images
# Conflicts:
#	lib/main.dart
#	lib/providers/nutrition.dart
#	pubspec.yaml
#	test/nutrition/nutritional_plan_screen_test.dart
#	test/nutrition/nutritional_plans_screen_test.dart
2023-03-20 13:58:31 +01:00
Roland Geider
03b433b55c Update pubspec.lock 2023-03-20 13:53:53 +01:00