camera-app

Merge lp://qastaging/~artmello/camera-app/camera-app-show_preview_content_picker into lp://qastaging/camera-app

  1. camera-app-show_preview_content_picker
  2. Merge into trunk
Proposed by Arthur Mello
Status: Needs review
Proposed branch: lp://qastaging/~artmello/camera-app/camera-app-show_preview_content_picker
Merge into: lp://qastaging/camera-app
Diff against target: 206 lines (+42/-30)
4 files modified
GalleryView.qml (+27/-18)
GalleryViewHeader.qml (+5/-4)
PhotogridView.qml (+7/-7)
SlideshowView.qml (+3/-1)
To merge this branch: bzr merge lp://qastaging/~artmello/camera-app/camera-app-show_preview_content_picker
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing
Sebastien Bacher Needs Fixing
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+244615@code.qastaging.launchpad.net

Commit message

Make the select mode beahvior on content picker equal to the user selection mode

Description of the change

Make the select mode beahvior on content picker equal to the user selection mode

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:451
http://jenkins.qa.ubuntu.com/job/camera-app-ci/346/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/42
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/42/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/42
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/60
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/308
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/700
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/91
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16550
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/261
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/314
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/314/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/346/rebuild

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Sebastien Bacher (seb128) wrote :

That has been sitting there for a while and now has merge conflicts, it needs at least to be rebased ... could you do that if it's still accurate, then maybe we can try to get it landed?

review: Needs Fixing
Reply
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:451
https://jenkins.canonical.com/system-apps/job/lp-camera-app-ci/2/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/771/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/771/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-camera-app-ci/2/rebuild

review: Needs Fixing (continuous-integration)
Reply

Unmerged revisions

451. By Arthur Mello

Does not show the previous taken photo if we are in content picker

450. By Arthur Mello

Control the display of the actions drawer on the content picker

449. By Arthur Mello

Control the display of the select all button on the content picker

448. By Arthur Mello

Make the select mode beahvior on content picker equal to the user selection mode

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