492 Commits

Author SHA1 Message Date
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
95d5e74703 Calendar, syncing rework 2024-11-27 01:37:58 +01:00
f2af60111b Syncing rework 2024-11-26 21:13:54 +01:00
5cfdc84055 Merge branch 'dev'
# Conflicts:
#	app/(auth)/calendar/index.tsx
2024-11-26 21:01:10 +01:00
4b5900c652 added new colors, ui changes 2024-11-26 19:32:40 +01:00
ee749e1077 Notification batch updates and notifications page update 2024-11-23 16:39:56 +01:00
cd178b8a9d Merge branch 'dev'
# Conflicts:
#	components/pages/calendar/EventCalendar.tsx
2024-11-23 14:31:58 +01:00
d091aaa0ee Batch updates 2024-11-22 09:21:12 +01:00
06a3a2dc8f Notification changes 2024-11-22 03:25:16 +01:00
29ec985ffa - Fixed event coloring issue on the my view/family view 2024-11-21 23:53:18 +01:00
fb27079f10 - Added validation for title and attendees when creation/updating event 2024-11-21 23:32:50 +01:00
726668921b - Changed the location field style
- Added creator information on the events in the events dialog
2024-11-21 23:25:52 +01:00
c528f72b2e - Added created by label in the todo item 2024-11-21 22:55:54 +01:00
f74a6390a2 Merge branch 'dev' 2024-11-21 19:22:28 +01:00
edea14b32c Merge remote-tracking branch 'origin/dev' into dev 2024-11-20 23:58:21 +01:00