Commit graph

4477 commits

Author SHA1 Message Date
tibbi
33ab342851 Merge branch 'master' of github.com:SimpleMobileTools/Simple-Calendar 2021-07-19 17:01:09 +02:00
tibbi
45fd604ee9 updating kotlin and commons 2021-07-19 17:00:54 +02:00
tibbi
ea1ea33268 make sure the menu Filter button is visible when appropriate 2021-07-19 16:59:21 +02:00
Tibor Kaputa
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
chaptergy
35558ce0a5
Adds quick filters for event types to the bottom of the screen 2021-07-17 20:45:48 +02:00
tibbi
c99b6f9391 moving the Customize notifications settings button at the Reminders section 2021-07-09 00:24:34 +02:00
tibbi
56f28bdeb6 updating changelog 2021-07-06 23:44:21 +02:00
tibbi
ebd6495348 update version to 6.14.1 2021-07-06 23:44:14 +02:00
tibbi
7e953d1560 updating commons 2021-07-06 23:39:02 +02:00
tibbi
106b5366a5 refresh the weekly view if midnight span setting changes 2021-07-06 14:52:04 +02:00
tibbi
f508d0aaf5 minor code formatting 2021-07-06 14:49:42 +02:00
tibbi
20ce0e6e56 correcting a removed part of the pull request 2021-07-06 14:48:56 +02:00
Tibor Kaputa
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
Tibor Kaputa
d8816d6448
Merge branch 'master' into Events-over-multiple-days 2021-07-06 14:42:27 +02:00
tibbi
77cffa5c64 fix #1406, properly handle dashes at event dates at importing 2021-07-06 14:15:17 +02:00
tibbi
d2be7701f0 formatting some code 2021-07-06 14:14:59 +02:00
tibbi
af02ad76e5 Merge branch 'master' of github.com:SimpleMobileTools/Simple-Calendar 2021-07-05 23:21:11 +02:00
Tibor Kaputa
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
tibbi
9fccbb83b3 Merge branch 'master' of github.com:SimpleMobileTools/Simple-Calendar 2021-07-05 23:08:27 +02:00
Tibor Kaputa
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
tibbi
5e2d38b560 Merge branch 'master' of github.com:SimpleMobileTools/Simple-Calendar 2021-07-05 23:06:46 +02:00
Tibor Kaputa
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
tibbi
8473cafd9c Merge branch 'master' of github.com:SimpleMobileTools/Simple-Calendar 2021-07-05 23:06:07 +02:00
Tibor Kaputa
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
tibbi
2e9aa8116f Merge branch 'master' of github.com:SimpleMobileTools/Simple-Calendar 2021-07-05 23:02:51 +02:00
Tibor Kaputa
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
tibbi
ce9f665400 Merge branch 'master' of github.com:SimpleMobileTools/Simple-Calendar 2021-07-05 22:55:39 +02:00
Tibor Kaputa
d4f741fa9f
Merge pull request #1339 from Honk2/concurrent_events_in_weekview
fix #1332 concurrent zero duration in week view
2021-07-05 22:55:34 +02:00
tibbi
1785017568 updating gradle to 4.2.2 2021-07-05 22:55:30 +02:00
tibbi
3dba6f6776 updating some strings 2021-07-04 18:36:33 +02:00
tibbi
17a698c3ed Revert "removing the Change View string, move it into Commons" 2021-06-29 10:49:22 +02:00
tibbi
30bf7492c2 updating commons and kotlin 2021-06-29 10:48:37 +02:00
tibbi
b6c69d3b52 Merge branch 'master' of github.com:SimpleMobileTools/Simple-Calendar 2021-06-24 14:40:26 +02:00
tibbi
6e318f1c56 removing the Change View string, move it into Commons 2021-06-24 14:39:25 +02:00
Tibor Kaputa
2687110d07
Merge pull request #1404 from Aga-C/master
Updated Polish translation
2021-06-24 14:38:49 +02:00
Agnieszka C
0c2dbc8b11 Updated Polish translation 2021-06-24 11:22:47 +02:00
Bindu
ecbf57ab38 Fix: Events spanning multiple days are only shown on first one 2021-06-21 21:44:31 -07:00
Mathias Schneider
554e9b8013 Rename CATEGORY_COLOR field in ics-export (fix #1396) 2021-06-21 23:04:42 +02:00
Joan
b16219a9be Fixes #1361 2021-06-20 23:28:21 +02:00
Tibor Kaputa
15bf0fb173
Merge pull request #1395 from avtkal/master
Updated Basque translations
2021-06-15 23:45:02 +02:00
Enara Larraitz
2b9dce276c Updated Basque translations 2021-06-15 19:40:12 +02:00
tanvir-ahmod
6ecd48b14c Fix #1387, Change title to "New Event" after using event duplication 2021-06-13 10:49:26 +06:00
tanvir-ahmod
3fcc23a320 Fix #1385, cancel notification and pending intent if event is deleted for future occurrences 2021-06-12 20:26:37 +06:00
Tibor Kaputa
5aa35bfe7a
Merge pull request #1383 from motomoto7/patch-6
Update strings.xml
2021-05-26 19:54:31 +02:00
motomoto7
a200e57b1f
Update strings.xml 2021-05-26 14:18:15 +03:00
Tibor Kaputa
4f9ac31d48
Merge pull request #1380 from 10cents/patch-44
Update strings.xml
2021-05-25 10:13:09 +02:00
10cents
8f5c291cc6
Update strings.xml 2021-05-24 21:08:08 +00:00
Honk2
4d3acb7aa9 Show events spanning midnight in weekview at top (default) or vertical from start time to 2021-05-15 16:53:39 +02:00
tibbi
aa995dab85 updating changelog 2021-05-14 22:58:34 +02:00
tibbi
151e15c93f update version to 6.14.0 2021-05-14 22:58:27 +02:00