Commits · master · Plasma / Plasma Bigscreen

15 Jan, 2022 1 commit

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

Script Kiddy authored Jan 15, 2022

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"

790dffcc

14 Jan, 2022 4 commits
- Merge branch 'fix/bigscreen_plasma_settings/upstream_changes' of... · 18930065
  Aditya Mehra authored Jan 15, 2022
```
Merge branch 'fix/bigscreen_plasma_settings/upstream_changes' of https://invent.kde.org/plasma/plasma-bigscreen into fix/bigscreen_plasma_settings/upstream_changes
```
  18930065
- Follow upstream plasma settings changes · 850fa130
  Aditya Mehra authored Jan 14, 2022
  
  850fa130
- Follow upstream plasma settings changes · 71393f78
  Aditya Mehra authored Jan 14, 2022
  
  71393f78
- Add support for power inhibition via powerdevil · fed13d93
  Aditya Mehra authored Jan 14, 2022
  
  fed13d93
12 Jan, 2022 1 commit

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

Script Kiddy authored Jan 12, 2022

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"

cb341314

11 Jan, 2022 1 commit

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

Script Kiddy authored Jan 11, 2022

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"

db83c8db

10 Jan, 2022 1 commit
- Merge branch 'integraion' · bf024f95
  Bart Ribbers authored Jan 10, 2022
  
  bf024f95
09 Jan, 2022 1 commit

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

Script Kiddy authored Jan 09, 2022

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"

e5287417

08 Jan, 2022 1 commit

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

Script Kiddy authored Jan 08, 2022

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"

2536165c

06 Jan, 2022 2 commits
- Fix typos, integraion -> integration · 8da17819
  Bart Ribbers authored Jan 06, 2022
  
  8da17819
- SVN_SILENT made messages (.desktop file) - always resolve ours · 75ec9fce
  Script Kiddy authored Jan 06, 2022
```
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"
```
  75ec9fce
05 Jan, 2022 1 commit

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

Script Kiddy authored Jan 05, 2022

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"

5d027613

29 Dec, 2021 2 commits

Install a startup script for X11-based sessions · 3841db90

Bart Ribbers authored Dec 22, 2021 and

Aleix Pol Gonzalez committed Dec 29, 2021

It seems the X11 session is still going to be used for a while on KDE
Neon and Manjaro. Let's at least make sure both X11 and Wayland are
launched the same way

3841db90

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

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

d12e76d4

23 Dec, 2021 1 commit

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

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

362d2c0c

19 Dec, 2021 1 commit
- Fix passing focus of recent apps · 1f44b4a1
  ivan tkachenko authored Dec 19, 2021
```
Amends f7acecb3

Authored-by: Someone going by the pseudonym “J.”
```
  1f44b4a1
16 Dec, 2021 2 commits
- Remove duplicate entry from .gitignore · 8a666166
  ivan tkachenko authored Dec 17, 2021
```
Whoops, should've checked existing context.

Amend 794e8139

GIT_SILENT
```
  8a666166
- Add auto generated files to .gitignore · 794e8139
  ivan tkachenko authored Dec 17, 2021
```
Task: sdk/kdesrc-build#86

GIT_SILENT
```
  794e8139
14 Dec, 2021 1 commit
- Fix scaling and layouts for lower resolution displays · 4c61cba7
  Aditya Mehra authored Dec 15, 2021
  
  4c61cba7
13 Dec, 2021 1 commit
- revert due to change in plasma-settings · 8fa363c7
  Aditya Mehra authored Dec 14, 2021
  
  8fa363c7
08 Dec, 2021 2 commits
- Add Linux CI · 2ca0e4f5
  Nicolas Fella authored Oct 05, 2021
  
  2ca0e4f5
- Add .kde-ci.yml · 3932ccfe
  Nicolas Fella authored Oct 05, 2021
  
  3932ccfe
06 Dec, 2021 1 commit

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

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

bd1b7dd1

15 Nov, 2021 1 commit

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

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

ad2b98a2

11 Nov, 2021 2 commits
- Use PlasmaCore Units for Icon Sizing, Fix Tiles Text Overflow · 1a5ec8c8
  Aditya Mehra authored Nov 11, 2021
  
  1a5ec8c8
- Remove unneeded X-Plasma-API from KCM metadata · 9ce60681
  Nicolas Fella authored Nov 11, 2021
```
It doesn't serve any purpose
```
  9ce60681
02 Nov, 2021 1 commit

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

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

77ee17d0

01 Nov, 2021 1 commit
- use module path instead of module name · 603d1ebd
  Aditya Mehra authored Nov 02, 2021
  
  603d1ebd
26 Oct, 2021 2 commits
- move settings actions to separate list for with and without integration · 28ba2b44
  Aditya Mehra authored Oct 26, 2021
  
  28ba2b44
- make sure action is not enabled and inactive if condition is not met · 25e900cb
  Aditya Mehra authored Oct 26, 2021
  
  25e900cb
15 Oct, 2021 1 commit
- make mycroft integration completely user and distro configurable · 7344fe3a
  Aditya Mehra authored Oct 15, 2021
  
  7344fe3a
13 Oct, 2021 1 commit

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

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

dd9335f4

01 Oct, 2021 1 commit
- Fix local delegate check state with key nav and use green ticks · 86e69900
  Aditya Mehra authored Oct 01, 2021
  
  86e69900
19 Sep, 2021 1 commit

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

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

aa027764

16 Sep, 2021 1 commit
- navigate to visible items only and hide voice apps if none available · f38c4327
  Aditya Mehra authored Sep 16, 2021
  
  f38c4327
07 Sep, 2021 1 commit
- Revert using the lookandfeeltool · da06c138
  Aleix Pol Gonzalez authored Sep 08, 2021
```
It needs proper integration in plasma
```
  da06c138
06 Sep, 2021 1 commit

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

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

2715ca27

03 Sep, 2021 2 commits
- remove unused calls · c79ff4ea
  Aditya Mehra authored Sep 03, 2021
  
  c79ff4ea
- Create a direct dbus call for resolution change as signals are non reliable · ebe971cb
  Aditya Mehra authored Sep 03, 2021
  
  ebe971cb