gallery-app

Merge lp://staging/~artmello/gallery-app/gallery-app-fix_1523573 into lp://staging/gallery-app

gallery-app-fix_1523573
Merge into trunk

Proposed by Arthur Mello on 2016-02-12

Status:

Merged

Approved by:

Bill Filler on 2016-03-23

Approved revision:

1271

Merged at revision:

1289

Proposed branch:

lp://staging/~artmello/gallery-app/gallery-app-fix_1523573

Merge into:

lp://staging/gallery-app

Diff against target:

495 lines (+177/-43)

11 files modified

po/gallery-app.pot (+31/-19)
rc/qml/Components/UnableShareDialog.qml (+34/-0)
rc/qml/EventsOverview.qml (+11/-2)
rc/qml/PhotosOverview.qml (+11/-1)
tests/autopilot/gallery_app/emulators/events_view.py (+5/-0)
tests/autopilot/gallery_app/emulators/media_selector.py (+2/-1)
tests/autopilot/gallery_app/emulators/photos_view.py (+12/-3)
tests/autopilot/gallery_app/tests/__init__.py (+9/-6)
tests/autopilot/gallery_app/tests/test_events_view.py (+31/-4)
tests/autopilot/gallery_app/tests/test_photo_viewer.py (+5/-5)
tests/autopilot/gallery_app/tests/test_photos_view.py (+26/-2)

To merge this branch:

bzr merge lp://staging/~artmello/gallery-app/gallery-app-fix_1523573

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2016-03-08
Ubuntu Phablet Team		2016-02-12	Pending
Review via email: mp+285855@code.staging.launchpad.net

Commit message

Enable sharing multiple files
Notify user when trying to share photos and videos at the same time

Description of the change

Enable sharing multiple files
Notify user when trying to share photos and videos at the same time

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-02-12:

FAILED: Continuous integration, rev:1266
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1239/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/167
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/167
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/167/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/167
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/407
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1077
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/990
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27535

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

review: Needs Fixing (continuous-integration)

lp://staging/~artmello/gallery-app/gallery-app-fix_1523573 updated on 2016-02-12

1267. By Arthur Mello on 2016-02-12: Add AP tests to check sharing files from photos and events view
1268. By Arthur Mello on 2016-02-12: Update pot file