Commits · 9177b871abbb7a4f5993ffcd271dbc244a5220e2 · Plasma / Plasma Vault

19 Apr, 2020 1 commit
- Remove too strict Qt/KF5 deprecation rule. GIT_SILENT · 9177b871
  David Faure authored Apr 19, 2020
  
  9177b871
17 Apr, 2020 1 commit
- Make sure we have saved network state before accessing it · 5920e79e
  Ivan Čukić authored Mar 17, 2020
```
BUG:418262
```
  5920e79e
31 Mar, 2020 1 commit
- Update version number for 5.18.4 · ba4a0331
  Jonathan Esk-Riddell authored Mar 31, 2020
```
GIT_SILENT
```
  ba4a0331
10 Mar, 2020 1 commit
- Update version number for 5.18.3 · 6ca93560
  Jonathan Esk-Riddell authored Mar 10, 2020
```
GIT_SILENT
```
  6ca93560
02 Mar, 2020 1 commit
- Only deprecate up to target frameworks · 131245f5
  David Edmundson authored Mar 02, 2020
  
  131245f5
25 Feb, 2020 1 commit
- Update version number for 5.18.2 · a468652f
  Jonathan Esk-Riddell authored Feb 25, 2020
```
GIT_SILENT
```
  a468652f
18 Feb, 2020 1 commit
- Update version number for 5.18.1 · 59ad6d1d
  Jonathan Esk-Riddell authored Feb 18, 2020
```
GIT_SILENT
```
  59ad6d1d
16 Feb, 2020 1 commit
- Extract messages from header file as well · d316e2de
  Yuri Chornoivan authored Feb 16, 2020
  
  d316e2de
10 Feb, 2020 1 commit

Replace plasma.kde.org with kde.org/plasma-desktop · d6062a6a

Heiko Becker authored Feb 10, 2020

Summary:
plasma.kde.org doesn't exist anymore and causes the appstream test to
to fail.

Reviewers: #plasma

Subscribers: plasma-devel

Tags: #plasma

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

d6062a6a

06 Feb, 2020 1 commit
- Update version number for 5.18.0 · 7a7dc879
  Jonathan Esk-Riddell authored Feb 06, 2020
```
GIT_SILENT
```
  7a7dc879
16 Jan, 2020 1 commit
- Update version number for 5.17.90 · c765786a
  Jonathan Esk-Riddell authored Jan 16, 2020
```
GIT_SILENT
```
  c765786a
07 Jan, 2020 1 commit

Dynamically show and hide based on whether or not any vaults are configured · f8c69245

Nate Graham authored Jan 05, 2020

Summary:
Currently, the Vaults icon is always visible in the System Tray. However most tray icons
dynamically show and hide themselves based on whether or not they're relevant and in use,
which results in a nice clean clutter-free System Tray. So it would be nice for Vaults
to do the same.

This patch implements that behavior by making `rowCount` a property that gets updated
based on vault creation and deletion, and making the icon only appear in the tray when at
last one vault has been created.  People who prefer to have it always visible can of course
override this in the System Tray settings, but the auto-hide behavior in this patch is probably
a better default for most.

Test Plan:
1. Have no vaults -> icon is only in the popup
2. Create a vault -> icon appears in the tray
3. Delete the vault -> icon disappears from the tray and lives in the popup again

Reviewers: broulik, ivan, #plasma, #vdg

Reviewed By: ivan, #plasma

Subscribers: plasma-devel

Tags: #plasma

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

f8c69245

26 Dec, 2019 1 commit

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

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"

b984ad94

05 Dec, 2019 1 commit

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

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

9fe60ece

21 Nov, 2019 1 commit

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

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

e711d040

15 Nov, 2019 1 commit
- GIT_SILENT: it compiles fine without deprecated method · c068dd5d
  Laurent Montel authored Nov 15, 2019
  
  c068dd5d
09 Nov, 2019 1 commit

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

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

c39b9650

04 Nov, 2019 1 commit

Add KDEClangFormat cmake support · 49bba962

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

49bba962

25 Oct, 2019 1 commit

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

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

9a02f985

10 Oct, 2019 2 commits
- Update version number for 5.17.80 · 1d6ef2d8
  Jonathan Esk-Riddell authored Oct 10, 2019
```
GIT_SILENT
```
  1d6ef2d8
- Update version number for 5.17.0 · 2bb2b2cb
  Jonathan Esk-Riddell authored Oct 10, 2019
```
GIT_SILENT
```
  2bb2b2cb
27 Sep, 2019 1 commit

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

Script Kiddy authored Sep 27, 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"

3ab5878b

19 Sep, 2019 3 commits
- Update version number for 5.17.80 · eb3bce94
  Jonathan Esk-Riddell authored Sep 19, 2019
```
GIT_SILENT
```
  eb3bce94
- Update version number for 5.16.90 · 90ce7956
  Jonathan Esk-Riddell authored Sep 19, 2019
```
GIT_SILENT
```
  90ce7956
- SVN_SILENT made messages (.desktop file) - always resolve ours · 3c886018
  Script Kiddy authored Sep 19, 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"
```
  3c886018
30 Aug, 2019 1 commit

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

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

fa2435aa

27 Jul, 2019 1 commit

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

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

79e6c345

02 Jul, 2019 1 commit

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

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

8fa0db86

10 Jun, 2019 1 commit

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

Script Kiddy authored Jun 10, 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"

41a254a5

03 Jun, 2019 1 commit

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

Script Kiddy authored Jun 03, 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"

8851016d

16 May, 2019 3 commits
- Update version number for 5.16.80 · f49f764a
  Jonathan Esk-Riddell authored May 16, 2019
```
GIT_SILENT
```
  f49f764a
- Update version number for 5.15.90 · cba138b3
  Jonathan Esk-Riddell authored May 16, 2019
```
GIT_SILENT
```
  cba138b3
- bump Qt version to 5.12 as agreed at start of cycle · 7c3384eb
  Jonathan Esk-Riddell authored May 16, 2019
  
  7c3384eb
08 May, 2019 1 commit

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

Script Kiddy authored May 08, 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"

ab2c0e62

05 May, 2019 1 commit

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

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

23e96b78

04 May, 2019 1 commit

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

Script Kiddy authored May 04, 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"

210104a1

03 May, 2019 1 commit

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

Script Kiddy authored May 03, 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"

7825c06c

30 Apr, 2019 1 commit

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

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

01bf40c2

18 Apr, 2019 1 commit
- Show Vaults action only for local folders · b5539052
  Kai Uwe Broulik authored Apr 18, 2019
```
Differential Revision: https://phabricator.kde.org/D20635
```
  b5539052
16 Apr, 2019 1 commit

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

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

b0913df8