Commit Graph

422 Commits

Author SHA1 Message Date
fb9be26e04 Merge remote-tracking branch 'origin/dev' into dev 2024-12-22 18:31:35 +01:00
2c6474007c - Implemented backend logic for saving weekly and all time points for todos 2024-12-22 18:31:22 +01:00
4866dd1b3f - Improved the todo update 2024-12-22 16:35:31 +01:00
6972066f91 menu button rework 2024-12-18 21:22:38 +01:00
b7fd8daddf - Added loading indicators when on groceries and todos, fixed margin issues in the todo page 2024-12-17 23:33:59 +01:00
8b802f492d - Changed the menu grocery label 2024-12-17 23:22:07 +01:00
3d96393972 - Added refetching if the family members when opening My group tab 2024-12-17 22:08:25 +01:00
956628bcb6 - Fixed issue with uploading images for other users 2024-12-17 21:52:55 +01:00
0b56b169a5 Merge remote-tracking branch 'origin/dev' into dev 2024-12-17 20:15:15 +01:00
4b67033aa8 - Implemented optimistic update when completing todos and groceries to avoid delays 2024-12-17 20:13:51 +01:00
3324a2fd6f reorganized calendar page, fixes 2024-12-17 18:12:47 +01:00
79ac1efe63 - Fixed issue with improper creation of Shopping todo 2024-12-17 12:40:11 +01:00
32a718953b - Added todo completed animation when child completes a todo 2024-12-17 11:31:50 +01:00
3564edadf2 - Added null check on household name update 2024-12-17 09:55:03 +01:00
f7860a5af8 - Fixed issue with parents not being able to approve groceries 2024-12-16 23:39:32 +01:00
8c28f049f7 - Changed number of weeks when creating recurring todo 2024-12-16 23:20:10 +01:00
003f3717e5 build fix 2024-12-16 20:19:44 +01:00
0733c25892 Merge remote-tracking branch 'origin/dev' into dev 2024-12-15 22:44:43 +01:00
335905335e -Fixed create todo issues 2024-12-15 22:44:33 +01:00
a4bd7920e4 Merge branch 'dev' 2024-12-15 22:24:06 +01:00
5be4e15885 Merge branch 'dev' of https://github.com/urosran/cally into dev 2024-12-15 18:53:45 +01:00
72aa06ad22 Notifications sorting, modal fixes 2024-12-15 18:45:04 +01:00
56f37cef94 Merge branch 'dev' 2024-12-15 18:25:03 +01:00
035f8af84b changed color options, removed cal_sync for fam_device 2024-12-15 18:11:45 +01:00
bb68a89cfb Fix stuff 2024-12-15 17:57:30 +01:00
818107efe3 Fix stuff 2024-12-15 17:54:01 +01:00
b59a8bf97d Merge remote-tracking branch 'origin/dev' into dev 2024-12-15 17:05:30 +01:00
5cafd10f09 - Changed the members dependency check when defining the todo filter options 2024-12-15 17:05:18 +01:00
c411990312 Fixes 2024-12-15 16:46:26 +01:00
70db8bdc0b New calendar 2024-12-15 16:29:34 +01:00
a6009beb03 Merge branch 'refs/heads/dev' 2024-12-15 16:28:07 +01:00
0aec9c1ee8 Merge branch 'dev' of https://github.com/urosran/cally into dev 2024-12-15 16:00:26 +01:00
4f96bb071b - Added validation on todo creation to avoid creating todos with Every week repeat type, but no selected days
- Reworked and improved the creation of repeat todo
2024-12-15 15:31:55 +01:00
67c896b9c6 Merge branch 'refs/heads/dev'
# Conflicts:
#	components/pages/calendar/ManuallyAddEventModal.tsx
2024-12-15 14:34:49 +01:00
d30ed9b130 - Fixed issue with todo filter not being updated after adding deleting users 2024-12-15 11:51:23 +01:00
5bb250f7ea fixed tablet pages 2024-12-11 21:20:27 +01:00
a305aedeeb settings for other users, fixed event time 2024-12-10 22:06:06 +01:00
fe9ee5334d Fixes 2024-12-10 22:00:36 +01:00
35608e350f Fixes 2024-12-10 20:05:15 +01:00
233427bf38 Merge branch 'dev' 2024-12-10 15:56:44 +01:00
2740907d63 fixed calendar not showing events on phone 2024-12-09 19:15:29 +01:00
ee04ba7850 IOS updates 2024-12-08 19:09:45 +01:00
ffb0df6bac IOS updates 2024-12-08 18:07:28 +01:00
3fe46f1954 tablet event and todo filtering 2024-12-08 16:49:39 +01:00
f382d403cd - Removed background color of the grocery items text for number of items 2024-12-08 14:06:19 +01:00
1c2f18e288 - Grocery list changes
- Removed the Add item button from the bottom and added an empty grocery box
2024-12-08 14:01:35 +01:00
47a0ea2f36 - Added Done category in the grocery list and pushed it to the bottom 2024-12-08 13:38:27 +01:00
12f1a51292 - Added delete button on the checked grocery items 2024-12-08 13:15:06 +01:00
ecee34bf26 - Added functionality to the add todo button in the groceries page to open a todo dialog with preselected title 2024-12-08 13:05:09 +01:00
33ada3505b bugfixes 2024-12-08 12:22:24 +01:00