kdeconnect-kde

tristan/kdeconnect-kde

Fork 0

Commit graph

Author	SHA1	Message	Date
l10n daemon script	6818cbe881	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-09-11 06:16:50 +02:00
Simon Redman	bcc9fb06db	Split SMS and Telephony plugin on desktop Summary: Telephony and SMS handling are quite distinct so they should be in separate plugins for better maintainability, given that @sredman has big plans with SMS. This diff should be fully backwards compatible, but whether we really want to do that is up to discussion Test Plan: Only supeficially tested. Receive an SMS (old way), Notification is shown Reviewers: #kde_connect, sredman Reviewed By: sredman Subscribers: albertvaka, apol, sredman, kdeconnect, #kde_connect Tags: #kde_connect Differential Revision: https://phabricator.kde.org/D13594	2018-09-10 11:31:05 +02:00

Author

SHA1

Message

Date

l10n daemon script

6818cbe881

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-09-11 06:16:50 +02:00

Simon Redman

bcc9fb06db

Split SMS and Telephony plugin on desktop

Summary:
Telephony and SMS handling are quite distinct so they should be in separate plugins for better maintainability, given that @sredman has big plans with SMS.
This diff should be fully backwards compatible, but whether we really want to do that is up to discussion

Test Plan: Only supeficially tested. Receive an SMS (old way), Notification is shown

Reviewers: #kde_connect, sredman

Reviewed By: sredman

Subscribers: albertvaka, apol, sredman, kdeconnect, #kde_connect

Tags: #kde_connect

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

2018-09-10 11:31:05 +02:00

1 2 3

102 commits