Commit graph

305 commits

Author SHA1 Message Date
l10n daemon script
45c00f8db4 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-03-30 05:19:36 +02:00
Simon Redman
bf327e5b8c Reduce dependencies of smsapp to kirigami 2.2 2018-03-27 17:10:10 +02:00
l10n daemon script
35f0747ff0 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-03-27 05:26:51 +02:00
Aleix Pol
bee6c4a8be Use KPeople API that exists 2018-03-25 22:21:39 +02:00
Aleix Pol
c863feef58 Optionally include sms app
Creates a tiny messaging app that uses KPeople to query the contacts and
KDE connect telephony plugins to send plugins.
To be ready, still needs some work on the contacts sync side and some
messages history would be nice.
2018-03-25 20:48:38 +02:00