Merge lp://staging/~phablet-team/webbrowser-app/OTA-15 into lp://staging/~phablet-team/webbrowser-app/OTA-14-vivid

Proposed by Olivier Tilloy
Status: Merged
Merged at revision: 1529
Proposed branch: lp://staging/~phablet-team/webbrowser-app/OTA-15
Merge into: lp://staging/~phablet-team/webbrowser-app/OTA-14-vivid
Diff against target: 250 lines (+107/-42)
8 files modified
CMakeLists.txt (+0/-5)
debian/changelog (+11/-0)
debian/control (+1/-2)
src/Ubuntu/CMakeLists.txt (+0/-8)
src/Ubuntu/Web/UbuntuWebContext.qml (+7/-1)
src/Ubuntu/Web/ua-overrides-desktop.js.in (+43/-14)
src/Ubuntu/Web/ua-overrides-mobile.js.in (+39/-12)
tests/unittests/qml/CMakeLists.txt (+6/-0)
To merge this branch: bzr merge lp://staging/~phablet-team/webbrowser-app/OTA-15
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+315484@code.staging.launchpad.net

Commit message

* Replace chromium version in UA overrides at runtime, not at build time (LP: #1599695)
* Complete overhaul of UA overrides.
* Add UA overrides for Google+ (LP: #1656310)
* Add a UA override for Ebay (LP: #1575780)

To post a comment you must log in.
1532. By Olivier Tilloy

Add a UA override for appear.in.

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: