Commits · master · SDK / Dolphin Plugins

05 Jan, 2022 1 commit

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

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

3f28929a

04 Jan, 2022 3 commits
- Remove unneeded QOverload for QProcess::finished signal · 0fa050b9
  Alexander Lohnau authored Jan 03, 2022
```
By excluding deprecated API, the signal is no longer overloaded

Task: https://phabricator.kde.org/T14370
```
  0fa050b9
- Build without KF and Qt deprecations · 1a4f24c9
  Alexander Lohnau authored Jan 03, 2022
  
  1a4f24c9
- Bump KF5 min version & define KDE_COMPILERSETTINGS_LEVEL · fe44eaea
  Alexander Lohnau authored Jan 03, 2022
```
This is what dolphin currently requires
```
  fe44eaea
03 Jan, 2022 1 commit
- GIT_SILENT Update Appstream for new release · 0c0dea0a
  Heiko Becker authored Jan 03, 2022
```
(cherry picked from commit d2385b03)
```
  0c0dea0a
02 Jan, 2022 1 commit

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

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"

083de375

01 Jan, 2022 1 commit

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

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"

1ed03882

31 Dec, 2021 1 commit

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

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"

c8641bfe

23 Dec, 2021 1 commit

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

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"

13b59e57

22 Dec, 2021 1 commit

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

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"

a5604793

21 Dec, 2021 1 commit

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

Script Kiddy authored Dec 21, 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"

90a78b0e

20 Dec, 2021 1 commit

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

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"

e9683032

19 Dec, 2021 1 commit

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

Script Kiddy authored Dec 19, 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"

98c944fa

18 Dec, 2021 2 commits

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

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

d40903ce

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

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

fb014c6c

17 Dec, 2021 1 commit

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

Script Kiddy authored Dec 17, 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"

79e9ddd4

14 Dec, 2021 2 commits
- Use lower-case UDID · 9aeabb57
  Kai Uwe Broulik authored Dec 14, 2021
```
Solid always returns them lower-case for some reason [1],
is it because of RFC 4122? :-)

[1] unmaintained/kdelibs@dd62877f
```
  9aeabb57
- [Mount ISO Action] Allow mounting generic disk images · e319551d
  Kai Uwe Broulik authored Jan 18, 2021
  
  e319551d
09 Dec, 2021 1 commit
- GIT_SILENT Update Appstream for new release · 8165f4c2
  Albert Astals Cid authored Dec 09, 2021
```
(cherry picked from commit 6afaccad)
```
  8165f4c2
28 Nov, 2021 2 commits
- Add GitLab CI · 131f5e1a
  Nicolas Fella authored Nov 28, 2021
  
  131f5e1a
- Remove arcconfig file · 5a73d5d3
  Nicolas Fella authored Nov 28, 2021
```
We don't use Phabricator any more
```
  5a73d5d3
10 Nov, 2021 3 commits
- Fix clazy-non-pod-global-static warning · ff6247ad
  Elvis Angelaccio authored Nov 10, 2021
```
tableHeader is only used in the constructor, so there is no reason to
have it global.
```
  ff6247ad
- Add missing this receiver · ac988af1
  Elvis Angelaccio authored Nov 10, 2021
  
  ac988af1
- Fix clazy range-loop-detach warning · f2253180
  Elvis Angelaccio authored Nov 10, 2021
  
  f2253180
08 Nov, 2021 1 commit
- GIT_SILENT Upgrade release service version to 22.03.70. · 49e5335c
  Heiko Becker authored Nov 08, 2021
  
  49e5335c
31 Oct, 2021 1 commit
- GIT_SILENT Update Appstream for new release · a5d0bf70
  Heiko Becker authored Oct 31, 2021
```
(cherry picked from commit 678c0fc4)
```
  a5d0bf70
09 Oct, 2021 1 commit

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

Script Kiddy authored Oct 09, 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"

551a0f75

04 Oct, 2021 1 commit
- GIT_SILENT Update Appstream for new release · 405f8b3a
  Heiko Becker authored Oct 05, 2021
```
(cherry picked from commit 58a3f8ff)
```
  405f8b3a
20 Sep, 2021 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · ffcc33db
  Script Kiddy authored Sep 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"
```
  ffcc33db
- GIT_SILENT made messages (after extraction) · 96a9c58a
  Script Kiddy authored Sep 20, 2021
  
  96a9c58a
31 Aug, 2021 1 commit

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

Script Kiddy authored Aug 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"

ffad27d6

29 Aug, 2021 1 commit

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

Script Kiddy authored Aug 29, 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"

61aeb2e7

27 Aug, 2021 1 commit
- GIT_SILENT Update Appstream for new release · d1169984
  Heiko Becker authored Aug 27, 2021
```
(cherry picked from commit 9ea4d122)
```
  d1169984
20 Aug, 2021 1 commit

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

Script Kiddy authored Aug 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"

04ae4bf6

14 Aug, 2021 1 commit
- GIT_SILENT made messages (after extraction) · a0a4b6f3
  Script Kiddy authored Aug 14, 2021
  
  a0a4b6f3
04 Aug, 2021 2 commits
- GIT_SILENT Update Appstream for new release · f51b2242
  Heiko Becker authored Aug 05, 2021
```
(cherry picked from commit 6faa9763)
```
  f51b2242
- SVN_SILENT made messages (.desktop file) - always resolve ours · eeaceab4
  Script Kiddy authored Aug 04, 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"
```
  eeaceab4
28 Jul, 2021 1 commit

Clean up unneeded JSON parameter in kcoreaddons_add_plugin · 81a72bf8

Alexander Lohnau authored Jul 28, 2021

The moc process already rebuilds the plugin when the JSON file changes, consequently the additional parameter is not needed.

Task: https://phabricator.kde.org/T14649

81a72bf8

26 Jul, 2021 1 commit

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

Script Kiddy authored Jul 26, 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"

773e4b23

21 Jul, 2021 1 commit

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

Script Kiddy authored Jul 21, 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"

9ac2c247