Commits · master · Plasma / Plasma Bigscreen

27 Jun, 2020 1 commit

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

Script Kiddy authored Jun 27, 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"

232a932a

26 Jun, 2020 1 commit
- add implementation to receive STT from KDE Connect and forward it to mycroft · 76c4dd64
  Aditya Mehra authored Jun 26, 2020
  
  76c4dd64
25 Jun, 2020 1 commit

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

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

d6dd0d29

19 Jun, 2020 1 commit

Update minimum LibKWorkspace version to 5.19 · 660638cc

Noah Davis authored Jun 19, 2020

There is a Kicker property used in `containments/homescreen/package/contents/ui/launcher/LauncherHome.qml` at line 68 that didn't exist until March 2020.

660638cc

18 Jun, 2020 1 commit

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

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"

be4bd625

17 Jun, 2020 4 commits
- Add plasma-nano dependency to README.md · afe841b0
  Noah Davis authored Jun 17, 2020
  
  afe841b0
- Actually make homescreen work without Mycroft · c874985c
  Noah Davis authored Jun 17, 2020
```
Before, it would still error when trying to load MycroftWindow and MycroftIndicator
```
  c874985c
- SVN_SILENT made messages (.desktop file) - always resolve ours · e282457e
  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"
```
  e282457e
- SVN_SILENT made messages (.desktop file) - always resolve ours · 9f0a67b0
  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"
```
  9f0a67b0
13 Jun, 2020 1 commit

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

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

6eddccd0

05 Jun, 2020 1 commit

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

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

99406844

03 Jun, 2020 1 commit

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

Script Kiddy authored Jun 03, 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"

04c17035

18 May, 2020 4 commits
- fix tiles colors · 6fc255c3
  Marco Martin authored May 18, 2020
  
  6fc255c3
- make app models work again · d215f0c0
  Marco Martin authored May 18, 2020
  
  d215f0c0
- remove old imagepalette · 1f01dcc9
  Marco Martin authored May 18, 2020
  
  1f01dcc9
- port to kirigami imagecolors · 0c0d2f25
  Marco Martin authored May 18, 2020
  
  0c0d2f25
09 May, 2020 1 commit

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

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

34dfc3f8

28 Apr, 2020 1 commit
- use QtConcurrent for pixels iteration · 512c29ec
  Marco Martin authored Apr 28, 2020
  
  512c29ec
27 Apr, 2020 1 commit

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

Script Kiddy authored Apr 27, 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"

d080e7f5

19 Apr, 2020 5 commits

Merge branch 'TileViewSounds' into 'master' · 94f54af2
Noah Davis authored Apr 19, 2020
```
Remove sounds from TileView

See merge request kde/plasma-bigscreen!18
```
94f54af2
Remove sounds from TileView until I can do a real fix · 82df3328
Noah Davis authored Apr 19, 2020

82df3328

README: mention how to actually start it. · c751d107

David Faure authored Apr 19, 2020

Summary: + fix typo QT -> Qt

Reviewers: ndavis, mart

Differential Revision: https://phabricator.kde.org/D28984

c751d107

plasma-bigscreen: fix some runtime warnings · 1be2f6b3

David Faure authored Apr 19, 2020

Summary: There's no QML element called mainView or mycroftWindow anywhere.

Test Plan: plasmashell -p org.kde.plasma.mycroft.bigscreen, less warnings

Reviewers: ndavis, mart

Reviewed By: ndavis

Differential Revision: https://phabricator.kde.org/D28983

1be2f6b3

Remove last traces of models that don't exist anymore · c4e163c4

David Faure authored Apr 19, 2020

voiceAppListModel and gamesAppListModel were removed some time ago.

Fixes:
LauncherMenu.qml:60: TypeError: Cannot call method 'loadApplications' of undefined

c4e163c4

15 Apr, 2020 1 commit
- Merge branch 'sounds' into 'master' · 5ecd4701
  Marco Martin authored Apr 15, 2020
```
Add navigation sounds

See merge request kde/plasma-bigscreen!17
```
  5ecd4701
14 Apr, 2020 4 commits
- Add clicked sound to launcher delegates · 37a87dbe
  Noah Davis authored Apr 14, 2020
  
  37a87dbe
- Add clicked and moving sounds to AbstractIndicator · 816d5a9e
  Noah Davis authored Apr 14, 2020
  
  816d5a9e
- Add moving sounds to TileRepeater and TileView · 85e7a9d7
  Noah Davis authored Apr 14, 2020
  
  85e7a9d7
- Add NavigationSoundEffects singleton · ff234384
  Noah Davis authored Apr 14, 2020
  
  ff234384
13 Apr, 2020 7 commits
- Swap clicked and moving sounds · d29e4419
  Noah Davis authored Apr 06, 2020
  
  d29e4419
- Add moving sound · 9b58e6ef
  Noah Davis authored Apr 06, 2020
  
  9b58e6ef
- Change clicked sound · 515130fa
  Noah Davis authored Apr 03, 2020
  
  515130fa
- Install sounds to standard sounds folder · 0f053c22
  Noah Davis authored Mar 30, 2020
  
  0f053c22
- Add clicked.wav · 679e209e
  Noah Davis authored Mar 30, 2020
  
  679e209e
- hide window if a vlacklisted skill is activated · d6751450
  Marco Martin authored Apr 13, 2020
  
  d6751450
- SVN_SILENT made messages (.desktop file) - always resolve ours · 03409a6e
  Script Kiddy authored Apr 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"
```
  03409a6e
06 Apr, 2020 1 commit

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

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

13f2e6b1

05 Apr, 2020 1 commit

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

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

828a94f0

04 Apr, 2020 1 commit

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

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

f14f547b

03 Apr, 2020 1 commit
- prevent keyboard stealing when kdeconnect pairing request active · 712606ac
  Aditya Mehra authored Apr 03, 2020
  
  712606ac