Milan Paunovic 5cfdc84055 Merge branch 'dev' ...

# Conflicts:
#	app/(auth)/calendar/index.tsx

2024-11-26 21:01:10 +01:00

..

calendar_components

added confirmation dialogs, fixed scroll wheels ui tweaks

2024-10-30 00:02:25 +01:00

user_components

Notification changes

2024-11-22 03:25:16 +01:00

user_settings_views

Merge branch 'dev'

2024-11-26 21:01:10 +01:00

CalendarSettingsPage.tsx

Merge remote-tracking branch 'origin/main' into dev

2024-11-12 21:42:19 +01:00

ChoreRewardSettings.tsx

fixed settings paging, calendar style,

2024-10-29 20:15:20 +01:00

SettingsPage.tsx

added new colors, ui changes

2024-11-26 19:32:40 +01:00

UserSettings.tsx

fixed calendar after tablet merge

2024-11-18 01:43:09 +01:00