Commit Graph

34 Commits

Author SHA1 Message Date
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
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
6dc81ae653 fixed some calendar bugs 2024-11-04 20:58:18 +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
9ca96b2286 profile deletion added 2024-11-01 05:19:11 +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
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
f387f6c0e3 ui tweaks and fixes 2024-10-31 22:30:28 +01:00
37f3d27999 Added react native big calendar patch 2024-10-31 02:35:50 +01:00
74d82e2029 fixed settings paging, calendar style, 2024-10-29 20:15:20 +01:00
eb04043264 Merge branch 'dev' 2024-10-26 18:40:10 +02:00
ae01b9daaf fix calendar overflow, todo repeat 2024-10-23 21:32:36 +02:00
bc54c902d9 Fix adding devices and fetching events 2024-10-22 12:28:43 +02:00
275b8bcfad user creation flow fix 2024-10-22 01:12:15 +02:00
a8eb2ff48b Added pfp images 2024-10-21 04:19:19 +02:00
00583ac115 Various updates.... 2024-10-20 01:44:20 +02:00
3653400a92 Apple calendar sync, timezone, first day of week additions 2024-10-19 22:56:55 +02:00
d2b46ad977 added focus, ui changes 2024-10-17 19:57:41 +02:00
43d0d67044 new fonts, ui tweaks 2024-10-15 23:07:21 +02:00
1e506dd246 Added creating family devices, refetch calendar on notification received 2024-10-13 10:21:38 +02:00
fe6e0365a4 changes to calendar and UI 2024-10-05 23:41:44 +02:00
5922179584 LOgging in with qr code added 2024-09-29 23:03:21 +02:00
92f335543f Adding and displaying family members 2024-09-28 19:08:09 +02:00
91717c699d ver bump 2024-09-28 08:59:05 +02:00
b46fb1b2a8 user settings, points slider 2024-09-20 19:47:21 +02:00
39ef35022c added settings pages 2024-09-19 21:38:37 +02:00