Commit Graph

5350 Commits

Author SHA1 Message Date
cdac81966e Merge pull request #1423 from ltGuillaume/patch-1
Dutch
2021-07-26 23:05:44 +02:00
33b1464ce9 Merge pull request #1422 from Aga-C/master
Updated Polish translation
2021-07-26 23:05:34 +02:00
20a1ee2432 Dutch 2021-07-26 22:59:13 +02:00
13cbabb398 Updated Polish translation 2021-07-26 22:05:55 +02:00
a0bd5ac8e6 Merge pull request #1421 from spkprs/patch-17
Update strings.xml
2021-07-26 21:22:53 +02:00
53bbd8b945 Update strings.xml 2021-07-26 22:19:44 +03:00
81f391bd14 adding some new strings for CalDAV event statuses 2021-07-25 22:43:47 +02:00
db29f52d85 Merge pull request #1419 from Fatih-BaKeR/patch-6
Update strings.xml
2021-07-23 12:13:44 +02:00
d10fa58d23 Update strings.xml 2021-07-23 07:04:47 +03:00
2551b850d4 Merge pull request #1417 from Aga-C/master
Few more updates for Polish translation
2021-07-20 22:24:13 +02:00
af05f89092 Updated Polish translation 2021-07-20 12:28:20 +02:00
5a117abe11 Merge pull request #1416 from Aga-C/master
Updated Polish translation
2021-07-20 09:43:04 +02:00
7e8508e717 Updated Polish translation 2021-07-20 09:21:53 +02:00
58482fd25b Merge pull request #1415 from solokot/master
Updated Russian language
2021-07-19 19:24:31 +02:00
b7d275ddaa Merge pull request #1414 from ltGuillaume/patch-1
Dutch
2021-07-19 19:24:26 +02:00
c8b8801698 Merge pull request #1413 from spkprs/patch-16
Update strings.xml
2021-07-19 19:24:20 +02:00
80ef56716a Updated Russian language 2021-07-19 19:33:19 +03:00
9c7c76b8f9 Dutch 2021-07-19 18:31:08 +02:00
e83935557a Update strings.xml 2021-07-19 19:16:50 +03:00
b5c159b57c make the inactive quick filter items a bit higher 2021-07-19 17:21:24 +02:00
d966b325f3 show the event type quick filter in the settings only if more are available 2021-07-19 17:18:49 +02:00
c57148a1bb adding a string for the new quick event type filter at the bottom of the screen 2021-07-19 17:14:18 +02:00
88c8eda863 adding some quick filter related changes 2021-07-19 17:09:50 +02:00
33ab342851 Merge branch 'master' of github.com:SimpleMobileTools/Simple-Calendar 2021-07-19 17:01:09 +02:00
45fd604ee9 updating kotlin and commons 2021-07-19 17:00:54 +02:00
ea1ea33268 make sure the menu Filter button is visible when appropriate 2021-07-19 16:59:21 +02:00
c776a78b46 Merge pull request #1412 from chaptergy/quick-event-type-filters
Adds quick filters for event types to the bottom of the screen
2021-07-19 16:57:38 +02:00
35558ce0a5 Adds quick filters for event types to the bottom of the screen 2021-07-17 20:45:48 +02:00
c99b6f9391 moving the Customize notifications settings button at the Reminders section 2021-07-09 00:24:34 +02:00
56f28bdeb6 updating changelog 6.14.1 2021-07-06 23:44:21 +02:00
ebd6495348 update version to 6.14.1 2021-07-06 23:44:14 +02:00
7e953d1560 updating commons 2021-07-06 23:39:02 +02:00
106b5366a5 refresh the weekly view if midnight span setting changes 2021-07-06 14:52:04 +02:00
f508d0aaf5 minor code formatting 2021-07-06 14:49:42 +02:00
20ce0e6e56 correcting a removed part of the pull request 2021-07-06 14:48:56 +02:00
676978a3c5 Merge pull request #1377 from Honk2/Events-over-multiple-days
implements Events over multiple days #1241
2021-07-06 14:43:04 +02:00
d8816d6448 Merge branch 'master' into Events-over-multiple-days 2021-07-06 14:42:27 +02:00
77cffa5c64 fix #1406, properly handle dashes at event dates at importing 2021-07-06 14:15:17 +02:00
d2be7701f0 formatting some code 2021-07-06 14:14:59 +02:00
af02ad76e5 Merge branch 'master' of github.com:SimpleMobileTools/Simple-Calendar 2021-07-05 23:21:11 +02:00
c16fdcf33b Merge pull request #1400 from vbh/fix-1398
Fix: Events spanning multiple days are only shown on first one
2021-07-05 23:21:07 +02:00
9fccbb83b3 Merge branch 'master' of github.com:SimpleMobileTools/Simple-Calendar 2021-07-05 23:08:27 +02:00
971b8b390a Merge pull request #1393 from tanvir-ahmod/fix_1385
Fix #1385, cancel notification and pending intent if event is deleted
2021-07-05 23:08:22 +02:00
5e2d38b560 Merge branch 'master' of github.com:SimpleMobileTools/Simple-Calendar 2021-07-05 23:06:46 +02:00
0d0b701ef4 Merge pull request #1394 from tanvir-ahmod/fix_1387
Fix #1387, Change title to "New Event" after using event duplication
2021-07-05 23:06:42 +02:00
8473cafd9c Merge branch 'master' of github.com:SimpleMobileTools/Simple-Calendar 2021-07-05 23:06:07 +02:00
4d3c82a470 Merge pull request #1397 from breadsanta/master
Fixes #1361, properly showing events from the next month
2021-07-05 23:06:02 +02:00
2e9aa8116f Merge branch 'master' of github.com:SimpleMobileTools/Simple-Calendar 2021-07-05 23:02:51 +02:00
e3b1a2c45f Merge pull request #1399 from evilthiesje/master
Rename CATEGORY_COLOR field in ics-export (fix #1396)
2021-07-05 23:02:46 +02:00
ce9f665400 Merge branch 'master' of github.com:SimpleMobileTools/Simple-Calendar 2021-07-05 22:55:39 +02:00