Commit Graph

574 Commits

Author SHA1 Message Date
be461e4183 feat(diary): New models for calendar and autocomplete fix 2024-07-19 11:55:48 +03:00
dbe8ac0999 refactor(diary): API mor produc nutritional and new Product model 2024-07-17 12:39:31 +03:00
b5becbe665 refactor(diary): API mor produc nutritional and new Product model 2024-07-17 12:39:09 +03:00
20d253313a refactor(diary): Merge conflic resolve 2024-07-15 18:13:44 +03:00
8610cacc6f refactor(diary): Refactor product input 2024-07-15 17:44:33 +03:00
ae213f39a5 fix(diary): Meal change method fix 2024-07-15 17:10:55 +03:00
76c1effe12 fix(diary): Wakeup and retire time API method call fix 2024-07-15 15:37:18 +03:00
b8227a492d fix(diary): Satiety and mood change API method call fix 2024-07-15 15:06:14 +03:00
b4993c827c fix(diary): UI errors fix 2024-07-15 11:46:32 +03:00
f3a0df20b7 refactor(diary): Fix 2024-07-12 16:49:50 +03:00
mso7nueh
ed74fd99f0 refactor(diary): fix service 2024-07-12 14:33:18 +03:00
551debd450 refactor(diary): API connect attempt 2024-07-12 13:16:01 +03:00
e4cde31d76 refatcor(diary): Refactored (doesn't work yet though) 2024-07-11 14:35:29 +03:00
def95aeeb5 refactor(diary): LocatorService reg 2024-07-03 17:45:36 +03:00
3c4afe96d6 refactor(diary): Cubit and state for diary 2024-07-03 17:39:18 +03:00
mso7nueh
ef6ea4ef56 Merge pull request 'mso7nueh-feat(chat)' (#45) from mso7nueh-feat(chat) into diary_refactor
Reviewed-on: maxxkim/eatvio_app#45
2024-07-03 14:08:17 +00:00
alex
0a25800038 fix(feed): fix feed repository 2024-07-03 17:06:28 +03:00
fee91ecaa4 Merge pull request 'main' (#43) from main into mso7nueh-feat(chat)
Reviewed-on: maxxkim/eatvio_app#43
2024-07-03 13:55:37 +00:00
507598d962 Merge pull request 'main' (#42) from main into diary_refactor
Reviewed-on: maxxkim/eatvio_app#42
2024-07-03 13:55:24 +00:00
70f6509af8 Merge pull request 'mso7nueh-feat(chat)' (#40) from mso7nueh-feat(chat) into main
Reviewed-on: maxxkim/eatvio_app#40
2024-07-03 13:55:08 +00:00
b4180f7bc9 Merge pull request 'fix(app): Merge conflict resolve' (#41) from diary_refactor into main
Reviewed-on: maxxkim/eatvio_app#41
2024-07-03 13:54:56 +00:00
562935a30f fix(app): Merge conflict resolve 2024-07-03 16:54:38 +03:00
5dfce4b173 Merge pull request 'diary_refactor' (#39) from diary_refactor into main
Reviewed-on: maxxkim/eatvio_app#39
2024-07-03 13:51:55 +00:00
alex
4c7519ee4c feat(chat): add init and dispose chat, typing info, receive a messages 2024-07-03 16:50:09 +03:00
1b2b7646b6 refactor(diary): Diary, Meals, Portions and Models models 2024-07-03 16:39:06 +03:00
d58e96d07a fix(diary): changeMeal fix 2024-07-03 15:33:02 +03:00
57b6cbdd97 Merge pull request 'diary_refactor' (#38) from diary_refactor into main
Reviewed-on: maxxkim/eatvio_app#38
2024-07-03 10:37:58 +00:00
b2f164da46 fix(diary): Type mismatch fix 2024-07-03 13:37:38 +03:00
6194056dc3 mompls 2024-07-03 12:53:21 +03:00
ef94b6a38e Merge branch 'diary_refactor' of ssh://10.55.5.123:222/maxxkim/eatvio_app into diary_refactor 2024-07-03 12:52:38 +03:00
deb7b11922 makefile 2024-07-03 12:44:00 +03:00
20b3c045dd Revert "feat(hooks): git hooks added"
This reverts commit 03eba1d832.
2024-07-03 12:32:50 +03:00
03eba1d832 feat(hooks): git hooks added 2024-07-03 12:13:02 +03:00
alex
424ce3cb34 feat(hooks): prepush hooks broken 2024-07-03 12:01:42 +03:00
alex
6a03e06f04 feat(hooks): prepush hooks 2024-07-03 11:59:32 +03:00
ca81316eed Merge pull request 'main' (#37) from main into diary_refactor
Reviewed-on: maxxkim/eatvio_app#37
2024-07-03 08:54:03 +00:00
Anatoliy Poloz
5cda945d1f testing hooks added 2024-07-03 11:52:40 +03:00
9b97967d88 refactor(diary): Diary cubit 2024-07-03 11:33:10 +03:00
9849b03404 Merge pull request 'main' (#36) from eatvio/eatvio_app:main into main
Reviewed-on: maxxkim/eatvio_app#36
2024-07-01 14:01:28 +00:00
1b1275b2f4 fix(git): Conflict resolve 2024-07-01 17:01:13 +03:00
a022d87adb refactor(blog_post): Refactoring blog post create and conflict resolve 2024-07-01 16:57:43 +03:00
apoloz
f485ad733a Merge pull request 'add pusher' (#101) from mso7nueh/eatvio_app_mso7nueh:main into main
Reviewed-on: eatvio/eatvio_app#101
Reviewed-by: apoloz <anatoliy.poloz@gmail.com>
2024-07-01 13:55:01 +00:00
mso7nueh
c9c8883e01 feat(chat): pusher 2024-07-01 16:08:43 +03:00
beaaecad3c Merge branch 'main' of ssh://10.55.5.123:222/maxxkim/eatvio_app# Please enter a commit message to explain why this merge is necessary,
:q::1wsqa

	xzczxc
2024-06-28 14:41:44 +03:00
02f4008394 refactor(blog_post): Dio, retrfit and freezed implemented for blog post show screen 2024-06-28 14:41:30 +03:00
alex
3151413209 refactor(feed): fix analyze 2024-06-28 13:17:20 +03:00
alex
060fb512a0 refactor(feed): refactor feed screen 2024-06-28 12:55:57 +03:00
58a7ca933d feat(feed): Dio, retrofit and freezed model stump 2024-06-27 16:50:23 +03:00
mso7nueh
70296bc485 feat(chat): fix token storage 2024-06-27 13:24:44 +03:00
b1508c3553 feat(app): Initial layouts for subscribers, feed display fix, feed photo upload front end 2024-06-27 13:17:53 +03:00