~rikmills/+git/elisa-upstream:master

Last commit made on 2020-01-24
Get this branch:
git clone -b master https://git.launchpad.net/~rikmills/+git/elisa-upstream

Branch merges

Branch information

Name:
master
Repository:
lp:~rikmills/+git/elisa-upstream

Recent commits

71ab346... by l10n daemon script <email address hidden> 13 hours ago

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"

652fd49... by l10n daemon script <email address hidden> 16 hours ago

GIT_SILENT made messages (after extraction)

bc7b362... by Matthieu Gallien on 2020-01-23

Merge branch 'release/19.12'

df7bc03... by Matthieu Gallien on 2020-01-05

do not show cover when creating a radio

a8df563... by Matthieu Gallien on 2020-01-05

fix radio metadata dialog

e444898... by Matthieu Gallien on 2020-01-05

fix assert when displaying list of radios

3a103b0... by Matthieu Gallien on 2020-01-05

fix loading track metadata in TrackMetaDataModel

5fb8a94... by Matthieu Gallien on 2020-01-05

remove needed import in GridBrowserDelegate.qml

0c042a8... by Matthieu Gallien on 2019-10-23

allow database to contain and get tracks without metadata

display only the filename

I plan to add on top the work done by astippich that uses a sligthly
different approach

the tests are KO

the tracks without metadata are imported again and again. Needs fixing.

use url everywhere we refer to tracks or radios

allow to handle tracks without databaseId like the case of a track
without metadata

BUG: 415180

6fb031b... by Matthieu Gallien on 2019-10-23

do not reimport tracks without metadata at start