127 Commits
Author SHA1 Message Date
ivic00 6ada9470c3 delete family popups and birthday 2025-02-06 22:47:18 +01:00
ivic00 ba3ea5a6d2 fixed impossible event dates input 2025-01-22 21:41:24 +01:00
Dejan 413164128b - Fixed events fetching in family view because there are events that don't have the private field
- Implemented marking events as private
2025-01-17 02:00:36 +01:00
ivic00 9c3b9b3663 fixed issue with pfp in tablet view 2025-01-16 15:50:19 +01:00
ivic00 81419c0a23 minor fixes 2025-01-14 20:54:56 +01:00
Dejan 81d791dd17 - Fixed merge conflicts 2024-12-29 19:06:38 +01:00
Dejan 42b18856e4 Merge branch 'main' into dev
# Conflicts:
#	components/pages/calendar/DetailedCalendar.tsx
2024-12-29 18:59:46 +01:00
ivic00 ab7a844bb5 fixed tablet calendar 2024-12-28 15:53:36 +01:00
Milan Paunovic 7d3e39b77d Deletion fix 2024-12-24 23:19:23 +01:00
ivic00 406f541163 ui changes 2024-12-24 20:44:30 +01:00
Milan Paunovic 609d01b81c Merge branch 'dev' 2024-12-24 16:12:36 +01:00
Milan Paunovic 10f6616cd0 Deletion fix 2024-12-24 16:07:18 +01:00
ivic00 5c6915c23d ui changes, fixes 2024-12-24 13:03:42 +01:00
Milan Paunovic 1c9f9f865c Phone header fix 2024-12-20 13:43:20 +01:00
Milan Paunovic 63699d53f4 Revert "Don't spin on scroll"
This reverts commit 1903e4072c.
2024-12-18 17:37:29 +01:00
Milan Paunovic 1903e4072c Don't spin on scroll 2024-12-18 17:37:00 +01:00
Milan Paunovic 8aca8e46db Deleting event fix 2024-12-18 17:28:47 +01:00
ivic00 3324a2fd6f reorganized calendar page, fixes 2024-12-17 18:12:47 +01:00
Milan Paunovic 72aa06ad22 Notifications sorting, modal fixes 2024-12-15 18:45:04 +01:00
Milan Paunovic 818107efe3 Fix stuff 2024-12-15 17:54:01 +01:00
Milan Paunovic 70db8bdc0b New calendar 2024-12-15 16:29:34 +01:00
Milan Paunovic 35608e350f Fixes 2024-12-10 20:05:15 +01:00
ivic00 2740907d63 fixed calendar not showing events on phone 2024-12-09 19:15:29 +01:00
ivic00 3fe46f1954 tablet event and todo filtering 2024-12-08 16:49:39 +01:00
Dejan 5866004f6a - Default selected attendee when creating events to be the creator of the event
- Added validation to not allow events without any attendees
2024-12-07 11:36:29 +01:00
ivic00 8526d79ba1 refresh button, calendar margins 2024-12-05 11:32:54 +01:00
ivic00 1b288d095f family chart, other fixes 2024-12-04 19:48:04 +01:00
Milan Paunovic dfe7301f6d bugfixes 2024-11-28 08:38:52 +01:00
Milan Paunovic 3dff040cea Revert calendar 2024-11-27 09:49:41 +01:00
Milan Paunovic 95d5e74703 Calendar, syncing rework 2024-11-27 01:37:58 +01:00
Milan Paunovic f2af60111b Syncing rework 2024-11-26 21:13:54 +01:00
Milan Paunovic cd178b8a9d Merge branch 'dev'
# Conflicts:
#	components/pages/calendar/EventCalendar.tsx
2024-11-23 14:31:58 +01:00
Milan Paunovic 06a3a2dc8f Notification changes 2024-11-22 03:25:16 +01:00
Dejan 29ec985ffa - Fixed event coloring issue on the my view/family view 2024-11-21 23:53:18 +01:00
Dejan fb27079f10 - Added validation for title and attendees when creation/updating event 2024-11-21 23:32:50 +01:00
Dejan 726668921b - Changed the location field style
- Added creator information on the events in the events dialog
2024-11-21 23:25:52 +01:00
ivic00 830c1bf8ea Merge branch 'dev' of https://github.com/urosran/cally into dev 2024-11-20 21:09:53 +01:00
ivic00 b5aac0af2a ui fixes and tweaks 2024-11-20 21:09:44 +01:00
Dejan cc2a649f8c - Reverted the Add todo press functionality to open the Add todo dialog instead of redirecting to Todos page 2024-11-20 19:27:14 +01:00
ivic00 81477ed85b fixed refresh, tablet drawer, drawer titles 2024-11-20 00:27:43 +01:00
Dejan 89d00cdead - Fixed issue with events not being mapped correctly when fetched(missing attributes)
- Fixed issue with editing of events because of incorrect attribute name
- Color events created by other user, but assigned to current user in the current user's color
2024-11-18 17:46:01 +01:00
Dejan d8e7dc6bf7 - Enabled Add todo button and added navigation to the todos page on click 2024-11-18 17:11:39 +01:00
Dejan f269c9c136 Merge remote-tracking branch 'origin/dev' into dev 2024-11-18 00:17:58 +01:00
Dejan eace5da5cb - Implemented saving of location to the event 2024-11-18 00:17:49 +01:00
ivic00 111244e178 added household name 2024-11-17 23:53:28 +01:00
ivic00 d7928c799d added calendar events refresh 2024-11-17 20:23:41 +01:00
Dejan a95191c890 - Filtering todos 2024-11-17 19:06:50 +01:00
ivic00 6489bdf237 Merge remote-tracking branch 'origin/main' into dev 2024-11-12 21:42:19 +01:00
ivic00 844f534e13 ui fixes and date press feature 2024-11-10 15:25:07 +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