Commits · master · Utilities / KWalletManager

06 Sep, 2020 1 commit

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

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

2ffc29a0

05 Sep, 2020 1 commit

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

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

9aac25e7

01 Sep, 2020 1 commit

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

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

c227db82

31 Aug, 2020 1 commit
- GIT_SILENT Update Appstream for new release · b89c89ab
  Christoph Feck authored Aug 31, 2020
```
(cherry picked from commit bce89f8b)
```
  b89c89ab
29 Aug, 2020 1 commit

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

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

0ef6dd07

27 Aug, 2020 1 commit

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

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

6f0a2d62

24 Aug, 2020 1 commit

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

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

b081405c

20 Aug, 2020 1 commit
- Merge remote-tracking branch 'origin/release/20.08' into master · 42da7a66
  Albert Astals Cid authored Aug 20, 2020
  
  42da7a66
13 Aug, 2020 1 commit

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

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

1b29c956

12 Aug, 2020 3 commits
- Fix memory leak · 848ee264
  Albert Astals Cid authored Aug 12, 2020
  
  848ee264
- Port away from deprecated KToolInvocation::startServiceByDesktopName · 72a36a4c
  Nicolas Fella authored Aug 12, 2020
  
  72a36a4c
- Remove unused include · dfe5a947
  Nicolas Fella authored Aug 12, 2020
  
  dfe5a947
05 Aug, 2020 3 commits
- GIT_SILENT Update Appstream for new release · b8ade4b9
  Christoph Feck authored Aug 05, 2020
```
(cherry picked from commit 7592e09d)
```
  b8ade4b9
- GIT_SILENT Update Appstream for new release · 7592e09d
  Christoph Feck authored Aug 05, 2020
  
  7592e09d
- GIT_SILENT Upgrade release service version to 20.08.0. · 0290382a
  Christoph Feck authored Aug 05, 2020
  
  0290382a
31 Jul, 2020 2 commits
- GIT_SILENT Upgrade release service version to 20.07.90. · 72317acd
  Christoph Feck authored Jul 31, 2020
  
  72317acd
- SVN_SILENT made messages (.desktop file) - always resolve ours · d6368482
  Script Kiddy authored Jul 31, 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"
```
  d6368482
29 Jul, 2020 1 commit

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

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

64f0a73b

28 Jul, 2020 1 commit

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

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

84d4e9a2

26 Jul, 2020 1 commit

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

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

fc590ca9

25 Jul, 2020 1 commit

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

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

ae229f25

24 Jul, 2020 1 commit

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

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

b9debf53

23 Jul, 2020 3 commits
- align naming with elsewhere in the stack · 55348a5b
  Harald Sitter authored Jul 23, 2020
```
'Wallet' -> 'KDE Wallet' to be less generic. this aligns with the name
of the KCM and the notification category now
```
  55348a5b
- GIT_SILENT made messages (after extraction) · 4fb1a89b
  Script Kiddy authored Jul 23, 2020
  
  4fb1a89b
- GIT_SILENT made messages (after extraction) · 5ac66ada
  Script Kiddy authored Jul 23, 2020
  
  5ac66ada
19 Jul, 2020 1 commit

[KWalletEditor] Use new kwallet methods to populate the view list(s) · 499761ff

Ahmad Samir authored Jun 08, 2020

This requires kwallet 5.72.0; also bump min. required Qt version to 5.12
as that's what the kwallet framework currently requires.

499761ff

11 Jul, 2020 2 commits
- GIT_SILENT Upgrade release service version to 20.11.70. · 7602035c
  Albert Astals Cid authored Jul 11, 2020
  
  7602035c
- GIT_SILENT Upgrade release service version to 20.07.80. · 4d5a48b6
  Albert Astals Cid authored Jul 11, 2020
  
  4d5a48b6
03 Jul, 2020 1 commit
- GIT_SILENT Update Appstream for new release · a69e5b0d
  Christoph Feck authored Jul 03, 2020
```
(cherry picked from commit 6fb98843)
```
  a69e5b0d
22 Jun, 2020 1 commit

Move KCM to personalization category · cd91af27

Nicolas Fella authored Jun 22, 2020

Since the user KCM moved out of the accoutdetails category this is the last remaining entry, which leads to an awkward situation where the system settings entry says "Account details" but the kwallet KCM is opened. By promoting this to a toplevel entry in the personalization category we avoid this and the proper label is shown in systemsettings

cd91af27

20 Jun, 2020 4 commits
- Drop support for KF <5.58 · c3d198cd
  Friedrich W. H. Kossebau authored Jun 20, 2020
  
  c3d198cd
- Merge branch 'release/20.04' · de79ae27
  Friedrich W. H. Kossebau authored Jun 20, 2020
  
  de79ae27
- Remove explicit use of ECM_KDE_MODULE_DIR, is part of ECM_MODULE_PATH · 1dfea019
  Friedrich W. H. Kossebau authored Jun 20, 2020
```
GIT_SILENT
```
  1dfea019
- Enable warnings for deprecation messages for anything until Qt/KF 6.0 · 59728043
  Friedrich W. H. Kossebau authored Jun 20, 2020
```
GIT_SILENT
```
  59728043
18 Jun, 2020 4 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 04a24797
  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"
```
  04a24797
- GIT_SILENT made messages (after extraction) · 9d19dc4d
  Script Kiddy authored Jun 18, 2020
  
  9d19dc4d
- SVN_SILENT made messages (.desktop file) - always resolve ours · e9187bbc
  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"
```
  e9187bbc
- GIT_SILENT made messages (after extraction) · 15bad713
  Script Kiddy authored Jun 18, 2020
  
  15bad713
17 Jun, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 9f00c302
  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"
```
  9f00c302
- GIT_SILENT made messages (after extraction) · 5d14ded9
  Script Kiddy authored Jun 17, 2020
  
  5d14ded9