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
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.
lp://staging/~mardy/signon-ui/oxide updated
131. By Alberto Mardegan

Update to new Oxide version

132. By Alberto Mardegan

Add desktop file for signon-ui (unity8)

133. By Alberto Mardegan

Add desktop_file_hint for unity8

134. By Alberto Mardegan

Restore "cancel" functionality

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
lp://staging/~mardy/signon-ui/oxide updated
135. By Alberto Mardegan

Remove unused variable

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
lp://staging/~mardy/signon-ui/oxide updated
136. By Alberto Mardegan

Removed unused memebers

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
lp://staging/~mardy/signon-ui/oxide updated
137. By Alberto Mardegan

Update changelog

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
lp://staging/~mardy/signon-ui/oxide updated
138. By Alberto Mardegan

Merge from trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Justin McPherson (justinmcp) :
review: Approve

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 all changes: