Commits · Applications/18.04 · Education / Artikulate

13 Mar, 2018 1 commit
- GIT_SILENT made messages (after extraction) · 9d59860b
  Script Kiddy authored Mar 13, 2018
  
  9d59860b
21 Feb, 2018 2 commits
- Merge remote-tracking branch 'origin/Applications/17.12' · 696ae6a7
  Albert Astals Cid authored Feb 21, 2018
  
  696ae6a7
- oxygen-icons.org got lost, so remove mention · def6436d
  Albert Astals Cid authored Feb 21, 2018
  
  def6436d
21 Nov, 2017 2 commits

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

Script Kiddy authored Nov 21, 2017

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"

84e8071a

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

Script Kiddy authored Nov 21, 2017

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"

0df900ef

11 Nov, 2017 1 commit

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

Script Kiddy authored Nov 11, 2017

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"

dde7369b

16 Oct, 2017 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 2df4d1a9
  Script Kiddy authored Oct 16, 2017
```
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"
```
  2df4d1a9
- GIT_SILENT made messages (after extraction) · d0d2a149
  Script Kiddy authored Oct 16, 2017
  
  d0d2a149
16 Sep, 2017 1 commit

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

Script Kiddy authored Sep 16, 2017

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"

c41622e1

20 Aug, 2017 1 commit

Fix the desktop file (Exec key) · ebf723e5

Luigi Toscano authored Aug 20, 2017

- convert from -caption (Qt4) to -qwindowtitle (Qt5);
- restore the icon parameter as it was (Wayland gets it from the
  already set Icon property).

ebf723e5

01 Jul, 2017 3 commits
- Merge remote-tracking branch 'origin/Applications/17.04' · a307f6e5
  Luigi Toscano authored Jul 02, 2017
  
  a307f6e5
- Mark translatable an untranslatable string · f1430366
  Luigi Toscano authored Jul 02, 2017
  
  f1430366
- Fix the translation of the about box of the editor · 5c73518c
  Luigi Toscano authored Jul 02, 2017
```
Move the initialization of QApplication as soon as possible, so that
the domain is properly set when the KAboutData instance is created.
```
  5c73518c
20 Jun, 2017 2 commits

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

Script Kiddy authored Jun 20, 2017

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"

0edba40f

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

Script Kiddy authored Jun 20, 2017

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"

e7313c3f

15 Jun, 2017 1 commit
- Fix wayland support · b33272d0
  Laurent Montel authored Jun 15, 2017
  
  b33272d0
01 Jun, 2017 1 commit
- Use Q_DECL_OVERRIDE · 4f37e0c0
  Laurent Montel authored Jun 01, 2017
  
  4f37e0c0
09 Apr, 2017 2 commits

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

Script Kiddy authored Apr 09, 2017

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"

c53b8a16

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

Script Kiddy authored Apr 09, 2017

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"

d5337273

23 Feb, 2017 1 commit
- GIT_SILENT made messages (after extraction) · d83597b0
  Script Kiddy authored Feb 23, 2017
  
  d83597b0
20 Dec, 2016 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · d1ef71e4
  Script Kiddy authored Dec 20, 2016
```
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"
```
  d1ef71e4
- GIT_SILENT made messages (after extraction) · 60cb236d
  Script Kiddy authored Dec 20, 2016
  
  60cb236d
02 Dec, 2016 1 commit

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

Script Kiddy authored Dec 02, 2016

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"

f76c10ce

30 Nov, 2016 1 commit

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

Script Kiddy authored Nov 30, 2016

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"

41e6e7a9

25 Nov, 2016 1 commit

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

Script Kiddy authored Nov 25, 2016

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"

3e262702

23 Nov, 2016 1 commit

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

Script Kiddy authored Nov 23, 2016

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"

8be71742

17 Nov, 2016 1 commit

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

Script Kiddy authored Nov 17, 2016

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"

67897108

16 Oct, 2016 3 commits
- Merge branch 'Applications/16.08' · 6eee3080
  Andreas Cord-Landwehr authored Oct 16, 2016
  
  6eee3080
- Fix menubar show/hide functionality · 4cbe29cf
  Andreas Cord-Landwehr authored Oct 16, 2016
  
  4cbe29cf
- SVN_SILENT made messages (after extraction) · 9041c4c2
  Script Kiddy authored Oct 16, 2016
  
  9041c4c2
28 Sep, 2016 1 commit

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

Script Kiddy authored Sep 28, 2016

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"

6dba2d6f

14 Sep, 2016 1 commit

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

Script Kiddy authored Sep 14, 2016

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"

16731790

20 Jul, 2016 1 commit

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

Script Kiddy authored Jul 20, 2016

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"

1c4e78de

18 Jul, 2016 2 commits
- update appstream path to use ECM variable · b387c98e
  Jonathan Riddell authored Jul 18, 2016
  
  b387c98e
- use path from KDE_INSTALL_METAINFO variable for appstream path to pick up new directory name · 38162628
  Jonathan Riddell authored Jul 18, 2016
  
  38162628
26 May, 2016 5 commits
- Add missing files · 34f3a373
  Andreas Cord-Landwehr authored May 26, 2016
  
  34f3a373
- Cleanup icon directory · 09c769a4
  Andreas Cord-Landwehr authored May 26, 2016
```
- adapt default icon fallback style to breeze like icons
- first round of removing unused icons
```
  09c769a4
- Merge branch 'Applications/16.04' · b2596f9e
  Andreas Cord-Landwehr authored May 26, 2016
  
  b2596f9e
- Correctly initialize/delete QtMultimedia backends · f250175f
  Andreas Cord-Landwehr authored May 26, 2016
  
  f250175f
- Use system temp path for temp files · fcfc27f6
  Andreas Cord-Landwehr authored May 26, 2016
  
  fcfc27f6