2235e1d900
merge resolve
2024-10-31 22:35:32 +01:00
f387f6c0e3
ui tweaks and fixes
2024-10-31 22:30:28 +01:00
ca5df87f3d
Small fixes
2024-10-31 21:28:23 +01:00
fda1287011
Fix first day of week setting
2024-10-31 20:25:58 +01:00
8edb8f47f2
Small fixes, calendar token refresh for google
2024-10-31 19:57:06 +01:00
1b6a241bbe
Add event deletion
2024-10-31 12:01:01 +01:00
37f3d27999
Added react native big calendar patch
2024-10-31 02:35:50 +01:00
01274fcb6d
Merge remote-tracking branch 'origin/dev' into dev
2024-10-31 00:14:08 +01:00
26a7665743
Merge branch 'dev' of https://github.com/urosran/cally into dev
2024-10-30 23:44:49 +01:00
1417ec8f9b
ui fixes
2024-10-30 23:44:37 +01:00
f7c121772a
- Reverted check if start time and end time overlap, caused an issue
2024-10-30 23:37:43 +01:00
06bd141b3c
build nr updt
2024-10-30 03:22:30 +01:00
01338e7c70
Event filtering
2024-10-30 02:41:00 +01:00
7f79a1c819
added confirmation dialogs, fixed scroll wheels ui tweaks
2024-10-30 00:02:25 +01:00
74d82e2029
fixed settings paging, calendar style,
2024-10-29 20:15:20 +01:00
8ba6f7aecf
Merge branch 'main' into dev
2024-10-29 10:33:04 +01:00
b9aa24a0c2
- Take turns implementation for the todos
2024-10-29 00:05:15 +01:00
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
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
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
2c0a8a9392
bugfixes
2024-10-28 09:41:20 +01:00
d6ca7cc630
Merge branch 'dev'
...
# Conflicts:
# ios/cally/Info.plist
2024-10-28 01:27:48 +01:00
059082cf65
bugfixes
2024-10-28 01:27:33 +01:00
7c18fd1d40
Merge remote-tracking branch 'origin/dev' into dev
2024-10-27 20:51:56 +01:00
9ab3f53d09
Fix day circle rendering
2024-10-27 20:51:50 +01:00
33a5b5a595
sign/login ui tweaks
2024-10-27 20:51:38 +01:00
ca40008174
Merge branch 'dev' of https://github.com/urosran/cally into dev
2024-10-27 19:42:19 +01:00
b1f2237155
calendar today highlight
2024-10-27 19:42:11 +01:00
5f09610e5b
- Fixed issue with add grocery item form not closing on close button click
2024-10-27 18:27:18 +01:00
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
3187844b50
- Fixed issue with undefined value for the grocery requested by section
2024-10-27 17:38:09 +01:00
eb04043264
Merge branch 'dev'
2024-10-26 18:40:10 +02:00
b2b1e5d1e4
- Restricted editing of grocery and todo item for children
2024-10-26 15:36:01 +02:00
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
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
e5d39107d1
- Fixed issue with adding new grocery item but without a category always
2024-10-26 14:45:52 +02:00
d064d5c9c2
calendar ui changes
2024-10-26 01:38:19 +02:00
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
04f9e31ce4
- Added the repeat days selected for the created todos in the edit dialog
2024-10-25 12:18:23 +02:00
36ebfc38aa
added tablet view
2024-10-24 21:34:12 +02:00
0b11381fce
- Implemented handling of repeat days change
2024-10-24 20:35:42 +02:00
ae01b9daaf
fix calendar overflow, todo repeat
2024-10-23 21:32:36 +02:00
55f9d326d5
Merge branch 'dev' of https://github.com/urosran/cally into dev
2024-10-22 19:35:06 +02:00
fd6f080e7c
add todo repeat freq
2024-10-22 19:34:59 +02:00
bc54c902d9
Fix adding devices and fetching events
2024-10-22 12:28:43 +02:00
2be5e7c4e4
clear edit event
2024-10-22 10:33:05 +02:00
91d0b050de
Merge branch 'dev'
2024-10-22 01:14:00 +02:00
275b8bcfad
user creation flow fix
2024-10-22 01:12:15 +02:00
0d498829ad
- Added the assignees to the todo item
2024-10-21 20:51:57 +02:00
3add262f84
Merge branch 'dev'
...
# Conflicts:
# ios/cally/Info.plist
2024-10-21 10:05:05 +02:00
