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
Dejan
e5d39107d1
- Fixed issue with adding new grocery item but without a category always
2024-10-26 14:45:52 +02:00
ivic00
d064d5c9c2
calendar ui changes
2024-10-26 01:38:19 +02:00
Dejan
f35033f5e7
- Fixed an issue with the Tod dialog
...
- Implementation of update todo and adding new days in the rule for a repeatable todo
2024-10-25 14:04:13 +02:00
Dejan
04f9e31ce4
- Added the repeat days selected for the created todos in the edit dialog
2024-10-25 12:18:23 +02:00
Dejan
0b11381fce
- Implemented handling of repeat days change
2024-10-24 20:35:42 +02:00
ivic00
ae01b9daaf
fix calendar overflow, todo repeat
2024-10-23 21:32:36 +02:00
ivic00
55f9d326d5
Merge branch 'dev' of https://github.com/urosran/cally into dev
2024-10-22 19:35:06 +02:00
ivic00
fd6f080e7c
add todo repeat freq
2024-10-22 19:34:59 +02:00
Milan Paunovic
bc54c902d9
Fix adding devices and fetching events
2024-10-22 12:28:43 +02:00
Milan Paunovic
2be5e7c4e4
clear edit event
2024-10-22 10:33:05 +02:00
Milan Paunovic
91d0b050de
Merge branch 'dev'
2024-10-22 01:14:00 +02:00
Milan Paunovic
275b8bcfad
user creation flow fix
2024-10-22 01:12:15 +02:00
Dejan
0d498829ad
- Added the assignees to the todo item
2024-10-21 20:51:57 +02:00
Milan Paunovic
3add262f84
Merge branch 'dev'
...
# Conflicts:
# ios/cally/Info.plist
2024-10-21 10:05:05 +02:00
Milan Paunovic
6ff324f988
PFP fix
2024-10-21 10:03:30 +02:00
Milan Paunovic
a8eb2ff48b
Added pfp images
2024-10-21 04:19:19 +02:00
Milan Paunovic
64ee7b38ac
Fix gradient, splash screens
2024-10-21 02:59:48 +02:00
Dejan
f6dc0a62fb
- Fixed an issue with opening the add and edit dialog in the todos page
2024-10-20 20:59:37 +02:00
Dejan
709b333ee1
- Implemented assigning todos
2024-10-20 20:45:09 +02:00
Dejan
206ffd5a88
- Implemented connecting multiple accounts for apple
2024-10-20 19:34:15 +02:00
Dejan
be28266696
- Implemented connecting multiple accounts for microsoft
2024-10-20 19:16:48 +02:00
Milan Paunovic