Commit Graph

406 Commits

Author SHA1 Message Date
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
89bb924b40 - Fixed issue with date resetting every time a repeat type is selected
- Showing take turns button when todo has repeat rule and has more than 1 assignee
2024-12-08 12:00:42 +01:00
94784b3706 Merge branch 'refs/heads/dev' 2024-12-08 11:38:59 +01:00
11115d151d - Filtered out the Family device user type from the todo filter options 2024-12-08 11:17:33 +01:00
9700a6b269 - Default todo repeat type - None 2024-12-07 11:39:27 +01:00
5866004f6a - Default selected attendee when creating events to be the creator of the event
- Added validation to not allow events without any attendees
2024-12-07 11:36:29 +01:00
a17e0f1e22 todo filtering, nanny shopping 2024-12-06 23:31:27 +01:00
8526d79ba1 refresh button, calendar margins 2024-12-05 11:32:54 +01:00
3880b0e1f4 bugfixes 2024-12-04 21:17:44 +01:00
771dba9658 bugfixes 2024-12-04 21:17:23 +01:00
1b288d095f family chart, other fixes 2024-12-04 19:48:04 +01:00
c86a355b97 notes, tablet sort, grocery list and other fixes 2024-12-02 18:46:36 +01:00
12b4ce3a70 fixes and bug features 2024-11-30 19:05:36 +01:00
92e879c3fc Merge remote-tracking branch 'origin/main' into dev 2024-11-30 18:02:28 +01:00
dfe7301f6d bugfixes 2024-11-28 08:38:52 +01:00
01b4fc2e33 tablet view fixes, grocery item fix 2024-11-27 20:17:48 +01:00
3dff040cea Revert calendar 2024-11-27 09:49:41 +01:00