Commit Graph
243 Commits
Author SHA1 Message Date
Milan Paunovic 01274fcb6d Merge remote-tracking branch 'origin/dev' into dev 2024-10-31 00:14:08 +01:00
Milan Paunovic 632ec6cf15 add event invalidation 2024-10-31 00:13:52 +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 f30b7b0155 prebuild update 2024-10-28 10:09:20 +01:00
Milan Paunovic bd25edf501 plist updt 2024-10-28 09:43:47 +01:00
Milan Paunovic 2c0a8a9392 bugfixes 2024-10-28 09:41:20 +01:00
Milan Paunovic 6fede24f89 bugfixes 2024-10-28 01:28:47 +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
Dejan 6a9d446c11 - Added user based access in the todos page and fetched only the todos that are assigned to a child type profile and all the family todos to a parent type profile 2024-10-27 17:30:41 +01:00
Milan Paunovic 5a4e76a841 build nr upd 2024-10-26 19:31:40 +02:00
Milan Paunovic 26d0d32e64 build nr upd 2024-10-26 19:26:50 +02:00
Milan Paunovic 0998b797c3 build nr 2024-10-26 19:24:37 +02:00
Milan Paunovic 95acadce4d plist update 2024-10-26 18:41:52 +02:00
Milan Paunovic eb04043264 Merge branch 'dev' 2024-10-26 18:40:10 +02:00
Dejan c25ddfcdf5 - Fixed an issue with missing id when creating events and unable to update after 2024-10-26 16:04:42 +02:00
Dejan c597e96c20 - FIxed an issue with completing todos 2024-10-26 15:38:54 +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
Dejan 675ecedd86 - Implemented the complete update of recurring todo and handle changing the recurring rule and date 2024-10-26 13:20:31 +02:00
Dejan 5c67ffccbd - Implemented the complete update of recurring todo and handle changing the recurring rule and date 2024-10-26 13:20:09 +02:00
ivic00 d064d5c9c2 calendar ui changes 2024-10-26 01:38:19 +02:00
Dejan 2ec014bcc7 - Implementation of update todo and removing days in the rule for a repeatable todo 2024-10-25 16:49:32 +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 6bb32f3281 - Implemented creation of the repeatable todos for every repeat type 2024-10-24 23:55:49 +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