Merge lp://qastaging/~phablet-team/camera-app/photo-editor into lp://qastaging/camera-app
Proposed by
Ugo Riboni
Status: | Merged |
---|---|
Approved by: | Bill Filler |
Approved revision: | 438 |
Merged at revision: | 492 |
Proposed branch: | lp://qastaging/~phablet-team/camera-app/photo-editor |
Merge into: | lp://qastaging/camera-app |
Diff against target: |
355 lines (+196/-9) 5 files modified
GalleryViewHeader.qml (+35/-5) IconButton.qml (+3/-1) SlideshowView.qml (+56/-3) debian/control (+2/-0) tests/autopilot/camera_app/tests/test_photo_editor.py (+100/-0) |
To merge this branch: | bzr merge lp://qastaging/~phablet-team/camera-app/photo-editor |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Bill Filler (community) | Approve | ||
PS Jenkins bot | continuous-integration | Needs Fixing | |
Florian Boucault (community) | Needs Fixing | ||
Review via email:
|
Commit message
Add photo editor feature using the component from ubuntu-ui-extras.
Description of the change
Add photo editor feature using the component from ubuntu-ui-extras.
You will need this branch for this to work: https:/
To post a comment you must log in.
FAILED: Continuous integration, rev:431 jenkins. qa.ubuntu. com/job/ camera- app-ci/ 315/ jenkins. qa.ubuntu. com/job/ camera- app-vivid- amd64-ci/ 11 jenkins. qa.ubuntu. com/job/ camera- app-vivid- armhf-ci/ 11 jenkins. qa.ubuntu. com/job/ camera- app-vivid- armhf-ci/ 11/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ camera- app-vivid- i386-ci/ 11 jenkins. qa.ubuntu. com/job/ generic- click-autopilot -vivid- touch/23 jenkins. qa.ubuntu. com/job/ generic- mediumtests- vivid/221 jenkins. qa.ubuntu. com/job/ generic- click-autopilot -runner- mako/666 jenkins. qa.ubuntu. com/job/ generic- click-builder- vivid-armhf/ 43 s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 16187 jenkins. qa.ubuntu. com/job/ autopilot- testrunner- otto-vivid/ 193 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-amd64/ 225 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-amd64/ 225/artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
UNSTABLE: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/camera- app-ci/ 315/rebuild
http://