 Milan Paunovic
|
c184eb3293
|
adujstments
|
2025-02-16 01:07:12 +01:00 |
|
|
Milan Paunovic
|
d9ee1cd921
|
Merge branch 'dev'
|
2025-02-15 21:08:30 +01:00 |
|
|
Dejan
|
1b5024089d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-02-15 18:40:00 +01:00 |
|
|
Dejan
|
59664488e8
|
Reimplementation of the todo take turns feature to fix issues with only one assignee showing
|
2025-02-15 18:39:54 +01:00 |
|
|
ivic00
|
bb1fb8d8f7
|
default Household name
|
2025-02-15 17:40:42 +01:00 |
|
|
Milan Paunovic
|
b804f37037
|
Merge branch 'dev'
# Conflicts:
# app/_layout.tsx
# firebase/functions/index.js
|
2025-02-15 16:44:45 +01:00 |
|
|
ivic00
|
f649828d80
|
fixes, deleteFamily function, household signup
|
2025-02-15 00:34:42 +01:00 |
|
|
Milan Paunovic
|
718fd562ff
|
cicd adjustment
|
2025-02-14 19:18:01 +01:00 |
|
|
Milan Paunovic
|
a855e6d3bf
|
cicd adjustment
|
2025-02-14 19:16:51 +01:00 |
|
|
Milan Paunovic
|
e04441bd81
|
Calendar controls fix
|
2025-02-14 15:05:42 +01:00 |
|
|
Milan Paunovic
|
f9a5e76162
|
Calendar controls fix
|
2025-02-12 01:11:28 +01:00 |
|
|
Milan Paunovic
|
479e7c5f56
|
Merge branch 'dev'
# Conflicts:
# firebase/functions/index.js
|
2025-02-12 00:43:48 +01:00 |
|
|
ivic00
|
a8957c7ac7
|
birthday through qr, deleteFam function
|
2025-02-12 00:05:39 +01:00 |
|
|
Milan Paunovic
|
3d15d7bb74
|
Functions update
|
2025-02-07 14:12:23 +01:00 |
|
|
ivic00
|
6ada9470c3
|
delete family popups and birthday
|
2025-02-06 22:47:18 +01:00 |
|
|
Milan Paunovic
|
300ce82a4d
|
Functions update
|
2025-02-06 09:44:06 +01:00 |
|
|
Milan Paunovic
|
5ac4526baf
|
Functions update
|
2025-02-06 01:03:34 +01:00 |
|
|
Milan Paunovic
|
5cfec1544a
|
Calendar improvements
|
2025-02-02 22:28:40 +01:00 |
|
|
ivic00
|
e96210986e
|
added birthday input
|
2025-01-28 21:12:08 +01:00 |
|
|
Milan Paunovic
|
0998dc29d0
|
Month fixes
|
2025-01-26 17:15:13 +01:00 |
|
|
Milan Paunovic
|
dc7d59eecc
|
Merge branch 'refs/heads/dev'
|
2025-01-26 16:07:21 +01:00 |
|
|
Milan Paunovic
|
14be80c6f0
|
Fixes
|
2025-01-24 01:12:18 +01:00 |
|
|
Milan Paunovic
|
580104d052
|
Month cal changes
|
2025-01-23 02:16:07 +01:00 |
|
|
ivic00
|
ba3ea5a6d2
|
fixed impossible event dates input
|
2025-01-22 21:41:24 +01:00 |
|
|
Milan Paunovic
|
231e99ff8f
|
Merge branch 'dev'
|
2025-01-19 15:28:00 +01:00 |
|
|
Dejan
|
5333b8cbb7
|
- Reverted the stale time
|
2025-01-18 00:33:10 +01:00 |
|
|
Dejan
|
dcca652019
|
- Improved fetching of events for family device
- Removed fetching events and considering if they're private or not
|
2025-01-18 00:31:48 +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 |
|
|
Milan Paunovic
|
bc77c403f2
|
Month calendar fix
|
2025-01-17 00:39:20 +01:00 |
|
|
Milan Paunovic
|
1d4903b609
|
Merge branch 'dev'
# Conflicts:
# components/pages/calendar/MonthCalendar.tsx
|
2025-01-17 00:26:36 +01:00 |
|
|
ivic00
|
9c3b9b3663
|
fixed issue with pfp in tablet view
|
2025-01-16 15:50:19 +01:00 |
|
|
Milan Paunovic
|
60953c34bc
|
Month calendar
|
2025-01-16 00:22:09 +01:00 |
|
|
Milan Paunovic
|
adafaf1dfe
|
Merge branch 'dev'
|
2025-01-15 17:39:07 +01:00 |
|
|
Dejan
|
0c1bed62d9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-01-15 00:05:17 +01:00 |
|
|
Dejan
|
5b7f54403c
|
- Fixed events not fetching for the family device
|
2025-01-15 00:05:08 +01:00 |
|
|
ivic00
|
81419c0a23
|
minor fixes
|
2025-01-14 20:54:56 +01:00 |
|
|
ivic00
|
74c0369acf
|
added reset password btn
|
2025-01-03 17:26:53 +01:00 |
|
|
Dejan
|
0f07e46a82
|
Merge branch 'dev'
|
2024-12-30 21:01:59 +01:00 |
|
|
Dejan
|
a4e27f9dc8
|
- Changed the upper limit for the todo points charts
|
2024-12-30 20:59:40 +01:00 |
|
|
Dejan
|
6cfb33e227
|
- Todos point logic changes to use the current day for points
|
2024-12-30 20:54:33 +01:00 |
|
|
Dejan
|
2a6357983f
|
- Moved the touching area on the whole grocery card not just on the text
|
2024-12-30 20:49:16 +01:00 |
|
|
Dejan
|
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 |
|
|
Dejan
|
f7dd31cae9
|
- Changed chore terms in the reports pages to todo
|
2024-12-30 18:39:21 +01:00 |
|
|
Dejan
|
141337d2ce
|
- Implemented spending of the saved points
|
2024-12-30 13:20:58 +01:00 |
|
|
Dejan
|
ffe8cc72a1
|
- Sorted the user progress chart by day
|
2024-12-30 12:54:04 +01:00 |
|
|
Dejan
|
239a08d4aa
|
- Todos point logic and User progress UI
|
2024-12-30 12:09:12 +01:00 |
|
|
Milan Paunovic
|
49be903553
|
Patch fix
|
2024-12-30 11:39:48 +03:00 |
|
|
Milan Paunovic
|
8b6171a819
|
Merge remote-tracking branch 'origin/main'
|
2024-12-30 11:37:19 +03:00 |
|
|
Dejan
|
7b809d826c
|
- Todos point logic and Family progress UI
|
2024-12-29 23:01:24 +01:00 |
|
|
Dejan
|
afa1046d02
|
- Fixed incorrect saving of the points per day
|
2024-12-29 21:39:49 +01:00 |
|