281 Commits

Author SHA1 Message Date
653f72dc94 added chores page 2024-11-17 19:09:13 +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
9d81fa5ba5 - Set the points step to 5 and styled the points slider 2024-11-04 23:41: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
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
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
b9e33c3e1e Merge remote-tracking branch 'origin/main' into dev 2024-11-02 20:02:05 +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
f387f6c0e3 ui tweaks and fixes 2024-10-31 22:30:28 +01:00
ca5df87f3d Small fixes 2024-10-31 21:28:23 +01:00
fda1287011 Fix first day of week setting 2024-10-31 20:25:58 +01:00
8edb8f47f2 Small fixes, calendar token refresh for google 2024-10-31 19:57:06 +01:00
35b3454c46 update package lock 2024-10-31 14:26:25 +01:00
fae2f9e3dd updates 2024-10-31 12:07:52 +01:00
1b6a241bbe Add event deletion 2024-10-31 12:01:01 +01:00
fff113de65 Build nr updt 2024-10-31 02:44:47 +01:00
37f3d27999 Added react native big calendar patch 2024-10-31 02:35:50 +01:00
01274fcb6d Merge remote-tracking branch 'origin/dev' into dev 2024-10-31 00:14:08 +01:00
632ec6cf15 add event invalidation 2024-10-31 00:13:52 +01:00
26a7665743 Merge branch 'dev' of https://github.com/urosran/cally into dev 2024-10-30 23:44:49 +01:00
1417ec8f9b ui fixes 2024-10-30 23:44:37 +01:00
f7c121772a - Reverted check if start time and end time overlap, caused an issue 2024-10-30 23:37:43 +01:00
06bd141b3c build nr updt 2024-10-30 03:22:30 +01:00
01338e7c70 Event filtering 2024-10-30 02:41:00 +01:00
7f79a1c819 added confirmation dialogs, fixed scroll wheels ui tweaks 2024-10-30 00:02:25 +01:00
74d82e2029 fixed settings paging, calendar style, 2024-10-29 20:15:20 +01:00
8ba6f7aecf Merge branch 'main' into dev 2024-10-29 10:33:04 +01:00
b9aa24a0c2 - Take turns implementation for the todos 2024-10-29 00:05:15 +01:00
7771f397b6 - Added validation to not allow end time to be before start time on add and edit event 2024-10-28 21:01:12 +01:00
c234a6260a - Removed the grocery item check box for all other profile types besides parent
- Allowed for all profile types to create new todos
2024-10-28 20:26:44 +01:00