Commit Graph

12 Commits

Author SHA1 Message Date
81d791dd17 - Fixed merge conflicts 2024-12-29 19:06:38 +01:00
42b18856e4 Merge branch 'main' into dev
# Conflicts:
#	components/pages/calendar/DetailedCalendar.tsx
2024-12-29 18:59:46 +01:00
ab7a844bb5 fixed tablet calendar 2024-12-28 15:53:36 +01:00
7d3e39b77d Deletion fix 2024-12-24 23:19:23 +01:00
609d01b81c Merge branch 'dev' 2024-12-24 16:12:36 +01:00
10f6616cd0 Deletion fix 2024-12-24 16:07:18 +01:00
5c6915c23d ui changes, fixes 2024-12-24 13:03:42 +01:00
63699d53f4 Revert "Don't spin on scroll"
This reverts commit 1903e4072c.
2024-12-18 17:37:29 +01:00
1903e4072c Don't spin on scroll 2024-12-18 17:37:00 +01:00
3324a2fd6f reorganized calendar page, fixes 2024-12-17 18:12:47 +01:00
72aa06ad22 Notifications sorting, modal fixes 2024-12-15 18:45:04 +01:00
70db8bdc0b New calendar 2024-12-15 16:29:34 +01:00