Commits · master · Plasma / KHotkeys

21 Sep, 2020 2 commits
- Update version number for 5.20.80 · 5bfb000e
  Bhushan Shah authored Sep 21, 2020
```
GIT_SILENT
```
  5bfb000e
- SVN_SILENT made messages (.desktop file) - always resolve ours · 7bf69b23
  Script Kiddy authored Sep 21, 2020
```
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"
```
  7bf69b23
17 Sep, 2020 3 commits
- Update version number for 5.19.90 · 1a53b728
  Bhushan Shah authored Sep 17, 2020
```
GIT_SILENT
```
  1a53b728
- Update qt5 version requirement to 5.15.0 · 38192f6f
  Bhushan Shah authored Sep 17, 2020
```
GIT_SILENT
```
  38192f6f
- Update kf5 version requirement to 5.74 · 04a39a8b
  Bhushan Shah authored Sep 17, 2020
```
GIT_SILENT
```
  04a39a8b
16 Sep, 2020 1 commit
- Remove explicit ECM_KDE_MODULE_DIR · 629f7a1a
  Laurent Montel authored Sep 16, 2020
  
  629f7a1a
11 Sep, 2020 1 commit

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

Script Kiddy authored Sep 11, 2020

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"

052f6f9d

08 Sep, 2020 1 commit

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

Script Kiddy authored Sep 08, 2020

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"

dfb4de3a

06 Aug, 2020 1 commit

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

Script Kiddy authored Aug 06, 2020

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"

40ae3868

21 Jul, 2020 2 commits

Revert "let KRun do its job in peace" · 8ba8a29c

Nate Graham authored Jul 21, 2020

This reverts commit 1d60f46f.

It caused https://bugs.kde.org/show_bug.cgi?id=424112

BUG: 424112
CCMAIL: martin.sandsmark@kde.org

8ba8a29c

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

Script Kiddy authored Jul 21, 2020

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"

788b1f17

10 Jul, 2020 1 commit

Set a display names for our actions · 52f4f8dd

David Redondo authored Jul 10, 2020

Otherwise it will be the name of whatever process runs the code for example
KDE Daemon or system settings.

52f4f8dd

04 Jul, 2020 14 commits
- Fix build · 52af3fdb
  Martin Tobias Holmedahl Sandsmark authored May 26, 2020
  
  52af3fdb
- port away from kstandarddirs · b265047c
  Martin Tobias Holmedahl Sandsmark authored May 26, 2020
  
  b265047c
- more minor cleanups · 3d544f5f
  Martin Tobias Holmedahl Sandsmark authored May 26, 2020
  
  3d544f5f
- port WindowDefinitionListDialog away from kdialog · 6ffb4fe4
  Martin Tobias Holmedahl Sandsmark authored May 26, 2020
  
  6ffb4fe4
- port WindowDefinitionDialog away from kdialog · 460f6750
  Martin Tobias Holmedahl Sandsmark authored May 26, 2020
  
  460f6750
- port export dialog away from kdialog · 96174caa
  Martin Tobias Holmedahl Sandsmark authored May 26, 2020
  
  96174caa
- port edit gesture dialog away from kdialog · 5e8ce7d0
  Martin Tobias Holmedahl Sandsmark authored May 26, 2020
  
  5e8ce7d0
- port away from kurl · 746a5655
  Martin Tobias Holmedahl Sandsmark authored May 26, 2020
  
  746a5655
- minor cleanups · 5908c7b8
  Martin Tobias Holmedahl Sandsmark authored May 26, 2020
  
  5908c7b8
- port away from KShortcut · 7c75f15a
  Martin Tobias Holmedahl Sandsmark authored May 26, 2020
  
  7c75f15a
- minor cleanup · 675ab36a
  Martin Tobias Holmedahl Sandsmark authored May 25, 2020
  
  675ab36a
- some cleanup · 8c091585
  Martin Tobias Holmedahl Sandsmark authored May 25, 2020
  
  8c091585
- fix wonky connection · f42a8446
  Martin Tobias Holmedahl Sandsmark authored May 25, 2020
  
  f42a8446
- let KRun do its job in peace · 1d60f46f
  Martin Tobias Holmedahl Sandsmark authored May 25, 2020
  
  1d60f46f
18 Jun, 2020 1 commit

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

Script Kiddy authored Jun 18, 2020

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"

6629094b

17 Jun, 2020 1 commit

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

Script Kiddy authored Jun 17, 2020

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"

e16f16f6

17 May, 2020 1 commit
- GIT_SILENT: we don't use phabricator now · a7b71b9c
  Laurent Montel authored May 17, 2020
  
  a7b71b9c
14 May, 2020 2 commits
- Update version number for 5.19.80 · f7b26797
  Jonathan Riddell authored May 14, 2020
```
GIT_SILENT
```
  f7b26797
- Update version number for 5.18.90 · 90a6e1c9
  Jonathan Riddell authored May 14, 2020
```
GIT_SILENT
```
  90a6e1c9
02 May, 2020 1 commit

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

Script Kiddy authored May 02, 2020

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"

9be02c2d

23 Apr, 2020 2 commits
- Port khotkeys to KIO's ApplicationLauncherJob & CommandLauncherJob · 9b4759c7
  David Faure authored Apr 23, 2020
  
  9b4759c7
- Launch qdbusviewer with CommandLauncherJob. Tested, works. · 3aacb79a
  David Faure authored Apr 23, 2020
  
  3aacb79a
13 Apr, 2020 1 commit

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

Script Kiddy authored Apr 13, 2020

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"

8e1961be

06 Apr, 2020 1 commit

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

Script Kiddy authored Apr 06, 2020

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"

0000a8ae

05 Apr, 2020 1 commit

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

Script Kiddy authored Apr 05, 2020

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"

8b7f3d1e

04 Apr, 2020 1 commit

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

Script Kiddy authored Apr 04, 2020

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"

8b502fe6

02 Apr, 2020 1 commit
- bump to require Qt 5.14 · d4545e28
  Jonathan Riddell authored Apr 02, 2020
  
  d4545e28
27 Mar, 2020 1 commit

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

Script Kiddy authored Mar 27, 2020

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"

414e87e7