Commit Graph

Select branches

Hide Pull Requests

dev

dp/calendar-sync

dp/google-oauth2

main

matija_changes

reminders

tablet

#1

#2

Mono Color

• a6009beb03 Merge branch 'refs/heads/dev' Milan Paunovic 2024-12-15 16:28:07 +01:00
• 0aec9c1ee8 Merge branch 'dev' of https://github.com/urosran/cally into dev ivic00 2024-12-15 16:00:26 +01:00
• 4f96bb071b - Added validation on todo creation to avoid creating todos with Every week repeat type, but no selected days - Reworked and improved the creation of repeat todo Dejan 2024-12-15 15:31:55 +01:00
• 67c896b9c6 Merge branch 'refs/heads/dev' Milan Paunovic 2024-12-15 14:34:49 +01:00
• d30ed9b130 - Fixed issue with todo filter not being updated after adding deleting users Dejan 2024-12-15 11:51:23 +01:00
• 5bb250f7ea fixed tablet pages ivic00 2024-12-11 21:20:27 +01:00
• a305aedeeb settings for other users, fixed event time ivic00 2024-12-10 22:06:06 +01:00
• fe9ee5334d Fixes Milan Paunovic 2024-12-10 22:00:36 +01:00
• 35608e350f Fixes Milan Paunovic 2024-12-10 20:05:15 +01:00
• 233427bf38 Merge branch 'dev' ivic00 2024-12-10 15:56:44 +01:00
• 2740907d63 fixed calendar not showing events on phone ivic00 2024-12-09 19:15:29 +01:00
• ee04ba7850 IOS updates Milan Paunovic 2024-12-08 19:09:45 +01:00
• ffb0df6bac IOS updates Milan Paunovic 2024-12-08 18:07:28 +01:00
• 3fe46f1954 tablet event and todo filtering ivic00 2024-12-08 16:49:39 +01:00
• f382d403cd - Removed background color of the grocery items text for number of items Dejan 2024-12-08 14:06:19 +01:00
• 1c2f18e288 - Grocery list changes - Removed the Add item button from the bottom and added an empty grocery box Dejan 2024-12-08 14:01:35 +01:00
• 47a0ea2f36 - Added Done category in the grocery list and pushed it to the bottom Dejan 2024-12-08 13:38:27 +01:00
• 12f1a51292 - Added delete button on the checked grocery items Dejan 2024-12-08 13:15:06 +01:00
• ecee34bf26 - Added functionality to the add todo button in the groceries page to open a todo dialog with preselected title Dejan 2024-12-08 13:05:09 +01:00
• 33ada3505b bugfixes Milan Paunovic 2024-12-08 12:22:24 +01:00
• 89bb924b40 - Fixed issue with date resetting every time a repeat type is selected - Showing take turns button when todo has repeat rule and has more than 1 assignee Dejan 2024-12-08 12:00:42 +01:00
• 94784b3706 Merge branch 'refs/heads/dev' Milan Paunovic 2024-12-08 11:38:59 +01:00
• 11115d151d - Filtered out the Family device user type from the todo filter options Dejan 2024-12-08 11:17:33 +01:00
• 9700a6b269 - Default todo repeat type - None Dejan 2024-12-07 11:39:27 +01:00
• 5866004f6a - Default selected attendee when creating events to be the creator of the event - Added validation to not allow events without any attendees Dejan 2024-12-07 11:36:29 +01:00
• a17e0f1e22 todo filtering, nanny shopping ivic00 2024-12-06 23:31:27 +01:00
• 8526d79ba1 refresh button, calendar margins ivic00 2024-12-05 11:32:54 +01:00
• 3880b0e1f4 bugfixes Milan Paunovic 2024-12-04 21:17:44 +01:00
• 771dba9658 bugfixes Milan Paunovic 2024-12-04 21:17:23 +01:00
• 1b288d095f family chart, other fixes ivic00 2024-12-04 19:48:04 +01:00
• c86a355b97 notes, tablet sort, grocery list and other fixes ivic00 2024-12-02 18:46:36 +01:00
• 12b4ce3a70 fixes and bug features ivic00 2024-11-30 19:05:36 +01:00
• 92e879c3fc Merge remote-tracking branch 'origin/main' into dev ivic00 2024-11-30 18:02:28 +01:00
• dfe7301f6d bugfixes Milan Paunovic 2024-11-28 08:38:52 +01:00
• 01b4fc2e33 tablet view fixes, grocery item fix ivic00 2024-11-27 20:17:48 +01:00
• 3dff040cea Revert calendar Milan Paunovic 2024-11-27 09:49:41 +01:00
• 95d5e74703 Calendar, syncing rework Milan Paunovic 2024-11-27 01:37:58 +01:00
• f2af60111b Syncing rework Milan Paunovic 2024-11-26 21:13:54 +01:00
• 5cfdc84055 Merge branch 'dev' Milan Paunovic 2024-11-26 21:01:10 +01:00
• 4b5900c652 added new colors, ui changes ivic00 2024-11-26 19:32:40 +01:00
• ee749e1077 Notification batch updates and notifications page update Milan Paunovic 2024-11-23 16:37:25 +01:00
• cd178b8a9d Merge branch 'dev' Milan Paunovic 2024-11-23 14:31:58 +01:00
• d091aaa0ee Batch updates Milan Paunovic 2024-11-22 09:21:12 +01:00
• 06a3a2dc8f Notification changes Milan Paunovic 2024-11-22 03:25:16 +01:00
• 29ec985ffa - Fixed event coloring issue on the my view/family view Dejan 2024-11-21 23:53:18 +01:00
• fb27079f10 - Added validation for title and attendees when creation/updating event Dejan 2024-11-21 23:32:50 +01:00
• 726668921b - Changed the location field style - Added creator information on the events in the events dialog Dejan 2024-11-21 23:25:52 +01:00
• c528f72b2e - Added created by label in the todo item Dejan 2024-11-21 22:55:54 +01:00
• f74a6390a2 Merge branch 'dev' Milan Paunovic 2024-11-21 19:22:28 +01:00
• edea14b32c Merge remote-tracking branch 'origin/dev' into dev Dejan 2024-11-20 23:58:21 +01:00
• 4f80525f13 - Added User update dialog, useUpdateSubUser.ts hook and implemented update of a selected user from the family group Dejan 2024-11-20 23:58:13 +01:00
• 830c1bf8ea Merge branch 'dev' of https://github.com/urosran/cally into dev ivic00 2024-11-20 21:09:53 +01:00
• b5aac0af2a ui fixes and tweaks ivic00 2024-11-20 21:09:44 +01:00
• b1a5d4c171 - Added validation when adding todos to restrict having todos without any assignees Dejan 2024-11-20 20:36:09 +01:00
• e113d78575 - Added todo filter option for Everyone to show all the family's tasks Dejan 2024-11-20 20:24:37 +01:00
• 012a70313b - Allowed selecting date when Repeat type is set to "None" - Enabled opening the repeat freq picker with click on the Repeat todo icon Dejan 2024-11-20 20:04:23 +01:00
• cc2a649f8c - Reverted the Add todo press functionality to open the Add todo dialog instead of redirecting to Todos page Dejan 2024-11-20 19:27:14 +01:00
• 81477ed85b fixed refresh, tablet drawer, drawer titles ivic00 2024-11-20 00:27:43 +01:00
• 9f32e81672 supportsTablet Milan Paunovic 2024-11-19 14:16:46 +01:00
• bd890406b1 podfile update Milan Paunovic 2024-11-19 11:55:27 +01:00
• 47f035708c notification update Milan Paunovic 2024-11-19 11:54:16 +01:00
• 8763be4613 fixed tablet view / spelling ivic00 2024-11-18 22:14:00 +01:00
• 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 Dejan 2024-11-18 17:46:01 +01:00
• d8e7dc6bf7 - Enabled Add todo button and added navigation to the todos page on click Dejan 2024-11-18 17:11:39 +01:00
• 0ba2cbd65d fixed calendar after tablet merge ivic00 2024-11-18 01:43:09 +01:00
• 662b38f894 Merge branch 'tablet' into dev ivic00 2024-11-18 00:43:39 +01:00
• f269c9c136 Merge remote-tracking branch 'origin/dev' into dev Dejan 2024-11-18 00:17:58 +01:00
• eace5da5cb - Implemented saving of location to the event Dejan 2024-11-18 00:17:49 +01:00
• 55d3877c5b Merge branch 'dev' of https://github.com/urosran/cally into dev ivic00 2024-11-17 23:53:36 +01:00
• 111244e178 added household name ivic00 2024-11-17 23:53:28 +01:00
• c9b796bd40 - Improvements to the todo filter Dejan 2024-11-17 22:53:11 +01:00
• c1f7113dfc Merge remote-tracking branch 'origin/dev' into dev Dejan 2024-11-17 20:24:11 +01:00
• f21f70a45d - Fixed infinite rendering in the todos page Dejan 2024-11-17 20:24:01 +01:00
• 9d16e8b301 Merge branch 'dev' of https://github.com/urosran/cally into dev ivic00 2024-11-17 20:23:53 +01:00
• d7928c799d added calendar events refresh ivic00 2024-11-17 20:23:41 +01:00
• 4fa18a6913 - Reverted useSignUp.ts changes Dejan 2024-11-17 19:10:37 +01:00
• 653f72dc94 added chores page tablet ivic00 2024-11-17 19:09:13 +01:00
• a95191c890 - Filtering todos Dejan 2024-11-17 19:06:50 +01:00
• 6489bdf237 Merge remote-tracking branch 'origin/main' into dev ivic00 2024-11-12 21:42:19 +01:00
• 3fb9dd0035 add more options to user management ivic00 2024-11-12 21:38:03 +01:00
• e2aae47c34 - Changed the todo repeat icon Dejan 2024-11-10 18:11:22 +01:00
• 5b80a3ba80 - Added Daily repeat type for the todos and implemented creating and updating this kinds of todos Dejan 2024-11-10 18:00:17 +01:00
• 7da8005fb1 - Added alert if title is empty on todo save Dejan 2024-11-10 17:33:47 +01:00
• f7909de546 - Added preslected assignee to be the current user when creating todo Dejan 2024-11-10 17:25:00 +01:00
• 844f534e13 ui fixes and date press feature ivic00 2024-11-10 15:25:07 +01:00
• 1d3daa49ec fixed chores page tablet ivic00 2024-11-10 14:07:27 +01:00
• 62ba53f116 Merge remote-tracking branch 'origin/dev' into tablet ivic00 2024-11-10 13:54:23 +01:00
• e3084a70a7 added pfp to tablet view ivic00 2024-11-10 13:53:19 +01:00
• d6642726e6 Merge branch 'dev' of https://github.com/urosran/cally into dev ivic00 2024-11-05 22:00:23 +01:00
• dac3f3c0a3 ui fixes ivic00 2024-11-05 22:00:16 +01:00
• 8ac7f8b2eb notification update Milan Paunovic 2024-11-05 13:46:29 +01:00
• 4318f58e22 Merge branch 'dev' Milan Paunovic 2024-11-05 13:44:42 +01:00
• 9d81fa5ba5 - Set the points step to 5 and styled the points slider Dejan 2024-11-04 23:41:42 +01:00
• dbfe7d6e9c Added the reccuring todos that repeat weekly to be created for the next 52 weeks Dejan 2024-11-04 23:32:13 +01:00
• 5beadcce01 Moved color settings to manage my profile Dejan 2024-11-04 23:16:09 +01:00
• ebd6fcbfab - Sorted the users when adding todo Dejan 2024-11-04 22:37:56 +01:00
• 6dc81ae653 fixed some calendar bugs ivic00 2024-11-04 20:58:18 +01:00
• 84a974f3f7 Added notifciations Milan Paunovic 2024-11-04 01:01:59 +01:00
• 848211c3c8 Merge branch 'dev' Milan Paunovic 2024-11-04 00:26:18 +01:00
• a577bfb23f cal sync improvements Milan Paunovic 2024-11-04 00:24:31 +01:00