Commit Graph

1093 Commits

Author SHA1 Message Date
Alex
ab0f43479f fix: black screen 2025-01-13 14:14:23 +03:00
Alex
9ccb1d08c3 fix: black screen 2025-01-10 11:32:19 +03:00
mso7nueh
7f2e4df309 Merge pull request 'main' (#12) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#12
2024-12-26 11:40:06 +00:00
mso7nueh
f8f72a6f97 Merge pull request 'main' (#208) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#208
2024-12-26 11:38:23 +00:00
Username1548
ab7004f9fd analyze rules fixed 2024-12-25 17:54:46 +07:00
Username1548
eb280e1800 Merge remote-tracking branch 'upstream/main' 2024-12-25 17:51:54 +07:00
Username1548
3521a58c2f user details created 2024-12-25 17:51:50 +07:00
mso7nueh
c9ecd7945f Merge pull request 'feat(diary): diet' (#207) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#207
2024-12-24 13:53:28 +00:00
Alex
67d8bb58ee feat(diary): diet 2024-12-24 16:52:06 +03:00
Username1548
0c981b0068 merge fixes 2024-12-23 15:39:19 +07:00
Username1548
0c54f66d41 Merge remote-tracking branch 'upstream/main' 2024-12-23 15:39:02 +07:00
Username1548
5ef1f3a660 my plans and my diets 2024-12-23 15:36:00 +07:00
mso7nueh
08e78bde1c Merge pull request 'Рецепты (создание)' (#202) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#202
2024-12-19 18:00:13 +00:00
Alex
c6a60eccd9 fix(profile): empty consultant education 2024-12-19 18:11:04 +03:00
Alex
c964ad0019 fix(recipes): ingredients 2024-12-19 17:43:46 +03:00
Alex
f7d5cc714d fix: analyzer 2024-12-19 13:46:59 +03:00
Alex
3c1092124d feat(diary): chart down 2024-12-18 17:24:31 +03:00
Alex
19ba815b99 feat(registration): refactor 2024-12-18 17:21:33 +03:00
Alex
947821c874 fix:analyzer 2024-12-18 16:28:45 +03:00
Alex
f0cdb73496 feat(registration): add phone 2024-12-18 13:34:47 +03:00
Alex
12a24e6ead feat: change base url 2024-12-18 12:46:19 +03:00
Alex
e0ec45e19e feat(recipe): add creating recipes 2024-12-18 11:56:20 +03:00
Alex
f6d4ea7df6 feat(recipe): add recipe creating 2024-12-18 11:55:32 +03:00
Username1548
15a6ff44ef Merge remote-tracking branch 'upstream/main' 2024-12-16 21:13:58 +07:00
Username1548
27241aebac plans filters ready 2024-12-16 20:31:23 +07:00
mso7nueh
29b3b45ec9 Merge pull request 'fix: analyzer' (#200) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#200
2024-12-13 14:41:50 +00:00
Alex
a58fbf1ee4 fix: analyzer 2024-12-13 17:41:15 +03:00
mso7nueh
5945f50dac Merge pull request 'fix: some fixes' (#199) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#199
2024-12-13 14:14:55 +00:00
Alex
7715da6b8e upd ci cd 2024-12-13 17:14:09 +03:00
Alex
0c09f23e1d fix: cicd 2024-12-13 17:13:18 +03:00
Alex
939c5cc6e5 feat: recipe fix anaylzer 2024-12-13 17:12:16 +03:00
Alex
799c63b427 feat: recipe widget 2024-12-13 17:11:15 +03:00
Alex
1c4c73d98e fix: file_picker ;) 2024-12-13 12:17:21 +03:00
Alex
af1bd525fd fix: file_picker 2024-12-13 11:59:42 +03:00
Alex
2aa4fdc4a8 fix: some fixes 2024-12-13 11:47:20 +03:00
mso7nueh
774d512a04 Merge pull request 'main' (#198) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#198
2024-12-11 14:02:19 +00:00
Alex
4c34fa6a40 Merge branch 'main' of http://gitea.office.local:3000/mso7nueh/eatvio_app 2024-12-11 17:01:49 +03:00
Alex
7120260a0b fix: feed cubit 2024-12-11 17:01:46 +03:00
mso7nueh
274a8c40f0 Merge pull request 'main' (#11) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#11
2024-12-11 13:08:52 +00:00
mso7nueh
d6f0835393 Merge pull request 'diet creation screen's done' (#197) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#197
2024-12-11 13:07:46 +00:00
Username1548
067b10ed7f fixed layout bug in info row 2024-12-11 20:01:01 +07:00
Username1548
e9a4c518be glossary for diet creation fixed 2024-12-11 19:51:40 +07:00
Username1548
746e16f94e Merge remote-tracking branch 'upstream/main' 2024-12-11 19:24:23 +07:00
Username1548
2f168a2f35 diet creation scrren is done 2024-12-11 19:15:25 +07:00
mso7nueh
0ce84f5433 Merge pull request 'fix: profile 2' (#196) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#196
2024-12-11 11:22:41 +00:00
Alex
728c362e24 fix: profile 2 2024-12-11 14:22:00 +03:00
mso7nueh
1479283fe2 Merge pull request 'fix: comments' (#195) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#195
2024-12-11 11:14:35 +00:00
mso7nueh
5e0f4d0b48 Merge pull request 'main' (#194) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#194
2024-12-11 10:58:29 +00:00
Alex
4b2e642b9d fix: comments 2024-12-11 13:41:14 +03:00
Alex
95b7f82770 fix: profile 2024-12-11 11:49:16 +03:00