kdeconnect-desktop:master

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

Branch merges

Branch information

Name:
master
Repository:
lp:kdeconnect-desktop

Recent commits

aef817e... by l10n daemon script <email address hidden> on 2020-07-02

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"

752070a... by Nicolas Fella <email address hidden> on 2020-07-01

Enable highdpi icons

166a880... by Nicolas Fella <email address hidden> on 2020-07-01

[smsapp] Rework message items

The current implementation seems to have an issue with an undetected binding loop that causes lockup. During investigation I figured that the code was way to complex and brittle for what we need.

This is a cleaner reimplementation. It also replaces the custom Avatar component with the one from Kirigami.

The looks are subject to tweaking of course

d0443e2... by l10n daemon script <email address hidden> on 2020-07-01

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"

2b8e95c... by Aniket Kumar <email address hidden> on 2020-05-06

[smsapp] Replace custom ListItem with Kirigami's BasicListItem

588c01e... by l10n daemon script <email address hidden> on 2020-06-27

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"

e5c6003... by Jonah BrĂ¼chert <email address hidden> on 2020-06-22

app: Elide device name in global drawer

e44e4a4... by l10n daemon script <email address hidden> on 2020-06-20

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"

e046b88... by l10n daemon script <email address hidden> on 2020-06-20

GIT_SILENT made messages (after extraction)

653a708... by l10n daemon script <email address hidden> on 2020-06-18

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"