Commits · master · Plasma / Plasma Bigscreen

22 Jan, 2021 7 commits
- Partially fic i18n · 7db5aad1
  Yuri Chornoivan authored Jan 22, 2021
  
  7db5aad1
- iconvenrt shell/lnf to SPDX · 0ef6a87a
  Marco Martin authored Jan 22, 2021
  
  0ef6a87a
- fix SPDX identifier in kcms · 9fb9dc44
  Aditya Mehra authored Jan 22, 2021
  
  9fb9dc44
- move kcm components and modules to SPDX · 8d50647c
  Aditya Mehra authored Jan 22, 2021
  
  8d50647c
- move components and containment to SPDX · 89a24769
  Marco Martin authored Jan 22, 2021
  
  89a24769
- move apache license to LICESES · a52a6802
  Marco Martin authored Jan 22, 2021
```
remove old root licenses
```
  a52a6802
- add LICENSES · c069dc99
  Marco Martin authored Jan 22, 2021
  
  c069dc99
16 Jan, 2021 1 commit

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

Script Kiddy authored Jan 16, 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"

d7b7cd88

10 Jan, 2021 1 commit

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

Script Kiddy authored Jan 10, 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"

1706ba46

05 Jan, 2021 1 commit

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

Script Kiddy authored Jan 05, 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"

b4fc3fde

30 Dec, 2020 1 commit
- Cleanup unused imports and add TODO · 2667deb9
  Alexander Lohnau authored Dec 29, 2020
  
  2667deb9
21 Dec, 2020 1 commit

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

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

3c7f6635

07 Dec, 2020 1 commit

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

Script Kiddy authored Dec 07, 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"

bc979f59

28 Nov, 2020 1 commit

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

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

749c3033

02 Nov, 2020 1 commit
- fix padding for kcms content items · 8a1ef82a
  Aditya Mehra authored Nov 02, 2020
  
  8a1ef82a
26 Oct, 2020 1 commit
- check skillTimeout signal and close mycroft window · e4d43b40
  Aditya Mehra authored Oct 26, 2020
  
  e4d43b40
16 Oct, 2020 1 commit
- new launch feedback from plasma nano · ddef4e31
  Marco Martin authored Oct 16, 2020
  
  ddef4e31
13 Oct, 2020 1 commit

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

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

71d38caf

09 Oct, 2020 1 commit

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

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

244ff429

08 Oct, 2020 1 commit

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

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

001acbad

05 Oct, 2020 1 commit

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

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

54f50974

04 Oct, 2020 1 commit

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

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

fe84865f

28 Sep, 2020 1 commit

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

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

c5a263f7

26 Sep, 2020 1 commit

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

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

a392d604

25 Sep, 2020 2 commits
- fix buttons not showing correctly in kcms and pair window · f4500519
  Aditya Mehra authored Sep 25, 2020
  
  f4500519
- SVN_SILENT made messages (.desktop file) - always resolve ours · b26fdd49
  Script Kiddy authored Sep 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"
```
  b26fdd49
24 Sep, 2020 1 commit

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

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

f6dd9487

23 Sep, 2020 1 commit

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

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

18d11aaf

22 Sep, 2020 1 commit
- Fix all KCMs footer area and layout fixes · a3cdd2c1
  Aditya Mehra authored Sep 22, 2020
  
  a3cdd2c1
21 Sep, 2020 2 commits

Install a startup script · 142e96b4

Bart Ribbers authored Sep 08, 2020

This creates a /usr/share/wayland-sessions/plasma-bigscreen.desktop
launcher which can be used to launch Plasma Bigscreen in combination
with /usr/bin/plasma-bigscreen

142e96b4

port away from context properties · 6d21753f
Marco Martin authored Sep 21, 2020

6d21753f

17 Sep, 2020 1 commit

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

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

b926ddda

11 Sep, 2020 1 commit

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

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

4fa29545

10 Sep, 2020 1 commit

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

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

5956a415

08 Sep, 2020 1 commit

README.md: prettify · b134feb7

Bart Ribbers authored Sep 08, 2020

- Explain what this project is about
- Instead of listing all dependencies which are subject to change, just
tell people to look in CMakeLists.txt instead

b134feb7

01 Sep, 2020 1 commit

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

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"

5ccdb3d4

31 Jul, 2020 1 commit

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

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"

c0497ce2

28 Jul, 2020 1 commit

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

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"

a7a406a3

23 Jul, 2020 1 commit

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

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

77524f0c

13 Jul, 2020 1 commit

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

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

ed80503e