338 Commits

Author SHA1 Message Date
c184eb3293 adujstments 2025-02-16 01:07:12 +01:00
d9ee1cd921 Merge branch 'dev' 2025-02-15 21:08:30 +01:00
59664488e8 Reimplementation of the todo take turns feature to fix issues with only one assignee showing 2025-02-15 18:39:54 +01:00
b804f37037 Merge branch 'dev'
# Conflicts:
#	app/_layout.tsx
#	firebase/functions/index.js
2025-02-15 16:44:45 +01:00
f649828d80 fixes, deleteFamily function, household signup 2025-02-15 00:34:42 +01:00
e04441bd81 Calendar controls fix 2025-02-14 15:05:42 +01:00
f9a5e76162 Calendar controls fix 2025-02-12 01:11:28 +01:00
479e7c5f56 Merge branch 'dev'
# Conflicts:
#	firebase/functions/index.js
2025-02-12 00:43:48 +01:00
a8957c7ac7 birthday through qr, deleteFam function 2025-02-12 00:05:39 +01:00
6ada9470c3 delete family popups and birthday 2025-02-06 22:47:18 +01:00
300ce82a4d Functions update 2025-02-06 09:44:06 +01:00
5cfec1544a Calendar improvements 2025-02-02 22:28:40 +01:00
e96210986e added birthday input 2025-01-28 21:12:08 +01:00
0998dc29d0 Month fixes 2025-01-26 17:15:13 +01:00
dc7d59eecc Merge branch 'refs/heads/dev' 2025-01-26 16:07:21 +01:00
14be80c6f0 Fixes 2025-01-24 01:12:18 +01:00
580104d052 Month cal changes 2025-01-23 02:16:07 +01:00
ba3ea5a6d2 fixed impossible event dates input 2025-01-22 21:41:24 +01:00
231e99ff8f Merge branch 'dev' 2025-01-19 15:28:00 +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
2025-01-17 02:00:36 +01:00
bc77c403f2 Month calendar fix 2025-01-17 00:39:20 +01:00
1d4903b609 Merge branch 'dev'
# Conflicts:
#	components/pages/calendar/MonthCalendar.tsx
2025-01-17 00:26:36 +01:00
9c3b9b3663 fixed issue with pfp in tablet view 2025-01-16 15:50:19 +01:00
60953c34bc Month calendar 2025-01-16 00:22:09 +01:00
0c1bed62d9 Merge remote-tracking branch 'origin/dev' into dev 2025-01-15 00:05:17 +01:00
5b7f54403c - Fixed events not fetching for the family device 2025-01-15 00:05:08 +01:00
81419c0a23 minor fixes 2025-01-14 20:54:56 +01:00
74c0369acf added reset password btn 2025-01-03 17:26:53 +01:00
a4e27f9dc8 - Changed the upper limit for the todo points charts 2024-12-30 20:59:40 +01:00
2a6357983f - Moved the touching area on the whole grocery card not just on the text 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
2024-12-30 20:08:06 +01:00
f7dd31cae9 - Changed chore terms in the reports pages to todo 2024-12-30 18:39:21 +01:00
141337d2ce - Implemented spending of the saved points 2024-12-30 13:20:58 +01:00
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
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
1c9f9f865c Phone header fix 2024-12-20 13:43:20 +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