webbrowser-app

Merge lp://qastaging/~osomon/webbrowser-app/zoomFactor into lp://qastaging/webbrowser-app

  1. zoomFactor
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Merged at revision: 1472
Proposed branch: lp://qastaging/~osomon/webbrowser-app/zoomFactor
Merge into: lp://qastaging/webbrowser-app
Diff against target: 146 lines (+86/-3)
3 files modified
debian/control (+1/-1)
src/app/webbrowser/Browser.qml (+36/-1)
tests/autopilot/webbrowser_app/tests/test_keyboard.py (+49/-1)
To merge this branch: bzr merge lp://qastaging/~osomon/webbrowser-app/zoomFactor
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+292637@code.qastaging.launchpad.net

Commit message

Keyboard shortcuts for zoom factor:
 - Ctrl+Plus: zoom in
 - Ctrl+Minus: zoom out
 - Ctrl+0: reset zoom factor to 100%

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

FAILED: Continuous integration, rev:1429
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2704/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6868/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1457/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1457/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1457/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6879/console

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

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

FAILED: Continuous integration, rev:1429
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/462/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/464/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/464
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/463
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/463
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/470
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/470/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/470/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/470
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/470/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/470
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/470/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/470
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/470/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/470
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/470/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
lp://qastaging/~osomon/webbrowser-app/zoomFactor updated
1430. By Olivier Tilloy

Merge the latest changes from trunk and resolve a minor conflict.

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1430
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/496/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/498/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/498
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/490/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/490/console

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

review: Needs Fixing (continuous-integration)
lp://qastaging/~osomon/webbrowser-app/zoomFactor updated
1431. By Olivier Tilloy

Merge the latest changes from trunk and resolve a couple of minor conflicts.

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1431
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/503/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/505/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/505
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/497/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/497/console

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

review: Needs Fixing (continuous-integration)

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

to status/vote changes: