Commit Graph

Select branches

Hide Pull Requests

dev

dp/calendar-sync

dp/google-oauth2

main

matija_changes

reminders

tablet

#1

#2

Mono Color

• 7a7b1902a8 adujstments main Milan Paunovic 2025-02-16 01:09:46 +01:00
• c184eb3293 adujstments Milan Paunovic 2025-02-16 01:07:12 +01:00
• d9ee1cd921 Merge branch 'dev' Milan Paunovic 2025-02-15 21:08:30 +01:00
• 1b5024089d Merge remote-tracking branch 'origin/dev' into dev dev Dejan 2025-02-15 18:40:00 +01:00
• 59664488e8 Reimplementation of the todo take turns feature to fix issues with only one assignee showing Dejan 2025-02-15 18:39:54 +01:00
• bb1fb8d8f7 default Household name ivic00 2025-02-15 17:40:42 +01:00
• b804f37037 Merge branch 'dev' Milan Paunovic 2025-02-15 16:44:45 +01:00
• f649828d80 fixes, deleteFamily function, household signup ivic00 2025-02-15 00:34:42 +01:00
• 718fd562ff cicd adjustment Milan Paunovic 2025-02-14 19:18:01 +01:00
• a855e6d3bf cicd adjustment Milan Paunovic 2025-02-14 19:16:51 +01:00
• e04441bd81 Calendar controls fix Milan Paunovic 2025-02-14 15:05:42 +01:00
• f9a5e76162 Calendar controls fix Milan Paunovic 2025-02-12 01:11:28 +01:00
• 479e7c5f56 Merge branch 'dev' Milan Paunovic 2025-02-12 00:43:48 +01:00
• a8957c7ac7 birthday through qr, deleteFam function ivic00 2025-02-12 00:05:39 +01:00
• 3d15d7bb74 Functions update Milan Paunovic 2025-02-07 14:12:23 +01:00
• 6ada9470c3 delete family popups and birthday ivic00 2025-02-06 22:47:18 +01:00
• 300ce82a4d Functions update Milan Paunovic 2025-02-06 09:44:06 +01:00
• 5ac4526baf Functions update Milan Paunovic 2025-02-06 01:03:34 +01:00
• 5cfec1544a Calendar improvements Milan Paunovic 2025-02-02 22:28:40 +01:00
• e96210986e added birthday input ivic00 2025-01-28 21:12:08 +01:00
• 0998dc29d0 Month fixes Milan Paunovic 2025-01-26 17:15:13 +01:00
• dc7d59eecc Merge branch 'refs/heads/dev' Milan Paunovic 2025-01-26 16:07:21 +01:00
• 14be80c6f0 Fixes Milan Paunovic 2025-01-24 01:12:18 +01:00
• 580104d052 Month cal changes Milan Paunovic 2025-01-23 02:16:07 +01:00
• ba3ea5a6d2 fixed impossible event dates input ivic00 2025-01-22 21:41:24 +01:00
• 231e99ff8f Merge branch 'dev' Milan Paunovic 2025-01-19 15:28:00 +01:00
• 5333b8cbb7 - Reverted the stale time Dejan 2025-01-18 00:33:10 +01:00
• dcca652019 - Improved fetching of events for family device - Removed fetching events and considering if they're private or not Dejan 2025-01-18 00:31:48 +01:00
• 413164128b - Fixed events fetching in family view because there are events that don't have the private field - Implemented marking events as private Dejan 2025-01-17 02:00:36 +01:00
• bc77c403f2 Month calendar fix Milan Paunovic 2025-01-17 00:39:20 +01:00
• 1d4903b609 Merge branch 'dev' Milan Paunovic 2025-01-17 00:26:36 +01:00
• 9c3b9b3663 fixed issue with pfp in tablet view ivic00 2025-01-16 15:50:19 +01:00
• 60953c34bc Month calendar Milan Paunovic 2025-01-16 00:22:09 +01:00
• adafaf1dfe Merge branch 'dev' Milan Paunovic 2025-01-15 17:39:07 +01:00
• 0c1bed62d9 Merge remote-tracking branch 'origin/dev' into dev Dejan 2025-01-15 00:05:17 +01:00
• 5b7f54403c - Fixed events not fetching for the family device Dejan 2025-01-15 00:05:08 +01:00
• 81419c0a23 minor fixes ivic00 2025-01-14 20:54:56 +01:00
• 74c0369acf added reset password btn ivic00 2025-01-03 17:26:53 +01:00
• 0f07e46a82 Merge branch 'dev' Dejan 2024-12-30 21:01:59 +01:00
• a4e27f9dc8 - Changed the upper limit for the todo points charts Dejan 2024-12-30 20:59:40 +01:00
• 6cfb33e227 - Todos point logic changes to use the current day for points Dejan 2024-12-30 20:54:33 +01:00
• 2a6357983f - Moved the touching area on the whole grocery card not just on the text Dejan 2024-12-30 20:49:16 +01:00
• 04d865cce9 - Fixed issue with family device not being able to see todos of the family - Fixed issue with todos not being able to update on family device Dejan 2024-12-30 20:08:06 +01:00
• f7dd31cae9 - Changed chore terms in the reports pages to todo Dejan 2024-12-30 18:39:21 +01:00
• 141337d2ce - Implemented spending of the saved points Dejan 2024-12-30 13:20:58 +01:00
• ffe8cc72a1 - Sorted the user progress chart by day Dejan 2024-12-30 12:54:04 +01:00
• 239a08d4aa - Todos point logic and User progress UI Dejan 2024-12-30 12:09:12 +01:00
• 49be903553 Patch fix Milan Paunovic 2024-12-30 11:39:48 +03:00
• 8b6171a819 Merge remote-tracking branch 'origin/main' Milan Paunovic 2024-12-30 11:37:19 +03:00
• 7b809d826c - Todos point logic and Family progress UI Dejan 2024-12-29 23:01:24 +01:00
• afa1046d02 - Fixed incorrect saving of the points per day Dejan 2024-12-29 21:39:49 +01:00
• ff81570e15 - Rewrote add, edit groceries - Added validation Dejan 2024-12-29 21:10:10 +01:00
• 81d791dd17 - Fixed merge conflicts Dejan 2024-12-29 19:06:38 +01:00
• 42b18856e4 Merge branch 'main' into dev Dejan 2024-12-29 18:59:46 +01:00
• ab7a844bb5 fixed tablet calendar ivic00 2024-12-28 15:53:36 +01:00
• 28110b88cc Merge branch 'dev' Milan Paunovic 2024-12-28 00:57:25 +01:00
• f1869f02f2 - Filtered out todos of deleted users when the Everyone option is selected in the filter Dejan 2024-12-25 22:49:07 +01:00
• c14910447e - Implemented saving of points per week per day for user - Implemented saving of the number of completed todos per user - Changed "To do's" labels to "To Do" Dejan 2024-12-25 22:41:53 +01:00
• 7d3e39b77d Deletion fix Milan Paunovic 2024-12-24 23:19:23 +01:00
• 406f541163 ui changes ivic00 2024-12-24 20:44:30 +01:00
• 609d01b81c Merge branch 'dev' Milan Paunovic 2024-12-24 16:12:36 +01:00
• 10f6616cd0 Deletion fix Milan Paunovic 2024-12-24 16:07:18 +01:00
• 5c6915c23d ui changes, fixes ivic00 2024-12-24 13:03:42 +01:00
• fb9be26e04 Merge remote-tracking branch 'origin/dev' into dev Dejan 2024-12-22 18:31:35 +01:00
• 2c6474007c - Implemented backend logic for saving weekly and all time points for todos Dejan 2024-12-22 18:31:22 +01:00
• 4866dd1b3f - Improved the todo update Dejan 2024-12-22 16:35:31 +01:00
• c93d66d13d Phone header fix Milan Paunovic 2024-12-20 16:38:08 +01:00
• 1c9f9f865c Phone header fix Milan Paunovic 2024-12-20 13:43:20 +01:00
• 00092ae5f8 Merge branch 'dev' Milan Paunovic 2024-12-20 13:28:06 +01:00
• 6972066f91 menu button rework ivic00 2024-12-18 21:22:38 +01:00
• 63699d53f4 Revert "Don't spin on scroll" Milan Paunovic 2024-12-18 17:37:29 +01:00
• e86b2a5950 Don't spin on scroll Milan Paunovic 2024-12-18 17:37:06 +01:00
• 1903e4072c Don't spin on scroll Milan Paunovic 2024-12-18 17:37:00 +01:00
• 8aca8e46db Deleting event fix Milan Paunovic 2024-12-18 17:28:47 +01:00
• b7fd8daddf - Added loading indicators when on groceries and todos, fixed margin issues in the todo page Dejan 2024-12-17 23:33:59 +01:00
• 8b802f492d - Changed the menu grocery label Dejan 2024-12-17 23:22:07 +01:00
• 3d96393972 - Added refetching if the family members when opening My group tab Dejan 2024-12-17 22:08:25 +01:00
• 956628bcb6 - Fixed issue with uploading images for other users Dejan 2024-12-17 21:52:55 +01:00
• 0b56b169a5 Merge remote-tracking branch 'origin/dev' into dev Dejan 2024-12-17 20:15:15 +01:00
• 4b67033aa8 - Implemented optimistic update when completing todos and groceries to avoid delays Dejan 2024-12-17 20:13:51 +01:00
• 3324a2fd6f reorganized calendar page, fixes ivic00 2024-12-17 18:12:47 +01:00
• 79ac1efe63 - Fixed issue with improper creation of Shopping todo Dejan 2024-12-17 12:40:11 +01:00
• 32a718953b - Added todo completed animation when child completes a todo Dejan 2024-12-17 11:31:50 +01:00
• 3564edadf2 - Added null check on household name update Dejan 2024-12-17 09:55:03 +01:00
• f7860a5af8 - Fixed issue with parents not being able to approve groceries Dejan 2024-12-16 23:39:32 +01:00
• 8c28f049f7 - Changed number of weeks when creating recurring todo Dejan 2024-12-16 23:20:10 +01:00
• 003f3717e5 build fix Milan Paunovic 2024-12-16 20:19:44 +01:00
• 0733c25892 Merge remote-tracking branch 'origin/dev' into dev Dejan 2024-12-15 22:44:43 +01:00
• 335905335e -Fixed create todo issues Dejan 2024-12-15 22:44:33 +01:00
• a4bd7920e4 Merge branch 'dev' Milan Paunovic 2024-12-15 22:24:06 +01:00
• 5be4e15885 Merge branch 'dev' of https://github.com/urosran/cally into dev ivic00 2024-12-15 18:53:45 +01:00
• 72aa06ad22 Notifications sorting, modal fixes Milan Paunovic 2024-12-15 18:45:04 +01:00
• 56f37cef94 Merge branch 'dev' Milan Paunovic 2024-12-15 18:25:03 +01:00
• 035f8af84b changed color options, removed cal_sync for fam_device ivic00 2024-12-15 18:11:45 +01:00
• bb68a89cfb Fix stuff Milan Paunovic 2024-12-15 17:57:30 +01:00
• 818107efe3 Fix stuff Milan Paunovic 2024-12-15 17:54:01 +01:00
• b59a8bf97d Merge remote-tracking branch 'origin/dev' into dev Dejan 2024-12-15 17:05:30 +01:00
• 5cafd10f09 - Changed the members dependency check when defining the todo filter options Dejan 2024-12-15 17:05:18 +01:00
• c411990312 Fixes Milan Paunovic 2024-12-15 16:46:26 +01:00
• 70db8bdc0b New calendar Milan Paunovic 2024-12-15 16:29:34 +01:00