Commit Graph
88 Commits
Author SHA1 Message Date
Dejan 3564edadf2 - Added null check on household name update 2024-12-17 09:55:03 +01:00
ivic00 035f8af84b changed color options, removed cal_sync for fam_device 2024-12-15 18:11:45 +01:00
ivic00 a305aedeeb settings for other users, fixed event time 2024-12-10 22:06:06 +01:00
Milan Paunovic 95d5e74703 Calendar, syncing rework 2024-11-27 01:37:58 +01:00
Milan Paunovic 5cfdc84055 Merge branch 'dev'
# Conflicts:
#	app/(auth)/calendar/index.tsx
2024-11-26 21:01:10 +01:00
ivic00 4b5900c652 added new colors, ui changes 2024-11-26 19:32:40 +01:00
Milan Paunovic 06a3a2dc8f Notification changes 2024-11-22 03:25:16 +01:00
Dejan edea14b32c Merge remote-tracking branch 'origin/dev' into dev 2024-11-20 23:58:21 +01:00
Dejan 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
ivic00 b5aac0af2a ui fixes and tweaks 2024-11-20 21:09:44 +01:00
ivic00 0ba2cbd65d fixed calendar after tablet merge 2024-11-18 01:43:09 +01:00
ivic00 111244e178 added household name 2024-11-17 23:53:28 +01:00
ivic00 6489bdf237 Merge remote-tracking branch 'origin/main' into dev 2024-11-12 21:42:19 +01:00
ivic00 3fb9dd0035 add more options to user management 2024-11-12 21:38:03 +01:00
ivic00 844f534e13 ui fixes and date press feature 2024-11-10 15:25:07 +01:00
ivic00 d6642726e6 Merge branch 'dev' of https://github.com/urosran/cally into dev 2024-11-05 22:00:23 +01:00
ivic00 dac3f3c0a3 ui fixes 2024-11-05 22:00:16 +01:00
Milan Paunovic 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
Dejan 5beadcce01 Moved color settings to manage my profile 2024-11-04 23:16:09 +01:00
ivic00 6dc81ae653 fixed some calendar bugs 2024-11-04 20:58:18 +01:00
Milan Paunovic 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
ivic00 f398109d69 fixed profile initials 2024-11-03 18:42:13 +01:00
Milan Paunovic 3e517e3a53 Update deps 2024-11-01 11:52:49 +01:00
Milan Paunovic 9ca96b2286 profile deletion added 2024-11-01 05:19:11 +01:00
Milan Paunovic cc2defe154 Minor changes 2024-11-01 04:45:43 +01:00
Milan Paunovic 37529c454e Added ask your family message 2024-11-01 04:38:42 +01:00
Milan Paunovic 909a4344dc Profile picture upload added, QR code scan fix 2024-11-01 04:34:59 +01:00
Milan Paunovic 0fbf89644f Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	components/pages/settings/CalendarSettingsPage.tsx
2024-11-01 03:20:51 +01:00
Milan Paunovic 7f68f3acf8 New onboarding flow, calendar sync logic refactor 2024-11-01 03:18:50 +01:00
Dejan a08b924cf1 Merge remote-tracking branch 'origin/dev' into dev 2024-11-01 01:23:51 +01:00
Dejan b52c9cb74f - Redesigned the calendar settings page and connecting, disconnecting and syncing calendars, fixed issues with syncing 2024-11-01 01:23:28 +01:00
ivic00 e690e3b47a Merge branch 'dev' of https://github.com/urosran/cally into dev 2024-11-01 01:12:25 +01:00
ivic00 94d3b5fffd ui fixes, added delete account confirmation 2024-11-01 01:12:19 +01:00
Milan Paunovic 539cbd9f10 Minor fixes 2024-10-31 23:41:54 +01:00
ivic00 2235e1d900 merge resolve 2024-10-31 22:35:32 +01:00
ivic00 f387f6c0e3 ui tweaks and fixes 2024-10-31 22:30:28 +01:00
Milan Paunovic fda1287011 Fix first day of week setting 2024-10-31 20:25:58 +01:00
Milan Paunovic 8edb8f47f2 Small fixes, calendar token refresh for google 2024-10-31 19:57:06 +01:00
Milan Paunovic 37f3d27999 Added react native big calendar patch 2024-10-31 02:35:50 +01:00
ivic00 7f79a1c819 added confirmation dialogs, fixed scroll wheels ui tweaks 2024-10-30 00:02:25 +01:00
ivic00 74d82e2029 fixed settings paging, calendar style, 2024-10-29 20:15:20 +01:00
Milan Paunovic eb04043264 Merge branch 'dev' 2024-10-26 18:40:10 +02:00
ivic00 ae01b9daaf fix calendar overflow, todo repeat 2024-10-23 21:32:36 +02:00
Milan Paunovic bc54c902d9 Fix adding devices and fetching events 2024-10-22 12:28:43 +02:00
Milan Paunovic 275b8bcfad user creation flow fix 2024-10-22 01:12:15 +02:00
Milan Paunovic a8eb2ff48b Added pfp images 2024-10-21 04:19:19 +02:00
Dejan 206ffd5a88 - Implemented connecting multiple accounts for apple 2024-10-20 19:34:15 +02:00
Dejan be28266696 - Implemented connecting multiple accounts for microsoft 2024-10-20 19:16:48 +02:00
Dejan bb72c6c011 - Implemented connecting multiple accounts for google 2024-10-20 18:34:48 +02:00
Milan Paunovic 055c40d1e6 Syncing logic improvements... Notification logic refactor (stop spamming notifications on sync) 2024-10-20 13:16:54 +02:00