Commit Graph

4835 Commits

Author SHA1 Message Date
tibbi fe686dac3a updating commons once again 2021-10-11 18:10:52 +02:00
tibbi 4de1b7df37 updating commons 2021-10-11 18:05:03 +02:00
Tibor Kaputa c56daacbf1
Merge pull request #1506 from 0x8664b2/fix-fr-stringfile
Escape fr loc string correctly
2021-10-11 18:00:04 +02:00
0x8664b2 725d0b7d1b Escape loc string correctly 2021-10-11 08:02:31 -07:00
Tibor Kaputa aa8522ee3d
Merge pull request #1503 from Fatih-BaKeR/patch-8
Update Turkish strings.xml
2021-10-11 09:47:21 +02:00
Tibor Kaputa 5a7494cfac
Merge pull request #1504 from ltGuillaume/patch-1
Dutch
2021-10-11 09:47:10 +02:00
Tibor Kaputa fab877f31e
Merge pull request #1505 from solokot/master
Updated Russian translation
2021-10-11 09:47:02 +02:00
solokot ac43737adc
Updated Russian translation 2021-10-11 09:20:59 +03:00
Guillaume 2400e06df1
Dutch 2021-10-11 03:25:01 +02:00
Fatih Fırıncı 6a3802420e
Update strings.xml 2021-10-11 03:37:42 +03:00
Tibor Kaputa cf246a43b4
Merge pull request #1502 from xarich/patch-1
Update strings.xml for french
2021-10-11 00:08:53 +02:00
xarich 224f5274e3
Update strings.xml
Review of last changes
2021-10-10 23:14:22 +02:00
Tibor Kaputa 0388e2871e
Merge pull request #1501 from spkprs/patch-19
Update strings.xml
2021-10-10 22:02:25 +02:00
spkprs 6866e70e79
Update strings.xml 2021-10-10 22:34:50 +03:00
Tibor Kaputa 674abe7cb0
Merge pull request #1500 from Aga-C/polish-translation
Updated Polish translation
2021-10-10 18:34:33 +02:00
Agnieszka C 7832e0c232 Updated Polish translation 2021-10-10 18:29:35 +02:00
tibbi b54c6588b8 make the checkbox at importing events from .ics files clearer 2021-10-10 17:50:42 +02:00
Tibor Kaputa 37b9d2bf35
Merge pull request #1499 from Unpublished/patch-1
Fix build
2021-10-10 16:58:13 +02:00
Unpublished fa8bf30d4c
Fix build 2021-10-10 15:54:34 +02:00
Tibor Kaputa bc01a3282c
Merge pull request #1497 from Aur36/patch-2
Update french translation
2021-10-10 15:06:52 +02:00
Tibor Kaputa f81aae1302
escaping an apostrophe 2021-10-10 15:06:44 +02:00
Tibor Kaputa c1e486b25d
Merge pull request #1498 from solokot/master
Updated Russian translation
2021-10-10 15:06:22 +02:00
solokot 04eef1123b
Updated Russian translation 2021-10-10 15:53:23 +03:00
Aur36 0995a870ba
Update french translation 2021-10-10 10:50:55 +02:00
Tibor Kaputa f8432690af
Merge pull request #1495 from ltGuillaume/patch-1
Dutch
2021-10-09 23:03:54 +02:00
Tibor Kaputa f5bd7abde6
Merge pull request #1496 from spkprs/patch-18
Update strings.xml
2021-10-09 23:03:48 +02:00
spkprs c7490507a7
Update strings.xml 2021-10-09 23:53:34 +03:00
Guillaume 31901e5374
Dutch 2021-10-09 22:46:38 +02:00
Tibor Kaputa 90ee856fe9
Merge pull request #1493 from Aga-C/polish-translation
Updated Polish translation
2021-10-09 21:58:28 +02:00
Agnieszka C f2016bb821 Updated Polish translation 2021-10-09 21:55:39 +02:00
tibbi 4cf2f57f44 tweaking some code related to starting weekly view with current day 2021-10-09 20:47:18 +02:00
Tibor Kaputa f0b4a0a029
Merge pull request #1491 from 0x8664b2/issue/1212
Start the weekly view with the current date
2021-10-09 20:41:01 +02:00
tibbi 752c355e67 uploading the 31 icon 2021-10-08 19:04:56 +02:00
tibbi df91643754 do not allow customizing colors locally only of caldav calendars 2021-10-08 19:04:48 +02:00
Tibor Kaputa cb4de8b390
Merge pull request #1486 from KryptKode/fix/caldav-colors
fix updating event type colors for caldav events
2021-10-08 19:00:00 +02:00
0x8664b2 3eaeb4bb39 Extract static string into resource file. 2021-10-07 10:07:55 -07:00
0x8664b2 feb70ef96d Start the weekly view with the current date 2021-10-06 14:19:57 -07:00
darthpaul 528e0878bf properly update event type color
- before updating the color, check if the color has a key
- if it does, we update the CALENDAR_COLOR_KEY column (which will also update the CALENDAR_COLOR column internally)
- if it does not have a key (ie, if it is not a defined color), we update the CALENDAR_COLOR column and set the CALENDAR_COLOR_KEY to empty string
- one note here is that transparent color (0) is not usually a defined color and setting CALENDAR_COLOR to 0 can cause some Calendar apps (like Google Calendar) to convert this to black color (#FF00000).
2021-10-06 12:51:38 +01:00
darthpaul 52c22e2a98 remove @Ignore from color field 2021-09-30 16:36:07 +01:00
darthpaul 57fe6796ab fix updating event type colors for caldav events
- add color field to Event class so it's included in the computation for hashCode, hashCode is used to determine when to update events
2021-09-30 15:38:39 +01:00
Tibor Kaputa 155da25db6
Merge pull request #1485 from KryptKode/feat/add-reminder-on-holiday-import
Show reminder dialog on importing holidays
2021-09-30 15:48:58 +02:00
darthpaul c1b57ac4e5 Show reminder dialog on importing holidays 2021-09-28 22:19:37 +01:00
tibbi cd8d66bb21 updating commons, kotlin, gradle 2021-09-27 10:35:13 +02:00
tibbi ae966ae884 do not allow closing the Upgraded from Free dialog by clicking outside it 2021-09-26 20:33:43 +02:00
tibbi a5eb04552d updating changelog 2021-09-26 19:00:14 +02:00
tibbi ac480c352e update version to 6.15.2 2021-09-26 19:00:07 +02:00
tibbi 03bbf71652 do notremoving some unnecessary calls at changing visible weekly days count 2021-09-26 16:19:14 +02:00
tibbi 3572deadd6 updating commons 2021-09-26 00:18:33 +02:00
Tibor Kaputa accc4ec8ce
Merge pull request #1479 from KryptKode/feat/weeklyview-drag-drop
feat/weeklyview drag drop
2021-09-25 23:38:36 +02:00
darthpaul 7689295ea0 fix dragged view disappears if drop is cancelled 2021-09-25 22:05:30 +01:00