Commits · 0eb6da9c155648db471dd6af0b5510a6d52fd05c · Plasma / Bluedevil

19 Apr, 2020 1 commit
- Remove too strict Qt/KF5 deprecation rule · 0eb6da9c
  David Faure authored Apr 19, 2020
  
  0eb6da9c
01 Apr, 2020 1 commit

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

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

9d2c006a

31 Mar, 2020 1 commit
- Update version number for 5.18.4 · 28bf5354
  Jonathan Esk-Riddell authored Mar 31, 2020
```
GIT_SILENT
```
  28bf5354
26 Mar, 2020 1 commit

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

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

3382e4db

23 Mar, 2020 1 commit

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

Script Kiddy authored Mar 23, 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"

e9f71f6a

21 Mar, 2020 1 commit

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

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

b7411225

15 Mar, 2020 1 commit

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

Script Kiddy authored Mar 15, 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"

ba67d728

12 Mar, 2020 1 commit

Remove bold formatting of device name · c190802e

Nicolas Fella authored Mar 13, 2020

Summary: D27543 set the label to plaintext, for a reason I assume, but the device name label actually uses style tags. We either need to drop that or reenable rich text formatting

Test Plan: No longer see <b>device name</b>

Reviewers: #plasma, drosca, davidedmundson

Reviewed By: drosca

Subscribers: ngraham, broulik, pino, plasma-devel

Tags: #plasma

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

c190802e

10 Mar, 2020 1 commit
- Update version number for 5.18.3 · 6126968e
  Jonathan Esk-Riddell authored Mar 10, 2020
```
GIT_SILENT
```
  6126968e
02 Mar, 2020 1 commit
- Only deprecate up to target frameworks · e0e0c50a
  David Edmundson authored Mar 02, 2020
  
  e0e0c50a
25 Feb, 2020 1 commit
- Update version number for 5.18.2 · 031883b2
  Jonathan Esk-Riddell authored Feb 25, 2020
```
GIT_SILENT
```
  031883b2
21 Feb, 2020 3 commits

Merge branch 'Plasma/5.12' into Plasma/5.18 · 4a6f4b8f
David Edmundson authored Feb 21, 2020

4a6f4b8f

Set all labels to plain text · fb1a8474

David Edmundson authored Feb 21, 2020

CCBUG: 417980

Reviewers: #plasma, jgrulich

Reviewed By: jgrulich

Subscribers: jgrulich, plasma-devel

Tags: #plasma

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

fb1a8474

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

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

37b2a609

18 Feb, 2020 1 commit
- Update version number for 5.18.1 · 7e80c64e
  Jonathan Esk-Riddell authored Feb 18, 2020
```
GIT_SILENT
```
  7e80c64e
06 Feb, 2020 1 commit
- Update version number for 5.18.0 · c7f7a41e
  Jonathan Esk-Riddell authored Feb 06, 2020
```
GIT_SILENT
```
  c7f7a41e
01 Feb, 2020 1 commit

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

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

8ea349fb

28 Jan, 2020 1 commit

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

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

bbb1c6a5

20 Jan, 2020 1 commit

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

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

09710d8d

19 Jan, 2020 1 commit

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

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

e3c56de9

17 Jan, 2020 1 commit

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

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

fa1b4f26

16 Jan, 2020 3 commits
- Update version number for 5.17.90 · 149d8500
  Jonathan Esk-Riddell authored Jan 16, 2020
```
GIT_SILENT
```
  149d8500
- KF5_MIN_VERSION for plasma 5.18 is KF5 5.66.0 · 66ea5757
  Jonathan Esk-Riddell authored Jan 16, 2020
  
  66ea5757
- SVN_SILENT made messages (.desktop file) - always resolve ours · 34376533
  Script Kiddy authored Jan 16, 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"
```
  34376533
15 Jan, 2020 1 commit

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

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

19555adb

13 Jan, 2020 2 commits

[plasmoid] Show device battery percentage · 3686a5ac

Kai Uwe Broulik authored Jan 13, 2020

While it is typically shown in Battery Monitor, it can still be useful to have it in Bluetooth plasmoid.

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

3686a5ac

[Wizard] Show notification instead of finished page when pairing succeeds · 5101d790

Kai Uwe Broulik authored Jan 13, 2020

Saves the user from having to close the dialog when pairing succeeded.

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

5101d790

29 Dec, 2019 1 commit

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

Script Kiddy authored Dec 29, 2019

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"

9291b9d0

26 Dec, 2019 1 commit

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

Script Kiddy authored Dec 26, 2019

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"

d23c7465

18 Dec, 2019 1 commit

[Wizard] Allow choosing device by double click · 0fd34f04

Kai Uwe Broulik authored Dec 18, 2019

Instead of having to select one and clicking "Next"

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

0fd34f04

14 Dec, 2019 1 commit

[applet] Make details text fully opaque and normal style · 6f27fd50

Nate Graham authored Dec 14, 2019

Same change as in https://phabricator.kde.org/D25970, done here for
consistency because both use the same style.

6f27fd50

07 Dec, 2019 1 commit

Get icon size from QStyle · 669773fc

Nicolas Fella authored Dec 03, 2019

Test Plan: No visual difference

Reviewers: #plasma, drosca, apol

Reviewed By: apol

Subscribers: plasma-devel

Tags: #plasma

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

669773fc

19 Nov, 2019 1 commit

Remove some unused includes · 3729eb68

Nicolas Fella authored Nov 18, 2019

Test Plan: builds

Reviewers: #plasma, drosca

Reviewed By: drosca

Subscribers: plasma-devel

Tags: #plasma

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

3729eb68

05 Nov, 2019 2 commits
- make it compile without deprecated methods · a9d1bfcf
  Laurent Montel authored Nov 05, 2019
  
  a9d1bfcf
- Port old style connects · 405d1294
  David Edmundson authored Nov 05, 2019
  
  405d1294
04 Nov, 2019 1 commit

Add KDEClangFormat cmake support · efd99b9b

David Edmundson authored Nov 04, 2019

Summary:
This allows devs to run: "make clang-format" and format all files easily
using the preset KDE clang format style

This patch adds support so devs can easily test the intended formatting
now, it doesn't change the code yet.

Doing an initial run to commit everything will happen later.

Test Plan:
Ran script
git diff was full of amazingly cleaned code

See D25134

efd99b9b

02 Nov, 2019 1 commit

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

Script Kiddy authored Nov 02, 2019

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"

66e17eb8

21 Oct, 2019 1 commit

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

Script Kiddy authored Oct 21, 2019

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"

1adbd6d7

20 Oct, 2019 1 commit

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

Script Kiddy authored Oct 20, 2019

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"

4e446447

10 Oct, 2019 1 commit
- Update version number for 5.17.80 · f125dc3a
  Jonathan Esk-Riddell authored Oct 10, 2019
```
GIT_SILENT
```
  f125dc3a