Ubuntu Music App

Merge lp:~vthompson/music-app/ix-1538832-gridview-offset into lp:music-app

  1. ix-1538832-gridview-offset
  2. Merge into trunk
Proposed by Victor Thompson
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 981
Merged at revision: 981
Proposed branch: lp:~vthompson/music-app/ix-1538832-gridview-offset
Merge into: lp:music-app
Diff against target: 24 lines (+2/-1)
2 files modified
app/ui/AddToPlaylist.qml (+1/-1)
debian/changelog (+1/-0)
To merge this branch: bzr merge lp:~vthompson/music-app/ix-1538832-gridview-offset
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Andrew Hayzen Approve
Review via email: mp+287400@code.launchpad.net

Commit message

* Remove offset from the top of AddToPlaylist.qml

Description of the change

* Remove offset from the top of AddToPlaylist.qml

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:979
https://core-apps-jenkins.ubuntu.com/job/music-app-ci/87/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/635/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/music-app-ci/87/rebuild

review: Needs Fixing (continuous-integration)
lp:~vthompson/music-app/ix-1538832-gridview-offset updated
980. By Victor Thompson

remove newline

981. By Victor Thompson

merge of trunk and resolve conflict.

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:981
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1079/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/636/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1079/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

LGTM :-)

review: Approve
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/ui/AddToPlaylist.qml'
2--- app/ui/AddToPlaylist.qml 2016-02-28 01:18:29 +0000
3+++ app/ui/AddToPlaylist.qml 2016-02-28 01:51:33 +0000
4@@ -61,7 +61,7 @@
5 anchors {
6 fill: undefined
7 }
8- height: mainView.height
9+ height: mainView.height + musicToolbar.height
10 width: mainView.width
11
12 property var chosenElements: []
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2016-02-28 01:18:29 +0000
16+++ debian/changelog 2016-02-28 01:51:33 +0000
17@@ -7,6 +7,7 @@
18 * Ensure that only one ContentHubExport page is open (LP: #1538863).
19 * Fix fallback image path in MusicListItem (LP: #1549580).
20 * Fix regression where AddToPlaylist.qml no long supports plural track counts (LP: #1550832).
21+ * Remove offset from the top of AddToPlaylist.qml (LP: #1538832).
22
23 [ Andrew Hayzen ]
24 * Fix so that a press and hold cannot disable selection in the ContentHubExport.qml (LP: #1538838)

Subscribers

People subscribed via source and target branches