marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1094 commits 1 branch 0 tags 40 MiB
Commit graph

122 commits

Author SHA1 Message Date
l10n daemon script
2f63d3aaa1 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-03-23 06:03:45 +01:00
l10n daemon script
d1fdb28198 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-03-21 05:57:10 +01:00
l10n daemon script
d806a097e0 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-03-02 05:54:40 +01:00
l10n daemon script
b5783fedf5 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-02-19 05:56:56 +01:00
l10n daemon script
fb6681d5a5 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-02-17 05:51:58 +01:00
l10n daemon script
904370ea7b SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-02-16 05:57:19 +01:00
l10n daemon script
426b33533a SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-02-13 05:56:01 +01:00
Heiko Becker
d2f196e0c3 Replace plasma.kde.org with kde.org/plasma-desktop 
krunner is master only, so it wasn't part of the previous commit
merged from Plasma/5.18.
 2020-02-10 23:19:18 +01:00
Heiko Becker
3d6868889a Merge remote-tracking branch 'origin/Plasma/5.18' 2020-02-10 23:04:31 +01:00
Heiko Becker
41c1add040 Replace plasma.kde.org with kde.org/plasma-desktop 
Summary:
plasma.kde.org doesn't exist anymore and causes the appstream test to
to fail.

Reviewers: #plasma

Differential Revision: https://phabricator.kde.org/D27309
 2020-02-10 23:03:44 +01:00
l10n daemon script
8722372e0f SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-02-10 05:42:27 +01:00
l10n daemon script
88f838d147 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-02-09 05:53:42 +01:00
Marco Martin
25a85543cd fix the text field 2020-02-07 18:21:46 +01:00
l10n daemon script
5d486eca53 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-02-07 05:56:06 +01:00
Marco Martin
9eb128d798 search graphics 2020-02-05 20:34:48 +01:00
Marco Martin
ea57d633bb move krunner in a plasmoid 2020-02-05 20:25:52 +01:00
Marco Martin
bcb3a7ea3b new applet to access KRunner functions 2020-02-05 19:57:44 +01:00
l10n daemon script
8c675a32c3 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-01-24 10:05:11 +01:00
l10n daemon script
9b98493232 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-01-20 06:01:38 +01:00
l10n daemon script
ab190aa5da SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2019-12-28 05:25:20 +01:00
l10n daemon script
a7a5a3f003 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2019-12-04 05:36:25 +01:00
l10n daemon script
c6089a7b92 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2019-11-23 05:29:59 +01:00
l10n daemon script
78ce668071 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2019-11-20 05:40:05 +01:00
l10n daemon script
8e3a03beb4 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2019-11-16 05:03:41 +01:00
Nicolas Fella
9d14c6da15 Remove old notification applet 2019-10-25 10:22:57 +00:00
Marco Martin
91b4f891e7 hide applet when no notifications 2019-10-10 12:03:45 +02:00
Marco Martin
e7ade0e8c7 notifications flow top to bottom 2019-10-07 18:52:11 +02:00
l10n daemon script
f3b1522bf6 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2019-08-20 05:05:24 +02:00
Jonah Brüchert
bd03f2114d Remove dead code 2019-07-05 14:38:07 +00:00
l10n daemon script
3c628b921e SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2019-05-20 05:39:37 +02:00
Marco Martin
658312f2f1 solve loop when a new activity is created 
T10009
 2018-11-28 15:43:31 +01:00
l10n daemon script
c98ed27c73 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2018-10-10 06:50:31 +02:00
l10n daemon script
08cc1d8754 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2018-08-30 05:50:59 +02:00
l10n daemon script
55e692fa53 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2018-06-16 05:37:17 +02:00
l10n daemon script
ff7b037422 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2018-06-08 05:55:04 +02:00
l10n daemon script
b58419fb50 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2018-06-07 05:47:03 +02:00
l10n daemon script
4fd02993ea SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2018-01-19 05:11:15 +01:00
l10n daemon script
43831d9181 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2018-01-05 05:03:29 +01:00
l10n daemon script
5f485b434f SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2017-12-29 04:45:56 +01:00
l10n daemon script
1ebe7dbb7a SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2017-12-20 07:06:18 +01:00
Marco Martin
15c3acdc61 add missing prop pendingRemovals 2017-11-13 15:12:43 +01:00
l10n daemon script
c1acf75d7b SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2017-10-24 05:15:41 +02:00
l10n daemon script
812c61c5ff SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2017-09-27 09:12:08 +02:00
Marco Martin
4123f08c89 don't build quicksettings 2017-09-18 12:31:28 +02:00
Marco Martin
3d7a8f62fc stepsize 1 for screen brightness 2017-09-12 20:27:08 +02:00
Marco Martin
e03fde87af smaller icons 2017-09-12 20:14:14 +02:00
l10n daemon script
79c177f94c SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2017-09-12 04:55:15 +02:00
l10n daemon script
51f9dcce9f SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2017-09-11 04:59:00 +02:00
l10n daemon script
56cb796dd5 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2017-09-05 04:31:55 +02:00
Marco Martin
535ae14459 hide fake notifications 2017-09-04 18:25:22 +02:00