kdeconnect-desktop:release/20.08

Last commit made on 2020-11-02
Get this branch:
git clone -b release/20.08 https://git.launchpad.net/kdeconnect-desktop

Branch merges

Branch information

Name:
release/20.08
Repository:
lp:kdeconnect-desktop

Recent commits

0f32462... by albertvaka

Revert "[sms] Restore compatibility with current Android release"
R
A new Android app was released

This reverts commit 4266834052983a788bb12a579da18fd35832d763.

18031e9... by Nicolas Fella <email address hidden>

Set window icons for GUI executables

Otherwise the task bar entry on Gnome won't have an icon.

(cherry picked from commit a600c27490186c43ba5b193d0037a6dcd89e89ed)

4266834... by Nicolas Fella <email address hidden>

[sms] Restore compatibility with current Android release

The current code requires the multitarget support. This is only available in the yet-to-be-released Android version.
Fall back to the old style packet format as a quick fix for 20.08 before we can implement a proper solution in master.

BUG: 427266

436607f... by l10n daemon script <email address hidden>

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"

88abdf8... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

44714e6... by l10n daemon script <email address hidden>

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"

24dd779... by l10n daemon script <email address hidden>

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"

674e826... by Nicolas Fella <email address hidden>

Work around SMS not being sent from cli

Something in the demarshalling of the address list is broken and I can't figure out why.
Instead expose a much simpler method that only takes one address string.
This removes the ability to send to multiple destinations from one command, but that's better than not working at all.

This patch is for 20.08 only as the marshalling works differently in master anyway.

37f82dc... by l10n daemon script <email address hidden>

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"

fc4d868... by l10n daemon script <email address hidden>

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"