Commits · master · Volker Krause / Akonadi Calendar

14 Jun, 2022 2 commits
- GIT_SILENT: time to increase version · 13425fdc
  Laurent Montel authored Jun 14, 2022
  
  13425fdc
- SVN_SILENT made messages (.desktop file) - always resolve ours · f8ad573b
  Script Kiddy authored Jun 14, 2022
```
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
```
  f8ad573b
13 Jun, 2022 2 commits
- Add "Remind in 1 hour" option · 77443d46
  David Faure authored Jun 07, 2022 and Carl Schwan committed Jun 13, 2022
  
  77443d46
- SVN_SILENT made messages (.desktop file) - always resolve ours · 74ca4607
  Script Kiddy authored Jun 13, 2022
```
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
```
  74ca4607
10 Jun, 2022 1 commit
- GIT_SILENT: coding style · b9fdbb04
  Laurent Montel authored Jun 10, 2022
  
  b9fdbb04
07 Jun, 2022 3 commits
- Merge branch 'release/22.04' · 8d8efe04
  David Faure authored Jun 07, 2022
  
  8d8efe04
- SVN_SILENT made messages (.desktop file) - always resolve ours · 4ac29feb
  Script Kiddy authored Jun 07, 2022
```
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
```
  4ac29feb
- SVN_SILENT made messages (.desktop file) - always resolve ours · 3ebdba31
  Script Kiddy authored Jun 07, 2022
```
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
```
  3ebdba31
06 Jun, 2022 1 commit
- Search plugin in pim<version> · 47e33947
  Laurent Montel authored Jun 06, 2022
  
  47e33947
04 Jun, 2022 1 commit
- add missing connect for the "Dismiss" action · e1b7964a
  Martin Koller authored Jun 04, 2022
```
BUG: 453567
```
  e1b7964a
01 Jun, 2022 2 commits

Carl Schwan authored May 15, 2022



Log them instead of crashin

BUG: 453395
Signed-off-by: Carl Schwan <carl@carlschwan.eu>


(cherry picked from commit 939d98bf)

c9999701

Handle empty incidence · 939d98bf

Carl Schwan authored May 15, 2022



Log them instead of crashin

BUG: 453395
Signed-off-by: Carl Schwan <carl@carlschwan.eu>

939d98bf

31 May, 2022 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · 0f23fce0

Script Kiddy authored May 31, 2022

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

0f23fce0

SVN_SILENT made messages (.desktop file) - always resolve ours · e89f31c4

Script Kiddy authored May 31, 2022

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

e89f31c4

29 May, 2022 1 commit
- Explicitly link against KConfigCore · 2dd1d81c
  Volker Krause authored May 29, 2022
```
This is used but no longer brought in indirectly with KF deprecation level
5.94.
```
  2dd1d81c
26 May, 2022 1 commit
- Make it compile without deprecated methods · e628b078
  Laurent Montel authored May 26, 2022
  
  e628b078
22 May, 2022 1 commit

Don't make notifications for already ended events persistent · 29a74cd1

Volker Krause authored May 19, 2022

This affects both events that had already ended on startup as well as
active notifications while an event ended. Those are then still present
but are only listed in the notification panel after some time, putting
the focus more strongly on the upcoming/current reminders.

Reminders related to tasks are not affected by this.

# Conflicts:
#	reminder-daemon/alarmnotification.cpp

29a74cd1

20 May, 2022 1 commit
- Add translation context for the "Dismiss" action · be3c95e8
  Volker Krause authored May 20, 2022
```
Should help with fixing the misleading German translation of this.

CCBUG: 452264
```
  be3c95e8
18 May, 2022 1 commit
- Merge remote-tracking branch 'origin/release/22.04' · 79689531
  Volker Krause authored May 18, 2022
  
  79689531
16 May, 2022 1 commit
- GIT_SILENT: time to increase version · 80154e6f
  Laurent Montel authored May 16, 2022
  
  80154e6f
15 May, 2022 1 commit
- Set the Bugzilla product/component in the reminder daemon about data · 064a95fe
  Volker Krause authored May 15, 2022
```
This is used by KCrash/drkonqi to route crash reports to the right place.
```
  064a95fe
13 May, 2022 1 commit
- GIT_SILENT: prepare 22.04.2 · 7f1790f0
  Laurent Montel authored May 13, 2022
  
  7f1790f0
12 May, 2022 1 commit
- GIT_SILENT: prepare to 22.04.2 · 69a9e15f
  Laurent Montel authored May 12, 2022
  
  69a9e15f
10 May, 2022 1 commit
- Use Akonadi::CollectionUtils::fromIndex() · e46a70e8
  Volker Krause authored May 10, 2022
```
Replaces a local implementation.
```
  e46a70e8
07 May, 2022 1 commit

Move CalendarSupport::displayName to Akonadi::CalendarUtils · 6ff3aca3

Volker Krause authored Apr 28, 2022 and

Laurent Montel committed May 07, 2022

Similar to the previous move of other utility methods, this is to prepare
for EventViews::TodoModle to move, which would be desirable for Kalendar.

Code is unchanged apart from the export macro.

6ff3aca3

04 May, 2022 2 commits
- Remove duplicate header between header cpp file · df58a9a7
  Laurent Montel authored May 04, 2022
  
  df58a9a7
- don't store url when it's not valid · 95150f52
  Laurent Montel authored May 04, 2022
  
  95150f52
03 May, 2022 2 commits
- GIT_SILENT: compile fine without deprecated kf5.94 method · 6178d619
  Laurent Montel authored May 03, 2022
  
  6178d619
- GIT_SILENT: exclude .xml file · 167ab65f
  Laurent Montel authored May 03, 2022
  
  167ab65f
27 Apr, 2022 1 commit
- GIT_SILENT: mark as executable · 292fc1ba
  Laurent Montel authored Apr 27, 2022
  
  292fc1ba
26 Apr, 2022 3 commits
- GIT_SILENT: Add test CI support · 4350865e
  Laurent Montel authored Apr 26, 2022
  
  4350865e
- SVN_SILENT made messages (.desktop file) - always resolve ours · 49a54c5b
  Script Kiddy authored Apr 26, 2022
```
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
```
  49a54c5b
- SVN_SILENT made messages (.desktop file) - always resolve ours · b50bad00
  Script Kiddy authored Apr 26, 2022
```
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
```
  b50bad00
24 Apr, 2022 1 commit
- GIT_SILENT: prepare 5.20.1 · 9ca051d0
  Laurent Montel authored Apr 24, 2022
  
  9ca051d0
22 Apr, 2022 1 commit
- GIT_SILENT: prepare 5.20.1 · 5f668c7f
  Laurent Montel authored Apr 22, 2022
  
  5f668c7f
20 Apr, 2022 1 commit

Unify calendar item access utility methods · 8e23c893

Volker Krause authored Apr 20, 2022

Those were spread out over the implementation here, and they exist as
public API in calendarsupport. Make those public API here instead.

8e23c893

19 Apr, 2022 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · 3e9c3aa9

Script Kiddy authored Apr 19, 2022

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

3e9c3aa9

SVN_SILENT made messages (.desktop file) - always resolve ours · 913b0f66

Script Kiddy authored Apr 19, 2022

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

913b0f66

16 Apr, 2022 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · cf74c793

Script Kiddy authored Apr 16, 2022

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

cf74c793

SVN_SILENT made messages (.desktop file) - always resolve ours · f8914366

Script Kiddy authored Apr 16, 2022

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

f8914366