Commit Graph

2194 Commits

Author SHA1 Message Date
misha
6ed7faed15 feat(personalDiets): addde base url from app config for consultation widget 2025-10-31 13:23:13 +03:00
misha
16fccaea8e Merge remote-tracking branch 'upstream/main' into personalDiets 2025-10-31 12:41:36 +03:00
mso7nueh
7b297f954e Merge pull request 'Issue-746' (#747) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#747
2025-10-31 08:59:06 +00:00
mso7nueh
dbd92a65ea feat(md): Issue-746 2025-10-31 00:20:21 +03:00
mso7nueh
f3af743487 merge upstream 2025-10-30 19:27:36 +00:00
Username1548
c95f1988ae commit to create new build 2025-10-30 17:13:58 +03:00
mso7nueh
35a5e6d6be merge upstream 2025-10-30 09:13:28 +00:00
mso7nueh
977b7150fe feat(md): Issue-746 2025-10-29 17:27:05 +03:00
5b81014e72 Merge pull request 'feat(InfoByOrder)' (#750) from misha/eatvio_app:issue-681 into main
Reviewed-on: eatvio/eatvio_app#750
2025-10-29 01:39:05 +00:00
misha
563d84ca12 feat(InfoByOrder): added user info to InfoByOrderScreen author card 2025-10-29 04:38:04 +03:00
06cafb4257 Merge pull request 'feat(profile)' (#749) from misha/eatvio_app:issue-742 into main
Reviewed-on: eatvio/eatvio_app#749
2025-10-29 01:02:36 +00:00
misha
a34cb01c1f feat(profile): changed profile bages layout 2025-10-29 04:01:27 +03:00
mso7nueh
8799375880 feat(md): Issue-746 2025-10-27 17:07:20 +03:00
mso7nueh
fb5a0d52bc feat(feed): mdToHtml 2025-10-24 18:55:01 +03:00
misha
2e3172bc45 Merge remote-tracking branch 'upstream/main' into personalDiets 2025-10-24 13:21:03 +03:00
mso7nueh
ce0099c385 Merge pull request 'feat(tests): blog post create' (#744) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#744
2025-10-22 15:42:27 +00:00
mso7nueh
14e4d7973e feat(tests): blog post create 2025-10-22 18:42:01 +03:00
mso7nueh
a138707111 Merge pull request 'feat(test): diet, plan, registration' (#741) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#741
2025-10-22 13:48:38 +00:00
mso7nueh
4c7dd4a12a Merge branch 'main' of http://gitea.office.local:3000/mso7nueh/eatvio_app 2025-10-22 16:48:14 +03:00
mso7nueh
c2eda628dd WIP: feat(tests): blog post create 2025-10-22 16:48:08 +03:00
mso7nueh
53f2b78dfa Merge pull request 'feat(test): diet, plan, registration' (#741) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#741
2025-10-22 13:47:07 +00:00
mso7nueh
ed612aa019 feat(test): diet, plan, registration 2025-10-21 21:02:17 +03:00
mso7nueh
1f4c450ce7 Merge pull request 'feat(tests): recipe create, fix oauth' (#737) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#737
2025-10-21 11:38:31 +00:00
mso7nueh
1841199291 fix: analyzer 2025-10-21 14:07:12 +03:00
mso7nueh
4c5532ff32 fix: upd ver 2025-10-21 14:00:40 +03:00
mso7nueh
c1cbf1658b fix(oauth): sex=null 2025-10-21 13:59:19 +03:00
mso7nueh
e7ab43c845 feat(tests): recipe create widget test 2025-10-20 12:04:53 +03:00
mso7nueh
b9136a80de feat(tests); recipe create 2025-10-17 17:11:27 +03:00
bb68ea963c Merge pull request 'feat(tests)' (#736) from misha/eatvio_app:tests into main
Reviewed-on: eatvio/eatvio_app#736
2025-10-17 13:14:20 +00:00
misha
228ea7c902 feat(tests): added sign in skip 2025-10-17 16:13:34 +03:00
8c85d1837a Merge pull request 'feat(deepLinks)' (#692) from misha/eatvio_app:deepLinks into main
Reviewed-on: eatvio/eatvio_app#692
2025-10-17 13:04:11 +00:00
misha
1d8f414672 Merge remote-tracking branch 'upstream/main' into deepLinks 2025-10-17 16:03:35 +03:00
49453c8b31 Merge pull request 'feat(pushNotifications)' (#708) from misha/eatvio_app:issue-707 into main
Reviewed-on: eatvio/eatvio_app#708
2025-10-17 12:25:36 +00:00
misha
138e2c1073 Merge remote-tracking branch 'upstream/main' into issue-707 2025-10-17 15:24:21 +03:00
eb39ae5e7c Merge pull request 'feat(diary)' (#705) from misha/eatvio_app:issue-701 into main
Reviewed-on: eatvio/eatvio_app#705
2025-10-17 11:52:09 +00:00
misha
250d9614e3 Merge remote-tracking branch 'upstream/main' into issue-701 2025-10-17 11:50:36 +03:00
b9b06f11a6 Merge pull request 'feat(glossary)' (#711) from misha/eatvio_app:issue-710 into main
Reviewed-on: eatvio/eatvio_app#711
2025-10-16 15:24:56 +00:00
misha
12ca205515 Merge remote-tracking branch 'upstream/main' into issue-710 2025-10-16 18:23:04 +03:00
mso7nueh
d8e7464c37 Merge pull request 'build 80 (android), 81 ios' (#734) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#734
2025-10-16 14:39:17 +00:00
mso7nueh
e0c90bcb21 fix: upd ver to 80 2025-10-16 17:38:23 +03:00
4a96390839 Merge pull request 'doc(readme): README.md update' (#731) from apoloz/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#731
2025-10-16 14:36:34 +00:00
a3b25270ac Merge pull request 'fix: merge conflict' (#733) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#733
2025-10-16 14:34:30 +00:00
misha
c72b3e77c6 fix: merge conflict 2025-10-16 17:33:52 +03:00
35f2c0f30a Merge pull request 'feat(social)' (#732) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#732
2025-10-16 14:20:46 +00:00
misha
9e43be5b4e feat(social): added validation for social media registration 2025-10-16 17:18:45 +03:00
4db5dda3ce doc(readme): README.md update 2025-10-16 14:22:23 +03:00
87d5e0bc23 Merge pull request 'docs and rules added' (#730) from apoloz/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#730
2025-10-16 08:22:11 +00:00
fa3cf297a3 doc(project): project brief docs added 2025-10-16 11:01:37 +03:00
7b08560257 merge upstream 2025-10-16 07:28:06 +00:00
efd6cca87d Merge pull request 'CI\CD fix' (#729) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#729
2025-10-15 11:50:06 +00:00