Commit Graph

309 Commits

Author SHA1 Message Date
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
55d3877c5b Merge branch 'dev' of https://github.com/urosran/cally into dev 2024-11-17 23:53:36 +01:00
111244e178 added household name 2024-11-17 23:53:28 +01:00
c9b796bd40 - Improvements to the todo filter 2024-11-17 22:53:11 +01:00
c1f7113dfc Merge remote-tracking branch 'origin/dev' into dev 2024-11-17 20:24:11 +01:00
f21f70a45d - Fixed infinite rendering in the todos page 2024-11-17 20:24:01 +01:00
d7928c799d added calendar events refresh 2024-11-17 20:23:41 +01:00
653f72dc94 added chores page 2024-11-17 19:09:13 +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
e2aae47c34 - Changed the todo repeat icon 2024-11-10 18:11:22 +01:00
7da8005fb1 - Added alert if title is empty on todo save 2024-11-10 17:33:47 +01:00
f7909de546 - Added preslected assignee to be the current user when creating todo 2024-11-10 17:25:00 +01:00
844f534e13 ui fixes and date press feature 2024-11-10 15:25:07 +01:00
1d3daa49ec fixed chores page tablet 2024-11-10 14:07:27 +01:00
62ba53f116 Merge remote-tracking branch 'origin/dev' into tablet 2024-11-10 13:54:23 +01:00
e3084a70a7 added pfp to tablet view 2024-11-10 13:53:19 +01:00
d6642726e6 Merge branch 'dev' of https://github.com/urosran/cally into dev 2024-11-05 22:00:23 +01:00
dac3f3c0a3 ui fixes 2024-11-05 22:00:16 +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
5beadcce01 Moved color settings to manage my profile 2024-11-04 23:16:09 +01:00
ebd6fcbfab - Sorted the users when adding todo 2024-11-04 22:37:56 +01:00
6dc81ae653 fixed some calendar bugs 2024-11-04 20:58:18 +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
f398109d69 fixed profile initials 2024-11-03 18:42:13 +01:00
6dc09ee448 changes to tablet detection and more 2024-11-03 18:39:32 +01:00
8f5477bebb Merge branch 'dev' into tablet 2024-11-03 17:10:12 +01:00
b35871aed8 added Feedback page, added braindump backend 2024-11-02 22:31:19 +01:00
f1b0bcd32d sync update 2024-11-02 22:27:17 +01:00
c4e4a4a798 Faimly 2024-11-01 23:45:05 +01:00
18223c5f92 All day event package 2024-11-01 23:17:56 +01:00
87137e7b15 All day event package 2024-11-01 22:02:36 +01:00
3e517e3a53 Update deps 2024-11-01 11:52:49 +01:00
c1252cf092 Dont use enriched events 2024-11-01 10:29:23 +01:00
9ca96b2286 profile deletion added 2024-11-01 05:19:11 +01:00
cc2defe154 Minor changes 2024-11-01 04:45:43 +01:00
37529c454e Added ask your family message 2024-11-01 04:38:42 +01:00
909a4344dc Profile picture upload added, QR code scan fix 2024-11-01 04:34:59 +01:00
0fbf89644f Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	components/pages/settings/CalendarSettingsPage.tsx
2024-11-01 03:20:51 +01:00
7f68f3acf8 New onboarding flow, calendar sync logic refactor 2024-11-01 03:18:50 +01:00
a08b924cf1 Merge remote-tracking branch 'origin/dev' into dev 2024-11-01 01:23:51 +01:00
b52c9cb74f - Redesigned the calendar settings page and connecting, disconnecting and syncing calendars, fixed issues with syncing 2024-11-01 01:23:28 +01:00
e690e3b47a Merge branch 'dev' of https://github.com/urosran/cally into dev 2024-11-01 01:12:25 +01:00
94d3b5fffd ui fixes, added delete account confirmation 2024-11-01 01:12:19 +01:00
539cbd9f10 Minor fixes 2024-10-31 23:41:54 +01:00
641d65a736 fixed Platform import 2024-10-31 22:37:29 +01:00
2235e1d900 merge resolve 2024-10-31 22:35:32 +01:00