Commits · master · PIM / KOrganizer

18 Jan, 2022 1 commit

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

Script Kiddy authored Jan 18, 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"

a27d4701

17 Jan, 2022 2 commits
- Fix phonon lib version (qt6 version when necessary) · 26156b02
  Laurent Montel authored Jan 17, 2022
  
  26156b02
- Fix build with GCC 12 (standard attributes in middle of decl-specifiers) · 0c2240f9
  Fabian Vogt authored Jan 17, 2022
```
"static Q_REQUIRED_RESULT foo bar()" -> "Q_REQUIRED_RESULT static foo bar()"
```
  0c2240f9
13 Jan, 2022 1 commit
- Use directly QT_VERSION · e096a853
  Laurent Montel authored Jan 13, 2022
  
  e096a853
10 Jan, 2022 2 commits
- GIT_SILENT: use KDE_INSTALL_KSERVICETYPESDIR for helping to build against qt6 · 27ecd448
  Laurent Montel authored Jan 10, 2022
  
  27ecd448
- Adapt build system for building against qt6 · 1a39b91e
  Laurent Montel authored Jan 10, 2022
  
  1a39b91e
08 Jan, 2022 1 commit
- GIT_SILENT: time to increase version · c6ee451a
  Laurent Montel authored Jan 08, 2022
  
  c6ee451a
06 Jan, 2022 1 commit
- Use SingleMainWindow=true · 45e0830d
  Laurent Montel authored Jan 06, 2022
  
  45e0830d
03 Jan, 2022 1 commit
- GIT_SILENT Update Appstream for new release · cab184a0
  Heiko Becker authored Jan 03, 2022
```
(cherry picked from commit cbdfff33)
```
  cab184a0
02 Jan, 2022 1 commit

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

Script Kiddy authored Jan 02, 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"

7eae8cfd

01 Jan, 2022 1 commit

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

Script Kiddy authored Jan 01, 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"

2d823158

31 Dec, 2021 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 70b2d80d
  Script Kiddy authored Dec 31, 2021
```
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"
```
  70b2d80d
- GIT_SILENT made messages (after extraction) · f9f121a1
  Script Kiddy authored Dec 31, 2021
  
  f9f121a1
30 Dec, 2021 3 commits
- Merge branch 'release/21.12' · de738855
  Allen Winter authored Dec 30, 2021
  
  de738855
- searchdialog.cpp - activateWindow on showEvent for ease-of-use · 8007f156
  Allen Winter authored Dec 30, 2021
```
now the focus is always ready to go in the lineedit
and the searching process is smoother.
```
  8007f156
- SVN_SILENT made messages (.desktop file) - always resolve ours · 66a4450a
  Script Kiddy authored Dec 30, 2021
```
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"
```
  66a4450a
28 Dec, 2021 1 commit

Install a desktop file for korgac · 7437e4bd

Nicolas Fella authored Dec 25, 2021

This is important for showing proper name and icon in the task manager on Wayland.

To avoid clashing with the existing autostart desktop file rename that one in source (but not the installed file)

7437e4bd

26 Dec, 2021 1 commit
- Mark as single-instance using X-GNOME-SingleWindow key · 546ed4c1
  Laurent Montel authored Dec 26, 2021
  
  546ed4c1
25 Dec, 2021 1 commit
- Remove 'Daemon' from application display name · 1774481e
  Nicolas Fella authored Dec 25, 2021
```
Align with the new name for the SNI from 81df5d4e
```
  1774481e
24 Dec, 2021 1 commit

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

Script Kiddy authored Dec 24, 2021

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"

59e8d875

23 Dec, 2021 2 commits
- It's enabled by default in qt6 · 18ead932
  Laurent Montel authored Dec 23, 2021
  
  18ead932
- SVN_SILENT made messages (.desktop file) - always resolve ours · ea499615
  Script Kiddy authored Dec 23, 2021
```
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"
```
  ea499615
22 Dec, 2021 2 commits

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

Script Kiddy authored Dec 22, 2021

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"

5170db7a

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

Script Kiddy authored Dec 22, 2021

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"

1bc367b5

21 Dec, 2021 2 commits
- GIT_SILENT: AA_EnableHighDpiScaling is by default in qt6 now · 9822ba20
  Laurent Montel authored Dec 21, 2021
  
  9822ba20
- GIT_SILENT: show headers in qtc6 · a0f60ab5
  Laurent Montel authored Dec 21, 2021
  
  a0f60ab5
20 Dec, 2021 1 commit

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

Script Kiddy authored Dec 20, 2021

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"

bb7e5db1

16 Dec, 2021 1 commit

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

Script Kiddy authored Dec 16, 2021

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"

64bb6f34

15 Dec, 2021 2 commits
- GIT_SILENT: prepare 5.19.1 · 6454cb63
  Laurent Montel authored Dec 15, 2021
  
  6454cb63
- SVN_SILENT made messages (.desktop file) - always resolve ours · 36a25954
  Script Kiddy authored Dec 15, 2021
```
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"
```
  36a25954
14 Dec, 2021 1 commit

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

Script Kiddy authored Dec 14, 2021

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"

a98b0f61

13 Dec, 2021 2 commits
- GIT_SILENT: time to increase dep · 6b195549
  Laurent Montel authored Dec 13, 2021
  
  6b195549
- SVN_SILENT made messages (.desktop file) - always resolve ours · a46582a0
  Script Kiddy authored Dec 13, 2021
```
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"
```
  a46582a0
12 Dec, 2021 4 commits
- Do not install desktop file for KPart · 0ea5a793
  Alexander Lohnau authored Dec 11, 2021 and Luigi Toscano committed Dec 12, 2021
```
The part gets loaded using the library name that is specified in the metadata.
```
  0ea5a793
- Remove now unneeded desktop files · cbbac2fe
  Alexander Lohnau authored Dec 11, 2021 and Luigi Toscano committed Dec 12, 2021
  
  cbbac2fe
- Remove now unneeded desktop to json conversion code · a704de1c
  Alexander Lohnau authored Dec 11, 2021 and Luigi Toscano committed Dec 12, 2021
```
Task: https://phabricator.kde.org/T14564
```
  a704de1c
- Convert desktop files to JSON · 00bd70c2
  Alexander Lohnau authored Dec 11, 2021 and Luigi Toscano committed Dec 12, 2021
```
Task: https://phabricator.kde.org/T14564
```
  00bd70c2
11 Dec, 2021 2 commits
- Use Alarm::parentUid instead of the ETM specific custom property hack · 6ce7b5ce
  Volker Krause authored Dec 06, 2021
```
Made possible and neccessary by akonadi-calendar!10.
```
  6ce7b5ce
- GIT_SILENT Update Appstream for new release · e56c71fb
  Albert Astals Cid authored Dec 09, 2021
```
(cherry picked from commit 01703d38)
```
  e56c71fb
10 Dec, 2021 1 commit
- GIT_SILENT: prepare 21.12.1 · 4b92e148
  Laurent Montel authored Dec 10, 2021
  
  4b92e148