Commits · master · Alex Hermann / KMix

09 Dec, 2021 1 commit
- GIT_SILENT Update Appstream for new release · 51b93f5c
  Albert Astals Cid authored Dec 09, 2021
```
(cherry picked from commit 8a38a839)
```
  51b93f5c
29 Nov, 2021 1 commit
- Add CI · 059fb0bf
  Albert Astals Cid authored Nov 29, 2021
  
  059fb0bf
16 Nov, 2021 1 commit
- not necessary to use I18N_NOOP here · 724f5b9a
  Laurent Montel authored Nov 16, 2021
  
  724f5b9a
09 Nov, 2021 1 commit

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

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

d4956d90

08 Nov, 2021 2 commits
- GIT_SILENT Upgrade release service version to 22.03.70. · b27cde83
  Heiko Becker authored Nov 08, 2021
  
  b27cde83
- Merge remote-tracking branch 'origin/release/21.08' · 141b7ff8
  Heiko Becker authored Nov 08, 2021
  
  141b7ff8
01 Nov, 2021 3 commits
- Fix crash by adding missing initialize part for KToggleAction · ade58189
  Ömer Fadıl Usta authored Oct 31, 2021 and Albert Astals Cid committed Nov 01, 2021
```
(cherry picked from commit f770d6f3)
```
  ade58189
- When we click on "Audio Setup", calls kcm_pulseaudio · a54f7609
  Sergio Basto authored Jul 02, 2021 and Albert Astals Cid committed Nov 01, 2021
```
(as the plasma audio plug-in do).

Revert 8fec379c
and replace the call of kcm_phonon, to kcm_pulseaudio, because kcm_phonon just works on KDE4

The patch was adapted for kmixwindow.cpp instead kmix.cpp
```
  a54f7609
- Fix crash by adding missing initialize part for KToggleAction · f770d6f3
  Ömer Fadıl Usta authored Oct 31, 2021 and Albert Astals Cid committed Nov 01, 2021
  
  f770d6f3
31 Oct, 2021 3 commits
- GIT_SILENT Update Appstream for new release · 003ed5de
  Heiko Becker authored Oct 31, 2021
```
(cherry picked from commit db6079a3)
```
  003ed5de
- GIT_SILENT Update Appstream for new release · db6079a3
  Heiko Becker authored Oct 31, 2021
  
  db6079a3
- GIT_SILENT Upgrade release service version to 21.08.3. · 14e0e33b
  Heiko Becker authored Oct 31, 2021
  
  14e0e33b
28 Oct, 2021 1 commit

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

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

2438c5be

27 Oct, 2021 1 commit

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

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

c3cb0169

04 Oct, 2021 3 commits
- GIT_SILENT Update Appstream for new release · 90037ea2
  Heiko Becker authored Oct 05, 2021
```
(cherry picked from commit 64128123)
```
  90037ea2
- GIT_SILENT Update Appstream for new release · 64128123
  Heiko Becker authored Oct 05, 2021
  
  64128123
- GIT_SILENT Upgrade release service version to 21.08.2. · fe004295
  Heiko Becker authored Oct 05, 2021
  
  fe004295
23 Sep, 2021 1 commit

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

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

0ef1805b

29 Aug, 2021 2 commits

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

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"

00bbe918

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

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"

304af5fc

27 Aug, 2021 3 commits
- GIT_SILENT Update Appstream for new release · 9a685e1d
  Heiko Becker authored Aug 27, 2021
  
  9a685e1d
- GIT_SILENT Update Appstream for new release · 4ad706cd
  Heiko Becker authored Aug 27, 2021
```
(cherry picked from commit 9a685e1d)
```
  4ad706cd
- GIT_SILENT Upgrade release service version to 21.08.1. · 26fb100f
  Heiko Becker authored Aug 27, 2021
  
  26fb100f
26 Aug, 2021 1 commit
- Increase CMake Version to 3.16 · 4e33bdb8
  Ömer Fadıl Usta authored Aug 26, 2021
  
  4e33bdb8
24 Aug, 2021 1 commit
- Fixes crash thanks to Check if MD (MixDevice) exist on GlobalMaster or not · a4d5d52a
  Ömer Fadıl Usta authored Aug 22, 2021
```
Because of lack of checking if md is nullptr or not, calling directly
md->playbackVolume() was causing Segment fault.
```
  a4d5d52a
21 Aug, 2021 1 commit
- Fixes crash thanks to Check if MD (MixDevice) exist on GlobalMaster or not · 1bd7c196
  Ömer Fadıl Usta authored Aug 22, 2021
```
Because of lack of checking if md is nullptr or not, calling directly
md->playbackVolume() was causing Segment fault.
```
  1bd7c196
12 Aug, 2021 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 33e80f14
  Script Kiddy authored Aug 12, 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"
```
  33e80f14
- GIT_SILENT made messages (after extraction) · f473cf40
  Script Kiddy authored Aug 12, 2021
  
  f473cf40
09 Aug, 2021 3 commits
- mimeData signature was changed in qt6 · 3ed58fff
  Laurent Montel authored Aug 09, 2021
  
  3ed58fff
- SVN_SILENT made messages (.desktop file) - always resolve ours · 955dfefe
  Script Kiddy authored Aug 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"
```
  955dfefe
- GIT_SILENT made messages (after extraction) · 2f47b97e
  Script Kiddy authored Aug 09, 2021
  
  2f47b97e
04 Aug, 2021 3 commits
- GIT_SILENT Update Appstream for new release · b5d115f0
  Heiko Becker authored Aug 04, 2021
```
(cherry picked from commit ab1bb9b5)
```
  b5d115f0
- GIT_SILENT Update Appstream for new release · ab1bb9b5
  Heiko Becker authored Aug 04, 2021
  
  ab1bb9b5
- GIT_SILENT Upgrade release service version to 21.08.0. · 15fb400f
  Heiko Becker authored Aug 04, 2021
  
  15fb400f
27 Jul, 2021 1 commit
- GIT_SILENT Upgrade release service version to 21.07.90. · 8bd946b9
  Heiko Becker authored Jul 27, 2021
  
  8bd946b9
26 Jul, 2021 2 commits

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

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"

6e49f16a

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

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"

9f1eeb70

22 Jul, 2021 2 commits

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

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

959f4e86

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

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

d02daed6

20 Jul, 2021 1 commit

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

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

ac1cf224