Commit graph

6251 commits

Author SHA1 Message Date
Naveen Singh
cdab56e660
Merge branch 'SimpleMobileTools:master' into recurring_event_edit_fix 2023-06-15 23:17:26 +05:30
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
Tibor Kaputa
ba383f3226
Merge pull request #2100 from hbread00/china-holiday
Add China holiday 2021-2023
2023-06-08 17:49:09 +02:00
Bread
3f76ced2f8 Update china.ics
add 2023 holiday
2023-06-03 18:43:57 +08:00
Bread
9ee22ba8a4 Update china.ics
add 2022 holiday
2023-06-03 18:29:02 +08:00
Bread
9a95c8dc54 Update china.ics
add 2021 holiday
2023-06-03 18:24:50 +08:00
Agnieszka C
93b36ba750 Added missing settings in backup 2023-05-29 19:03:30 +02:00
Naveen
75ffedca81
Avoid shifting start, end times when switching calendars 2023-05-29 05:32:18 +05:30
Naveen
2d33c1f8f0
Properly handle Update all occurrences option
Closes https://github.com/SimpleMobileTools/Simple-Calendar/issues/981

The events were moved forward because the start and end timestamps from the repeating occurrence were saved instead of the original start and end times.

The call to `eventsHelper.addEventRepeatLimit()` was removed because I believe it was added there by mistake and the changes were overwritten anyways due to the next call to `eventsHelper.updateEvent()`. Another reason to remove it is to avoid triggering a CalDAV update which may interfere with the event update.
2023-05-29 04:49:57 +05:30
Tibor Kaputa
dea55ca94c
Merge pull request #2085 from weblate/weblate-simple-mobile-tools-simple-calendar
Translations update from Hosted Weblate
2023-05-22 23:18:41 +02:00
nelath
24713a8351 Fixed recurring event repetition exception issue 2023-05-22 13:09:13 +02:00
J. Lavoie
77d7e97847
Translated using Weblate (Italian)
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/it/
2023-05-22 09:52:28 +02:00
J. Lavoie
5376b73e28
Translated using Weblate (French)
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/fr/
2023-05-22 09:52:27 +02:00
Tibor Kaputa
18e004bf7a
Merge pull request #2083 from weblate/weblate-simple-mobile-tools-simple-calendar
Translations update from Hosted Weblate
2023-05-18 23:02:42 +02:00
Alexander Gabilondo
351bce185c
Translated using Weblate (Basque)
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/eu/
2023-05-18 22:54:35 +02:00
Milo Ivir
0f87d54ccb
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-05-18 22:54:34 +02:00
Alexander Gabilondo
6aeff3f050
Translated using Weblate (Basque)
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/eu/
2023-05-18 22:54:34 +02:00
Tibor Kaputa
023dcaf47b
Merge pull request #2078 from spkprs/patch-35
Update strings.xml
2023-05-18 15:59:39 +02:00
Tibor Kaputa
ac11ff31b4
Merge pull request #2079 from weblate/weblate-simple-mobile-tools-simple-calendar
Translations update from Hosted Weblate
2023-05-18 15:59:26 +02:00
Tibor Kaputa
6e03103ba3
Update strings.xml 2023-05-18 15:59:10 +02:00
Priit Jõerüüt
d0bc1f753b
Translated using Weblate (Estonian)
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/et/
2023-05-18 14:41:29 +02:00
FTno
466cc0eab2
Translated using Weblate (Norwegian Bokmål)
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/nb_NO/
2023-05-18 14:41:29 +02:00
tryvseu
2d51d82e1c
Translated using Weblate (Norwegian Nynorsk)
Currently translated at 93.7% (15 of 16 strings)

Translation: Simple Mobile Tools/Simple Calendar metadata
Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-calendar-metadata/nn/
2023-05-18 14:41:29 +02:00
tryvseu
01330f0f49
Translated using Weblate (Norwegian Nynorsk)
Currently translated at 92.2% (227 of 246 strings)

Translation: Simple Mobile Tools/Simple Calendar
Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-calendar/nn/
2023-05-18 14:41:29 +02:00
Anonymous
9bd65e8259
Translated using Weblate (Norwegian Nynorsk)
Currently translated at 100.0% (0 of 0 strings)

Translation: Simple Mobile Tools/Simple Calendar
Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-calendar/nn/
2023-05-18 14:41:29 +02:00
en2sv
3d073b0e72
Translated using Weblate (Swedish)
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/sv/
2023-05-18 14:41:29 +02:00
Sergio Marques
ed6188d4ef
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-05-18 14:41:29 +02:00
J. Lavoie
6f50188115
Translated using Weblate (Italian)
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/it/
2023-05-18 14:41:29 +02:00
J. Lavoie
0eb5a8005c
Translated using Weblate (French)
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/fr/
2023-05-18 14:41:29 +02:00
tryvseu
09737d15dc
Added translation using Weblate (Norwegian Nynorsk) 2023-05-18 14:41:29 +02:00
Tibor Kaputa
9771c504ba
Merge pull request #2053 from evan-goode/master
Don't set EXDATE on recurrence exceptions
2023-05-18 14:41:22 +02:00
Tibor Kaputa
5257af0803
Merge branch 'master' into master 2023-05-18 14:40:35 +02:00
spkprs
2156b43a5a
Update strings.xml 2023-05-14 18:46:58 +03:00
tibbi
d268c2910e updating changelog 2023-05-12 09:39:01 +02:00
tibbi
dfc122942e update version to 6.21.9 2023-05-12 09:38:53 +02:00
Tibor Kaputa
ae96ffdaa0
Merge pull request #2075 from weblate/weblate-simple-mobile-tools-simple-calendar
Translations update from Hosted Weblate
2023-05-12 09:33:51 +02:00