Merge lp://staging/~mardy/signon-ui/oxide into lp://staging/signon-ui
Proposed by
Alberto Mardegan
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Alberto Mardegan | ||||||||
Approved revision: | 138 | ||||||||
Merged at revision: | 131 | ||||||||
Proposed branch: | lp://staging/~mardy/signon-ui/oxide | ||||||||
Merge into: | lp://staging/signon-ui | ||||||||
Diff against target: |
1534 lines (+322/-926) 24 files modified
.bzrignore (+1/-0) debian/changelog (+6/-0) debian/rules (+1/-1) src/browser-process/UserAgent.qml (+0/-90) src/browser-process/WebView.qml (+0/-62) src/browser-process/browser-process.cpp (+0/-291) src/browser-process/browser-process.h (+0/-50) src/browser-process/browser-process.pro (+0/-64) src/browser-process/debug.h (+0/-37) src/browser-process/main.cpp (+0/-68) src/browser-process/signon-ui-browser-process.desktop.in (+0/-11) src/browser-process/ua-overrides.js (+0/-99) src/com.nokia.singlesignonui.service.in (+1/-1) src/qml/MainWindow.qml (+1/-0) src/qml/WebView.qml (+24/-0) src/qml/qml.qrc (+0/-2) src/qquick-dialog.cpp (+2/-2) src/qquick-dialog.h (+8/-4) src/request.cpp (+6/-6) src/signon-ui.desktop.in (+11/-0) src/signon-ui.pro (+24/-7) src/src.pro (+0/-7) src/ubuntu-browser-request.cpp (+224/-110) src/ubuntu-browser-request.h (+13/-14) |
||||||||
To merge this branch: | bzr merge lp://staging/~mardy/signon-ui/oxide | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Justin McPherson | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Online Accounts | Pending | ||
Review via email: mp+215661@code.staging.launchpad.net |
Commit message
Use the new Oxide-powered UbuntuWebView
Description of the change
Use Oxide.
To post a comment you must log in.
FAILED: Continuous integration, rev:132 jenkins. qa.ubuntu. com/job/ signon- ui-ci/52/ jenkins. qa.ubuntu. com/job/ signon- ui-trusty- amd64-ci/ 11/console jenkins. qa.ubuntu. com/job/ signon- ui-trusty- armhf-ci/ 11 jenkins. qa.ubuntu. com/job/ signon- ui-trusty- armhf-ci/ 11/artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/signon- ui-ci/52/ rebuild
http://