Commits · master · Multimedia / Dragon

10 Sep, 2020 4 commits
- Use Q_EMIT over emit · 97897b6b
  Friedrich W. H. Kossebau authored Sep 10, 2020
```
GIT_SILENT
```
  97897b6b
- Merge branch 'release/20.08' into master · 15d41302
  Friedrich W. H. Kossebau authored Sep 10, 2020
  
  15d41302
- Add explicit ki18n_install(po) call · a84e38ea
  Friedrich W. H. Kossebau authored Sep 10, 2020
```
GIT_SILENT
```
  a84e38ea
- GIT_SILENT made messages (after extraction) · fe883804
  Script Kiddy authored Sep 10, 2020
  
  fe883804
31 Aug, 2020 3 commits
- GIT_SILENT Update Appstream for new release · f4f44399
  Christoph Feck authored Aug 31, 2020
  
  f4f44399
- GIT_SILENT Update Appstream for new release · 074fb354
  Christoph Feck authored Aug 31, 2020
```
(cherry picked from commit f4f44399)
```
  074fb354
- GIT_SILENT Upgrade release service version to 20.08.1. · 186476f2
  Christoph Feck authored Aug 31, 2020
  
  186476f2
05 Aug, 2020 3 commits
- GIT_SILENT Update Appstream for new release · 72f22806
  Christoph Feck authored Aug 05, 2020
```
(cherry picked from commit 52343e9d)
```
  72f22806
- GIT_SILENT Update Appstream for new release · 52343e9d
  Christoph Feck authored Aug 05, 2020
  
  52343e9d
- GIT_SILENT Upgrade release service version to 20.08.0. · 5a7716fa
  Christoph Feck authored Aug 05, 2020
  
  5a7716fa
31 Jul, 2020 1 commit
- GIT_SILENT Upgrade release service version to 20.07.90. · 6a1fae46
  Christoph Feck authored Jul 31, 2020
  
  6a1fae46
21 Jul, 2020 4 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 080f094b
  Script Kiddy authored Jul 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"
```
  080f094b
- GIT_SILENT made messages (after extraction) · 68e55d3f
  Script Kiddy authored Jul 21, 2020
  
  68e55d3f
- SVN_SILENT made messages (.desktop file) - always resolve ours · 3b9d8db6
  Script Kiddy authored Jul 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"
```
  3b9d8db6
- GIT_SILENT made messages (after extraction) · 1391b7ae
  Script Kiddy authored Jul 21, 2020
  
  1391b7ae
11 Jul, 2020 2 commits
- GIT_SILENT Upgrade release service version to 20.11.70. · 9ff89eb8
  Albert Astals Cid authored Jul 11, 2020
  
  9ff89eb8
- GIT_SILENT Upgrade release service version to 20.07.80. · 1e6fde93
  Albert Astals Cid authored Jul 11, 2020
  
  1e6fde93
03 Jul, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 89318a67
  Christoph Feck authored Jul 03, 2020
```
(cherry picked from commit fca3b8a8)
```
  89318a67
18 Jun, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · dc9f57e3
  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"
```
  dc9f57e3
- GIT_SILENT made messages (after extraction) · 532b5608
  Script Kiddy authored Jun 18, 2020
  
  532b5608
17 Jun, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 13906cbc
  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"
```
  13906cbc
- GIT_SILENT made messages (after extraction) · dc4ebc08
  Script Kiddy authored Jun 17, 2020
  
  dc4ebc08
09 Jun, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · e52046d6
  Script Kiddy authored Jun 09, 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"
```
  e52046d6
- GIT_SILENT made messages (after extraction) · 99cfb9fe
  Script Kiddy authored Jun 09, 2020
  
  99cfb9fe
08 Jun, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 53a6bee6
  Christoph Feck authored Jun 08, 2020
```
(cherry picked from commit e322e282)
```
  53a6bee6
20 May, 2020 1 commit
- GIT_SILENT: add Dragon icon as repository logo · 53cba755
  Yuri Chornoivan authored May 20, 2020
  
  53cba755
14 May, 2020 1 commit
- Make it compile without deprecated method · 1ac17470
  Laurent Montel authored Sep 18, 2019
  
  1ac17470
11 May, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 0d8ef970
  Christoph Feck authored May 11, 2020
```
(cherry picked from commit f8877818)
```
  0d8ef970
04 May, 2020 5 commits
- Add some UI context marker for translated strings in ui & ui.rc files · 934b4251
  Friedrich W. H. Kossebau authored May 04, 2020
```
GIT_SILENT
```
  934b4251
- Extend appdata with <launchable> & <categories> · c98a4f1e
  Friedrich W. H. Kossebau authored May 04, 2020
```
GIT_SILENT
```
  c98a4f1e
- Add some UI context marker for translated strings · 79ba36b5
  Friedrich W. H. Kossebau authored May 04, 2020
```
GIT_SILENT
```
  79ba36b5
- Port away from deprecated KIO::stat() · f3bfb93d
  Friedrich W. H. Kossebau authored May 04, 2020
```
GIT_SILENT
```
  f3bfb93d
- Set QT_NO_FOREACH · 5a2ca527
  Friedrich W. H. Kossebau authored May 04, 2020
```
GIT_SILENT
```
  5a2ca527
26 Apr, 2020 1 commit
- GIT_SILENT made messages (after extraction) · efc50cb0
  Script Kiddy authored Apr 26, 2020
  
  efc50cb0
15 Apr, 2020 1 commit
- GIT_SILENT Update Appstream for new release · f6b69a41
  Christoph Feck authored Apr 15, 2020
```
(cherry picked from commit 706ed9d5)
```
  f6b69a41
15 Mar, 2020 1 commit
- GIT_SILENT Upgrade release service version to 20.07.70. · 58054c01
  Albert Astals Cid authored Mar 15, 2020
  
  58054c01
02 Mar, 2020 1 commit

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

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

47c04cbb

01 Mar, 2020 2 commits
- Merge remote-tracking branch 'origin/release/19.12' · b1d017a9
  Pino Toscano authored Mar 01, 2020
  
  b1d017a9
- appdata: improve URLs · 17efdfe1
  Pino Toscano authored Mar 01, 2020
```
- use canonical docs.kde.org help location
- use canonical cdn screenshot location
```
  17efdfe1
29 Feb, 2020 1 commit
- GIT_SILENT Upgrade KDE Applications version to 19.12.3. · ef835924
  Christoph Feck authored Feb 29, 2020
  
  ef835924