Commits · b229b65d25a159b5731a527151136f2acda512c7 · Plasma / Bluedevil

08 Mar, 2018 7 commits
- Add newline at end of file · b229b65d
  Friedrich W. H. Kossebau authored Mar 08, 2018
  
  b229b65d
- Do not use Qt module include · bb53d6ac
  Friedrich W. H. Kossebau authored Mar 08, 2018
  
  bb53d6ac
- Merge applet package's /code subdir into /ui subdir · dba0d174
  Friedrich W. H. Kossebau authored Mar 08, 2018
```
--warning
```
  dba0d174
- Remove unneeded moc include · 7a8cf23e
  Friedrich W. H. Kossebau authored Mar 08, 2018
  
  7a8cf23e
- Use KF5_MIN_VERSION also for ECM, now that it's part of KF · ae135401
  Friedrich W. H. Kossebau authored Mar 08, 2018
  
  ae135401
- Require KDE Frameworks 5.42 and Qt 5.9 · 58c50cd0
  Friedrich W. H. Kossebau authored Mar 08, 2018
  
  58c50cd0
- Bump min cmake version to 3.0, move cmake_minimum_required to begin · c65d5125
  Friedrich W. H. Kossebau authored Mar 08, 2018
  
  c65d5125
03 Mar, 2018 1 commit

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

Script Kiddy authored Mar 03, 2018

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"

1c5f4233

28 Feb, 2018 1 commit
- Add explicit includes to fix build with Qt 5.11 · b7b894c9
  Fabian Vogt authored Feb 28, 2018
  
  b7b894c9
13 Feb, 2018 2 commits
- Revert "Update version number for 5.12.1" · cd47c7c9
  Jonathan Esk-Riddell authored Feb 13, 2018
```
This reverts commit 23d48b34.
```
  cd47c7c9
- Update version number for 5.12.1 · 23d48b34
  Jonathan Esk-Riddell authored Feb 13, 2018
```
GIT_SILENT
```
  23d48b34
12 Feb, 2018 4 commits
- Merge branch 'Plasma/5.12' · 3f5006e2
  Kai Uwe Broulik authored Feb 12, 2018
  
  3f5006e2
- Use Qt.openUrlExternally instead of Kio · 52d19502
  Kai Uwe Broulik authored Feb 12, 2018
```
No need to import a separate module for this.

Differential Revision: https://phabricator.kde.org/D10397
```
  52d19502
- Use plasmoid.icon instead of Logic.icon() · 2c5de6e1
  Kai Uwe Broulik authored Feb 12, 2018
```
Avoid creating an instance of logic.js which is not a singleton.

Differential Revision: https://phabricator.kde.org/D10395
```
  2c5de6e1
- DeviceMonitor: Remove saving/restoring blocked state · ef9ec476
  David Rosca authored Feb 12, 2018
```
It is handled by systemd for some time now and this only conflicts with it.
```
  ef9ec476
01 Feb, 2018 1 commit
- Update version number for 5.12.0 · cf859eb9
  Bhushan Shah authored Feb 01, 2018
```
GIT_SILENT
```
  cf859eb9
15 Jan, 2018 2 commits
- Update version number for 5.12.80 · 492b2936
  Jonathan Esk-Riddell authored Jan 15, 2018
```
GIT_SILENT
```
  492b2936
- Update version number for 5.11.95 · 575416c2
  Jonathan Esk-Riddell authored Jan 15, 2018
```
GIT_SILENT
```
  575416c2
10 Jan, 2018 1 commit

kio_obexftp: avoid duplicate slash when storing file stat · c9558516

Ludger Dreier authored Jan 10, 2018 and

David Rosca committed Jan 10, 2018

Check if url already ends in slash ("/"). Insert slash between folder
name and filename only if folder url does not end in slash.

BUG: 388626
FIXED-IN: 5.12.0

c9558516

28 Dec, 2017 1 commit
- GIT_SILENT made messages (after extraction) · bef67363
  Script Kiddy authored Dec 28, 2017
  
  bef67363
20 Dec, 2017 1 commit

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

Script Kiddy authored Dec 20, 2017

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"

12530abb

18 Dec, 2017 1 commit

[Bluetooth applet] Allow copying device details to clipboard · 50132dc4

Kai Uwe Broulik authored Dec 18, 2017

This allows to copy the contents of details labels, like device address to the clipboard.

Differential Revision: https://phabricator.kde.org/D9364

50132dc4

08 Dec, 2017 1 commit

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

Script Kiddy authored Dec 08, 2017

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"

5b07edf5

01 Dec, 2017 1 commit
- bluedevil-sendfile: Set option descriptions for command line help · 85351d22
  Jonathan Marten authored Dec 01, 2017
```
Otherwise the "--help" output is not formatted correctly.

Differential Revision: https://phabricator.kde.org/D9079
```
  85351d22
22 Nov, 2017 2 commits
- Merge branch 'Plasma/5.11' · b1fb6b93
  David Rosca authored Nov 22, 2017
  
  b1fb6b93
- ReceiveFileJob: Emit correct target path in description signal · cd65c59f
  David Rosca authored Nov 22, 2017
```
BUG: 384740
FIXED-IN: 5.11.4
```
  cd65c59f
07 Nov, 2017 1 commit
- Update version number for 5.11.3 · e4fc684b
  Jonathan Esk-Riddell authored Nov 07, 2017
```
GIT_SILENT
```
  e4fc684b
06 Nov, 2017 1 commit

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

Script Kiddy authored Nov 06, 2017

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"

596e5d95

05 Nov, 2017 2 commits

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

Script Kiddy authored Nov 05, 2017

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"

33787de6

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

Script Kiddy authored Nov 05, 2017

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"

12822a26

30 Oct, 2017 1 commit

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

Script Kiddy authored Oct 30, 2017

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"

5b5acf73

24 Oct, 2017 1 commit
- Update version number for 5.11.2 · 4567d5a4
  Jonathan Esk-Riddell authored Oct 24, 2017
```
GIT_SILENT
```
  4567d5a4
17 Oct, 2017 1 commit
- Update version number for 5.11.1 · a6870ab0
  Jonathan Esk-Riddell authored Oct 17, 2017
```
GIT_SILENT
```
  a6870ab0
12 Oct, 2017 1 commit
- Add ellipsis (...) according to HIG · 26af45f0
  Alexander Potashev authored Oct 12, 2017
  
  26af45f0
05 Oct, 2017 1 commit
- Update version number for 5.11.0 · 1932a98c
  Jonathan Esk-Riddell authored Oct 05, 2017
```
GIT_SILENT
```
  1932a98c
02 Oct, 2017 1 commit
- Set PluginInfo License to one that exists · 8c3420a0
  David Edmundson authored Oct 02, 2017
```
Based on lookup table in KAboutData
```
  8c3420a0
01 Oct, 2017 1 commit
- GIT_SILENT made messages (after extraction) · 66dbec55
  Script Kiddy authored Oct 01, 2017
  
  66dbec55
16 Sep, 2017 1 commit
- GIT_SILENT made messages (after extraction) · ef128dc7
  Script Kiddy authored Sep 16, 2017
  
  ef128dc7
14 Sep, 2017 1 commit
- Update version number for 5.11.90 · d14d7050
  Jonathan Esk-Riddell authored Sep 14, 2017
```
GIT_SILENT
```
  d14d7050
13 Sep, 2017 1 commit
- Update version number for 5.10.95 · 364e4f04
  Jonathan Esk-Riddell authored Sep 13, 2017
```
GIT_SILENT
```
  364e4f04