Commit Graph

6286 Commits

Author SHA1 Message Date
Naveen
ae70a3f5f8 Minor readability improvement 2023-06-29 16:26:46 +05:30
Tibor Kaputa
5f856d7164 Merge pull request #2077 from WessellUrdata/sunday-fix
Fixing getDatesWeekDateTime (closes Issue #1894)
2023-06-29 12:45:42 +02:00
tibbi
a4761f45e6 update some views on the main thread 2023-06-25 21:09:41 +02:00
Tibor Kaputa
8d27660671 Merge pull request #2126 from Naveen3Singh/fix_edit_future_occurrences
Properly handle `Update/Delete this and all future occurrences`
2023-06-25 20:51:41 +02:00
Naveen
3830e849d6 Add comment 2023-06-24 20:10:56 +05:30
Naveen
fe09a937ec Delete original event to avoid duplication 2023-06-24 19:42:13 +05:30
Naveen
05084ea330 Properly handle repeating tasks 2023-06-24 18:49:56 +05:30
Naveen
04cc2b5371 Merge remote-tracking branch 'origin/fix_edit_future_occurrences' into fix_edit_future_occurrences 2023-06-24 16:04:26 +05:30
Naveen
acff39740e Properly count occurrences 2023-06-24 16:04:10 +05:30
Naveen Singh
ff8e5fd7a9 Merge branch 'SimpleMobileTools:master' into fix_edit_future_occurrences 2023-06-24 15:42:30 +05:30
Naveen
46e17aa697 Properly handle repeat limits
Fixes these issues:
 - When choosing `Update/Delete this and all future occurrences`, the selected occurrence is never deleted/updated.
 - When choosing `Update this and all future occurrences`, the event is duplicated on the date of the selection
2023-06-24 15:42:08 +05:30
tibbi
e153f6c578 replacing jcenter with mavenCentral 2023-06-23 10:21:58 +02:00
Tibor Kaputa
ee4634aa5a Merge pull request #2125 from weblate/weblate-simple-mobile-tools-simple-calendar
Translations update from Hosted Weblate
2023-06-23 10:12:07 +02:00
Adrian Wahyudi
144e8ba4b8 Translated using Weblate (Indonesian)
Currently translated at 100.0% (246 of 246 strings)

Translation: Simple Mobile Tools/Simple Calendar
Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-calendar/id/
2023-06-23 09:40:39 +02:00
Naveen
d0f88c1099 End repetition on the original date
The bug:
 - Create a recurring event with a specific number of occurrences like 10 that starts on Jan 1
 - Edit some occurrence e.g. 5th and select "Update this and future occurrences only"
 - The edited event (5th) keeps repeating 10 times instead of ending on the end date of the original event (10th Jan). This is not consistent with other calendars (except nextcloud).

 The fix:
 Count the occurrence number starting from the first event and subtract it from the total number of repetitions before saving the event
2023-06-20 05:56:47 +05:30
Tibor Kaputa
861bb423c5 Merge pull request #2120 from weblate/weblate-simple-mobile-tools-simple-calendar
Translations update from Hosted Weblate
2023-06-18 20:42:55 +02:00
Tibor Kaputa
0c95eb4787 Merge pull request #2116 from Naveen3Singh/recurring_event_edit_fix
Properly handle `Update the selected occurrence only`
2023-06-18 20:42:23 +02:00
Tibor Kaputa
e55ee2019b Merge pull request #2119 from weblate/weblate-simple-mobile-tools-simple-calendar
Translations update from Hosted Weblate
2023-06-18 20:41:58 +02:00
Priit Jõerüüt
a94f6a62fb Translated using Weblate (Estonian)
Currently translated at 100.0% (16 of 16 strings)

Translation: Simple Mobile Tools/Simple Calendar metadata
Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-calendar-metadata/et/
2023-06-18 20:41:51 +02:00
Tibor Kaputa
e072ac43aa Merge pull request #2118 from Naveen3Singh/recurring_event_fix_735
Properly handle deleting `Delete the selected occurrence only`
2023-06-18 20:41:47 +02:00
Naveen Singh
55fd21ad65 Merge branch 'SimpleMobileTools:master' into recurring_event_fix_735 2023-06-19 00:05:21 +05:30
Naveen Singh
ad363e6c72 Merge branch 'SimpleMobileTools:master' into recurring_event_edit_fix 2023-06-19 00:05:13 +05:30
Priit Jõerüüt
6ec608f86e Translated using Weblate (Estonian)
Currently translated at 100.0% (16 of 16 strings)

Translation: Simple Mobile Tools/Simple Calendar metadata
Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-calendar-metadata/et/
2023-06-18 19:16:58 +02:00
Tibor Kaputa
ec73c4b1c3 Merge pull request #2115 from T0mstone/reminder-fix
Fix repeating event reminder
2023-06-18 19:16:54 +02:00
Naveen
0ba02b9051 Delete deleted CalDAV exception events 2023-06-18 20:23:35 +05:30
Naveen
cd432b9ea6 Delete deleted CalDAV exception events on sync 2023-06-18 19:59:39 +05:30
Naveen
180c7e0b59 Minor readability improvement 2023-06-16 04:12:37 +05:30
Naveen
6ede34c70e Properly handle converting all-day recurring events to normal events 2023-06-16 04:09:26 +05:30
Naveen
f475879408 Properly handle deleting Delete the selected occurrence only
Closes https://github.com/SimpleMobileTools/Simple-Calendar/issues/735

This only happened with all-day recurring events because:
 - `ORIGINAL_INSTANCE_TIME` was not set to a UTC occurrence timestamp and and all-day events always deal in UTC.
 - The `DTSTART`, `DTEND` were set to invalid values because of a missing conversion to milliseconds of start, end timestamps
2023-06-16 03:39:07 +05:30
Naveen
3b0cec263f Properly handle converting all-day recurring events to normal events 2023-06-16 03:02:01 +05:30
Naveen
5ca7a67d61 Delete child tasks when parent task is deleted 2023-06-16 00:07:18 +05:30
Naveen
dbfa1880b7 Code readability improvement 2023-06-15 23:51:10 +05:30
Naveen
13019e6835 Check title before adding event to db 2023-06-15 23:34:10 +05:30
Naveen Singh
cdab56e660 Merge branch 'SimpleMobileTools:master' into recurring_event_edit_fix 2023-06-15 23:17:26 +05:30
T0mstone
fd58c8517d Fix repeating event reminder 2023-06-15 17:04:42 +02:00
Naveen
6fe938632b Properly handle Update the selected occurrence only
Previously, if an event was modified using some other client then the exception event's parent id was ignored or overwritten with 0 at sync and that means the parent and child events were disconnected locally. Deleting the parent event did not delete the child event.

If a recurrence was modified using Simple Calendar then it was disconnected from it's parent event both locally and on the server because `ORIGINAL_ID` and `ORIGINAL_INSTANCE_TIME` was not specified. On top of that, another exception event was created to make sure the parent event doesn't show up on the date of the disconnected child event.

This change fixes these two issues.
2023-06-15 01:06:56 +05:30
Tibor Kaputa
80540f1afe Merge pull request #2112 from weblate/weblate-simple-mobile-tools-simple-calendar
Translations update from Hosted Weblate
2023-06-14 21:31:59 +02:00
Eric
17e69273bc Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (246 of 246 strings)

Translation: Simple Mobile Tools/Simple Calendar
Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-calendar/zh_Hans/
2023-06-14 14:48:47 +02:00
Sergio Marques
2345d33250 Translated using Weblate (Portuguese)
Currently translated at 100.0% (246 of 246 strings)

Translation: Simple Mobile Tools/Simple Calendar
Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-calendar/pt/
2023-06-13 09:49:44 +02:00
Tibor Kaputa
4ad1b2cf81 Merge pull request #2110 from weblate/weblate-simple-mobile-tools-simple-calendar
Translations update from Hosted Weblate
2023-06-12 18:04:31 +02:00
Eric
2eb04aaa2d Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (246 of 246 strings)

Translation: Simple Mobile Tools/Simple Calendar
Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-calendar/zh_Hans/
2023-06-12 05:50:00 +02:00
tibbi
824865af11 updating commons 2023-06-10 15:40:33 +02:00
Tibor Kaputa
28349e8e4a Merge pull request #2092 from weblate/weblate-simple-mobile-tools-simple-calendar
Translations update from Hosted Weblate
2023-06-08 17:54:33 +02:00
Макар Разин
0f3e2f16e7 Translated using Weblate (Belarusian)
Currently translated at 100.0% (246 of 246 strings)

Translation: Simple Mobile Tools/Simple Calendar
Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-calendar/be/
2023-06-08 17:53:51 +02:00
Milo Ivir
519d13fc3f Translated using Weblate (Croatian)
Currently translated at 100.0% (246 of 246 strings)

Translation: Simple Mobile Tools/Simple Calendar
Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-calendar/hr/
2023-06-08 17:53:51 +02:00
Kryštof Černý
4c832e5eaa Translated using Weblate (Czech)
Currently translated at 100.0% (246 of 246 strings)

Translation: Simple Mobile Tools/Simple Calendar
Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-calendar/cs/
2023-06-08 17:53:51 +02:00
gallegonovato
fa9a5844c1 Translated using Weblate (Spanish)
Currently translated at 100.0% (246 of 246 strings)

Translation: Simple Mobile Tools/Simple Calendar
Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-calendar/es/
2023-06-08 17:53:50 +02:00
Tibor Kaputa
de48e387b2 Merge pull request #2086 from nelath/master
Fixed recurring event repetition exception issue
2023-06-08 17:53:46 +02:00
Tibor Kaputa
b476e71ec6 Merge pull request #2093 from Naveen3Singh/recurring_event_fix_981
Properly handle `Update all occurrences` option
2023-06-08 17:52:44 +02:00
Tibor Kaputa
82c947543c Merge pull request #2094 from Aga-C/add-missing-settings
Added missing settings in backup
2023-06-08 17:49:51 +02:00