Commit Graph

135 Commits

Author SHA1 Message Date
5b7f54403c - Fixed events not fetching for the family device 2025-01-15 00:05:08 +01:00
6cfb33e227 - Todos point logic changes to use the current day for points 2024-12-30 20:54:33 +01:00
04d865cce9 - Fixed issue with family device not being able to see todos of the family
- Fixed issue with todos not being able to update on family device
2024-12-30 20:08:06 +01:00
141337d2ce - Implemented spending of the saved points 2024-12-30 13:20:58 +01:00
afa1046d02 - Fixed incorrect saving of the points per day 2024-12-29 21:39:49 +01:00
42b18856e4 Merge branch 'main' into dev
# Conflicts:
#	components/pages/calendar/DetailedCalendar.tsx
2024-12-29 18:59:46 +01:00
c14910447e - Implemented saving of points per week per day for user
- Implemented saving of the number of completed todos per user
- Changed "To do's" labels to "To Do"
2024-12-25 22:41:53 +01:00
7d3e39b77d Deletion fix 2024-12-24 23:19:23 +01:00
609d01b81c Merge branch 'dev' 2024-12-24 16:12:36 +01:00
10f6616cd0 Deletion fix 2024-12-24 16:07:18 +01:00
5c6915c23d ui changes, fixes 2024-12-24 13:03:42 +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
956628bcb6 - Fixed issue with uploading images for other users 2024-12-17 21:52:55 +01:00
8c28f049f7 - Changed number of weeks when creating recurring todo 2024-12-16 23:20:10 +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
72aa06ad22 Notifications sorting, modal fixes 2024-12-15 18:45:04 +01:00
bb68a89cfb Fix stuff 2024-12-15 17:57:30 +01:00
818107efe3 Fix stuff 2024-12-15 17:54:01 +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
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
fe9ee5334d Fixes 2024-12-10 22:00:36 +01:00
233427bf38 Merge branch 'dev' 2024-12-10 15:56:44 +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
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
01b4fc2e33 tablet view fixes, grocery item fix 2024-11-27 20:17:48 +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
ee749e1077 Notification batch updates and notifications page update 2024-11-23 16:39:56 +01:00
06a3a2dc8f Notification changes 2024-11-22 03:25:16 +01:00
4f80525f13 - Added User update dialog, useUpdateSubUser.ts hook and implemented update of a selected user from the family group 2024-11-20 23:58:13 +01:00
89d00cdead - Fixed issue with events not being mapped correctly when fetched(missing attributes)
- Fixed issue with editing of events because of incorrect attribute name
- Color events created by other user, but assigned to current user in the current user's color
2024-11-18 17:46:01 +01:00
f269c9c136 Merge remote-tracking branch 'origin/dev' into dev 2024-11-18 00:17:58 +01:00
eace5da5cb - Implemented saving of location to the event 2024-11-18 00:17:49 +01:00
111244e178 added household name 2024-11-17 23:53:28 +01:00
4fa18a6913 - Reverted useSignUp.ts changes 2024-11-17 19:10:37 +01:00
a95191c890 - Filtering todos 2024-11-17 19:06:50 +01:00
6489bdf237 Merge remote-tracking branch 'origin/main' into dev 2024-11-12 21:42:19 +01:00
3fb9dd0035 add more options to user management 2024-11-12 21:38:03 +01:00
5b80a3ba80 - Added Daily repeat type for the todos and implemented creating and updating this kinds of todos 2024-11-10 18:00:17 +01:00
4318f58e22 Merge branch 'dev'
# Conflicts:
#	components/pages/calendar/EventCalendar.tsx
#	components/pages/settings/user_settings_views/MyProfile.tsx
2024-11-05 13:44:42 +01:00
dbfe7d6e9c Added the reccuring todos that repeat weekly to be created for the next 52 weeks 2024-11-04 23:32:13 +01:00
84a974f3f7 Added notifciations 2024-11-04 01:01:59 +01:00
848211c3c8 Merge branch 'dev'
# Conflicts:
#	app/(auth)/_layout.tsx
#	components/pages/settings/user_settings_views/MyProfile.tsx
#	yarn.lock
2024-11-04 00:26:18 +01:00