Commits · 3b1026d5df189153445429f7115a5fa8aa32627c · Plasma Mobile / Plasma Mobile Settings

06 Jan, 2019 1 commit
- Un-deprecate KDEInstallDirs usage · 3b1026d5
  Jonah Brüchert authored Jan 03, 2019
  
  3b1026d5
04 Jan, 2019 2 commits
- Merge branch 'docs' into 'master' · 8a9a7777
  Marco Martin authored Jan 04, 2019
```
Update documentation url

See merge request kde/plasma-settings!5
```
  8a9a7777
- Merge branch 'kcm-rework-cleanup' into 'master' · 58bafb98
  Marco Martin authored Jan 04, 2019
```
Rework mobile kcms

See merge request kde/plasma-settings!2
```
  58bafb98
03 Jan, 2019 2 commits
- Fix CMP0063 warning · 0ff28e9a
  Jonah Brüchert authored Jan 03, 2019
  
  0ff28e9a
- Fix AutoMoc warnings · 61234bce
  Jonah Brüchert authored Jan 03, 2019
  
  61234bce
31 Dec, 2018 4 commits

Update documentation url · 105eb12e
Jonah Brüchert authored Dec 31, 2018

105eb12e

Jonah Brüchert authored Dec 29, 2018

 * Redesign accounts kcm

 * Use SimpleKCM and ScrollableKCM for all kcms

f706b28e

Add flatpak manifest · 104762e8

Jonah Brüchert authored Dec 31, 2018

This app is not intended to be distributed as a flatpak,
instead this manifest makes testing the app much easier
because the flatpak sandbox prevents
the interference of installed desktop kcms.

Usage is described in the documentation: https://docs.plasma-mobile.org/AppDevelopment.html

104762e8

Use nullptr and override · 3c08594e
Jonah Brüchert authored Dec 05, 2018

3c08594e

05 Dec, 2018 2 commits
- Change X-KDE-PluginInfo-Website to plasma-mobile.org · bd252d8c
  Jonah Brüchert authored Dec 05, 2018
  
  bd252d8c
- make the new multilevel api work · 012c872d
  Marco Martin authored Dec 05, 2018
  
  012c872d
21 Nov, 2018 1 commit

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

Script Kiddy authored Nov 21, 2018

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"

94cfb354

20 Nov, 2018 1 commit

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

Script Kiddy authored Nov 20, 2018

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"

d210e25c

12 Nov, 2018 1 commit
- Use RadioDelegate to allow clicking on whole item · 3744436a
  Bhushan Shah authored Nov 12, 2018
  
  3744436a
09 Nov, 2018 1 commit
- time: Fix font coloring · ffb09ab3
  Bhushan Shah authored Nov 09, 2018
  
  ffb09ab3
02 Nov, 2018 1 commit

Bump cmake requirement to 2.8.12 · 4975c903

Jonah Brüchert authored Nov 02, 2018

Fixes warning "Your project should require at least CMake 2.8.12 to use FindKF5.cmake"

4975c903

10 Oct, 2018 1 commit

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

Script Kiddy authored Oct 10, 2018

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"

e2b95b06

04 Oct, 2018 1 commit
- time kcm: fix scrolling · bcb74ce9
  Jonah Brüchert authored Oct 04, 2018
```
Temporary just use QtQuickControls 1 here again
```
  bcb74ce9
17 Sep, 2018 1 commit

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

Script Kiddy authored Sep 17, 2018

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"

02a3fa8e

26 Aug, 2018 1 commit

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

Script Kiddy authored Aug 26, 2018

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"

288fcb90

15 Aug, 2018 1 commit

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

Script Kiddy authored Aug 15, 2018

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"

9a925513

13 Aug, 2018 5 commits
- Remove Ubuntu Touch specific developer settings · 407647c3
  Jonah Brüchert authored Aug 13, 2018
  
  407647c3
- Port power kcm to Kirigami · e3513fb9
  Jonah Brüchert authored Aug 13, 2018
  
  e3513fb9
- Port theme kcm to Kirigami · 431462ec
  Jonah Brüchert authored Aug 13, 2018
  
  431462ec
- Port time kcm to Kirigami · a666317f
  Jonah Brüchert authored Aug 13, 2018
  
  a666317f
- Clean up CMakeLists · 1914d35a
  Jonah Brüchert authored Aug 13, 2018
  
  1914d35a
05 Aug, 2018 1 commit

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

Script Kiddy authored Aug 05, 2018

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"

f56a0fe1

26 Jul, 2018 1 commit

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

Script Kiddy authored Jul 26, 2018

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"

366ea669

14 Jul, 2018 1 commit

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

Script Kiddy authored Jul 14, 2018

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"

d0e9e944

21 May, 2018 1 commit

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

Script Kiddy authored May 21, 2018

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"

4249171c

19 May, 2018 1 commit

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

Script Kiddy authored May 19, 2018

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"

99425df6

08 May, 2018 1 commit

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

Script Kiddy authored May 08, 2018

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"

d9a8fee4

05 May, 2018 1 commit
- CMake: remove KDELibs4Support dependency · 53e7c064
  Jonah Brüchert authored May 05, 2018
```
Reviewed-by: Bhushan Shah <bhush94@gmail.com>
```
  53e7c064
23 Apr, 2018 1 commit

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

Script Kiddy authored Apr 23, 2018

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"

ef5ba3f7

10 Apr, 2018 1 commit
- heuristic to decide whether to use our own padding or not · 89f1b089
  Marco Martin authored Apr 10, 2018
  
  89f1b089
13 Mar, 2018 1 commit

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

Script Kiddy authored Mar 13, 2018

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"

6d9b6bca

21 Feb, 2018 2 commits
- lgpl 2.1 better · f8e452ed
  Jonathan Riddell authored Feb 21, 2018
  
  f8e452ed
- add copying licence · 697371d1
  Jonathan Riddell authored Feb 21, 2018
  
  697371d1
08 Feb, 2018 1 commit

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

Script Kiddy authored Feb 08, 2018

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"

ceb6408f

13 Jan, 2018 1 commit

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

Script Kiddy authored Jan 13, 2018

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"

bd185d5e