ivic00
e3084a70a7
added pfp to tablet view
2024-11-10 13:53:19 +01:00
ivic00
6dc09ee448
changes to tablet detection and more
2024-11-03 18:39:32 +01:00
ivic00
8f5477bebb
Merge branch 'dev' into tablet
2024-11-03 17:10:12 +01:00
ivic00
b35871aed8
added Feedback page, added braindump backend
2024-11-02 22:31:19 +01:00
Milan Paunovic
cc2defe154
Minor changes
2024-11-01 04:45:43 +01:00
Milan Paunovic
37529c454e
Added ask your family message
2024-11-01 04:38:42 +01:00
Milan Paunovic
909a4344dc
Profile picture upload added, QR code scan fix
2024-11-01 04:34:59 +01:00
Milan Paunovic
0fbf89644f
Merge remote-tracking branch 'origin/dev' into dev
...
# Conflicts:
# components/pages/settings/CalendarSettingsPage.tsx
2024-11-01 03:20:51 +01:00
Milan Paunovic
7f68f3acf8
New onboarding flow, calendar sync logic refactor
2024-11-01 03:18:50 +01:00
Dejan
a08b924cf1
Merge remote-tracking branch 'origin/dev' into dev
2024-11-01 01:23:51 +01:00
Dejan
b52c9cb74f
- Redesigned the calendar settings page and connecting, disconnecting and syncing calendars, fixed issues with syncing
2024-11-01 01:23:28 +01:00
ivic00
e690e3b47a
Merge branch 'dev' of https://github.com/urosran/cally into dev
2024-11-01 01:12:25 +01:00
ivic00
94d3b5fffd
ui fixes, added delete account confirmation
2024-11-01 01:12:19 +01:00
Milan Paunovic
539cbd9f10
Minor fixes
2024-10-31 23:41:54 +01:00
ivic00
641d65a736
fixed Platform import
2024-10-31 22:37:29 +01:00
ivic00
2235e1d900
merge resolve
2024-10-31 22:35:32 +01:00
ivic00
f387f6c0e3
ui tweaks and fixes
2024-10-31 22:30:28 +01:00
Milan Paunovic
ca5df87f3d
Small fixes
2024-10-31 21:28:23 +01:00
Milan Paunovic
fda1287011
Fix first day of week setting
2024-10-31 20:25:58 +01:00
Milan Paunovic
8edb8f47f2
Small fixes, calendar token refresh for google
2024-10-31 19:57:06 +01:00
Milan Paunovic
1b6a241bbe
Add event deletion
2024-10-31 12:01:01 +01:00
Milan Paunovic
37f3d27999
Added react native big calendar patch
2024-10-31 02:35:50 +01:00
Milan Paunovic
01274fcb6d
Merge remote-tracking branch 'origin/dev' into dev
2024-10-31 00:14:08 +01:00
ivic00
26a7665743
Merge branch 'dev' of https://github.com/urosran/cally into dev
2024-10-30 23:44:49 +01:00
ivic00
1417ec8f9b
ui fixes
2024-10-30 23:44:37 +01:00
Dejan
f7c121772a
- Reverted check if start time and end time overlap, caused an issue
2024-10-30 23:37:43 +01:00
Milan Paunovic
06bd141b3c
build nr updt
2024-10-30 03:22:30 +01:00
Milan Paunovic
01338e7c70
Event filtering
2024-10-30 02:41:00 +01:00
ivic00
7f79a1c819
added confirmation dialogs, fixed scroll wheels ui tweaks
2024-10-30 00:02:25 +01:00
ivic00
74d82e2029
fixed settings paging, calendar style,
2024-10-29 20:15:20 +01:00
Milan Paunovic
8ba6f7aecf
Merge branch 'main' into dev
2024-10-29 10:33:04 +01:00
Dejan
b9aa24a0c2
- Take turns implementation for the todos
2024-10-29 00:05:15 +01:00
Dejan
7771f397b6
- Added validation to not allow end time to be before start time on add and edit event
2024-10-28 21:01:12 +01:00
Dejan
c234a6260a
- Removed the grocery item check box for all other profile types besides parent
...
- Allowed for all profile types to create new todos
2024-10-28 20:26:44 +01:00
Dejan
45747747dd
- Removed the grocery item check box for all other profile types besides parent
...
- Allowed for all profile types to create new todos
- Modified the fetch todos query to fetch all the assigned and created by for child type of profiles
2024-10-28 20:26:37 +01:00
Milan Paunovic
2c0a8a9392
bugfixes
2024-10-28 09:41:20 +01:00
Milan Paunovic
d6ca7cc630
Merge branch 'dev'
...
# Conflicts:
# ios/cally/Info.plist
2024-10-28 01:27:48 +01:00
Milan Paunovic
059082cf65
bugfixes
2024-10-28 01:27:33 +01:00
Milan Paunovic
7c18fd1d40
Merge remote-tracking branch 'origin/dev' into dev
2024-10-27 20:51:56 +01:00
Milan Paunovic
9ab3f53d09
Fix day circle rendering
2024-10-27 20:51:50 +01:00
ivic00
33a5b5a595
sign/login ui tweaks
2024-10-27 20:51:38 +01:00
ivic00
ca40008174
Merge branch 'dev' of https://github.com/urosran/cally into dev
2024-10-27 19:42:19 +01:00
ivic00
b1f2237155
calendar today highlight
2024-10-27 19:42:11 +01:00
Dejan
5f09610e5b
- Fixed issue with add grocery item form not closing on close button click
2024-10-27 18:27:18 +01:00
Dejan
e863b0c38e
- Fixed issue with grocery edit not closing, reverted to the category resolving solution(fuzzy search categories), added check button for saving the grocery after editing, made code improvemnets around the groceries page
2024-10-27 18:23:29 +01:00
Dejan
3187844b50
- Fixed issue with undefined value for the grocery requested by section
2024-10-27 17:38:09 +01:00
Milan Paunovic
eb04043264
Merge branch 'dev'
2024-10-26 18:40:10 +02:00
Dejan
b2b1e5d1e4
- Restricted editing of grocery and todo item for children
2024-10-26 15:36:01 +02:00
Dejan
731af8a3b8
- Added the profile image or the initials if profile picture is missing to the grocery item
2024-10-26 14:58:44 +02:00
Dejan
c7e2dcfdf9
- Removed the pending grocery items check and decline buttons for every other types of profiles besides the parent profile
2024-10-26 14:53:33 +02:00
ivic00