Ubuntu File Manager App

Merge lp://qastaging/~dpniel/ubuntu-filemanager-app/new-listitems into lp://qastaging/ubuntu-filemanager-app

  1. new-listitems
  2. Merge into trunk
Proposed by Dan Chapman ξƒΏ
Status: Needs review
Proposed branch: lp://qastaging/~dpniel/ubuntu-filemanager-app/new-listitems
Merge into: lp://qastaging/ubuntu-filemanager-app
Prerequisite: lp://qastaging/~dpniel/ubuntu-filemanager-app/new-page-header
Diff against target: 133 lines (+53/-27)
3 files modified
po/com.ubuntu.filemanager.pot (+1/-1)
src/app/qml/components/FolderListDelegate.qml (+27/-12)
src/app/qml/components/PlacesSidebar.qml (+25/-14)
To merge this branch: bzr merge lp://qastaging/~dpniel/ubuntu-filemanager-app/new-listitems
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Alan Pope 🍺🐧🐱 πŸ¦„ (community) Approve
Review via email: mp+296500@code.qastaging.launchpad.net

Commit message

Migrate FolderListDelegate and Places delegate to new ListItem

Description of the change

Migrate FolderListDelegate and Places delegate to new ListItem

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

PASSED: Continuous integration, rev:543
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/85/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/908/console

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

review: Approve (continuous-integration)
Reply
Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :

LGTM! Thanks!

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

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-autolanding/44/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/5756/console

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Dan Chapman ξƒΏ (dpniel) wrote :

meh. pot file conflict. Probably from the updated page-header branch.

Reply
Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :

Doh, can you fix and we'll land it?

Reply
Revision history for this message
Dan Chapman ξƒΏ (dpniel) wrote :

forgot to push it last night. Doing it now :-D

Reply
lp://qastaging/~dpniel/ubuntu-filemanager-app/new-listitems updated
544. By Dan Chapman ξƒΏ

Fix pot conflicts

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

PASSED: Continuous integration, rev:544
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/87/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/914/console

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

review: Approve (continuous-integration)
Reply

Unmerged revisions

544. By Dan Chapman ξƒΏ

Fix pot conflicts

543. By Dan Chapman ξƒΏ

Migrate FolderListDelegate and Places delegate to new ListItem

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches