Commit graph

65 commits

Author SHA1 Message Date
l10n daemon script
69d8a40aa6 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"
2015-06-24 10:38:32 +00:00
Aleix Pol
d6c779c938 improve navigation button usability 2015-06-24 00:36:57 +02:00
Aleix Pol
c7055cfe15 Adapt to changes in DevicesModel 2015-06-22 06:47:31 +02:00
Aleix Pol
9f4d837b22 Adapt to changes in DevicesModel 2015-06-22 06:45:18 +02:00
l10n daemon script
d8b3d829e4 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"
2015-06-20 11:56:14 +00:00
l10n daemon script
7fb21dec12 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"
2015-06-19 10:41:31 +00:00
Aleix Pol
d741465473 Make it possible to go back from any page by having a back button on the toolbar 2015-06-19 07:22:00 +02:00
Aleix Pol
46b57003cd Display the device model section
This way we can differentiate between the different states
2015-06-19 07:14:02 +02:00
Aleix Pol
4654a61a5f Fix icon placing in the DeviceDelegate 2015-06-19 07:13:04 +02:00
l10n daemon script
700eff446e 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"
2015-06-18 11:49:24 +00:00
Aleix Pol
5c79e8a7a6 Implement an MPRIS client plugin
Makes it possible to control remote MPRIS instances.

REVIEW: 124100
2015-06-18 04:01:01 +02:00
l10n daemon script
0899923dbc 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"
2015-06-16 13:33:29 +00:00
l10n daemon script
d4074b42fa 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"
2015-06-15 09:58:46 +00:00
Aleix Pol
5ccdf931a9 Add desktop file for kcapp 2015-06-13 20:35:09 +02:00
Aleix Pol
de9671e26a Experimental frontend 2015-06-13 01:30:38 +02:00