Commit Graph

444 Commits

Author SHA1 Message Date
ffe8cc72a1 - Sorted the user progress chart by day 2024-12-30 12:54:04 +01:00
239a08d4aa - Todos point logic and User progress UI 2024-12-30 12:09:12 +01:00
7b809d826c - Todos point logic and Family progress UI 2024-12-29 23:01:24 +01:00
afa1046d02 - Fixed incorrect saving of the points per day 2024-12-29 21:39:49 +01:00
ff81570e15 - Rewrote add, edit groceries
- Added validation
2024-12-29 21:10:10 +01:00
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
f1869f02f2 - Filtered out todos of deleted users when the Everyone option is selected in the filter 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"
2024-12-25 22:41:53 +01:00
7d3e39b77d Deletion fix 2024-12-24 23:19:23 +01:00
406f541163 ui changes 2024-12-24 20:44:30 +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
fb9be26e04 Merge remote-tracking branch 'origin/dev' into dev 2024-12-22 18:31:35 +01:00
2c6474007c - Implemented backend logic for saving weekly and all time points for todos 2024-12-22 18:31:22 +01:00
4866dd1b3f - Improved the todo update 2024-12-22 16:35:31 +01:00
c93d66d13d Phone header fix 2024-12-20 16:38:08 +01:00
1c9f9f865c Phone header fix 2024-12-20 13:43:20 +01:00
00092ae5f8 Merge branch 'dev' 2024-12-20 13:28:06 +01:00
6972066f91 menu button rework 2024-12-18 21:22:38 +01:00
63699d53f4 Revert "Don't spin on scroll"
This reverts commit 1903e4072c.
2024-12-18 17:37:29 +01:00
e86b2a5950 Don't spin on scroll 2024-12-18 17:37:06 +01:00
1903e4072c Don't spin on scroll 2024-12-18 17:37:00 +01:00
8aca8e46db Deleting event fix 2024-12-18 17:28:47 +01:00
b7fd8daddf - Added loading indicators when on groceries and todos, fixed margin issues in the todo page 2024-12-17 23:33:59 +01:00
8b802f492d - Changed the menu grocery label 2024-12-17 23:22:07 +01:00
3d96393972 - Added refetching if the family members when opening My group tab 2024-12-17 22:08:25 +01:00
956628bcb6 - Fixed issue with uploading images for other users 2024-12-17 21:52:55 +01:00
0b56b169a5 Merge remote-tracking branch 'origin/dev' into dev 2024-12-17 20:15:15 +01:00
4b67033aa8 - Implemented optimistic update when completing todos and groceries to avoid delays 2024-12-17 20:13:51 +01:00
3324a2fd6f reorganized calendar page, fixes 2024-12-17 18:12:47 +01:00
79ac1efe63 - Fixed issue with improper creation of Shopping todo 2024-12-17 12:40:11 +01:00
32a718953b - Added todo completed animation when child completes a todo 2024-12-17 11:31:50 +01:00
3564edadf2 - Added null check on household name update 2024-12-17 09:55:03 +01:00
f7860a5af8 - Fixed issue with parents not being able to approve groceries 2024-12-16 23:39:32 +01:00
8c28f049f7 - Changed number of weeks when creating recurring todo 2024-12-16 23:20:10 +01:00
003f3717e5 build fix 2024-12-16 20:19:44 +01:00
0733c25892 Merge remote-tracking branch 'origin/dev' into dev 2024-12-15 22:44:43 +01:00
335905335e -Fixed create todo issues 2024-12-15 22:44:33 +01:00
a4bd7920e4 Merge branch 'dev' 2024-12-15 22:24:06 +01:00
5be4e15885 Merge branch 'dev' of https://github.com/urosran/cally into dev 2024-12-15 18:53:45 +01:00
72aa06ad22 Notifications sorting, modal fixes 2024-12-15 18:45:04 +01:00
56f37cef94 Merge branch 'dev' 2024-12-15 18:25:03 +01:00
035f8af84b changed color options, removed cal_sync for fam_device 2024-12-15 18:11:45 +01:00
bb68a89cfb Fix stuff 2024-12-15 17:57:30 +01:00
818107efe3 Fix stuff 2024-12-15 17:54:01 +01:00
b59a8bf97d Merge remote-tracking branch 'origin/dev' into dev 2024-12-15 17:05:30 +01:00
5cafd10f09 - Changed the members dependency check when defining the todo filter options 2024-12-15 17:05:18 +01:00