Merge lp://staging/~osomon/webbrowser-app/xenial-sru-1 into lp://staging/webbrowser-app/xenial
Proposed by
Olivier Tilloy
| Status: | Merged | ||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Olivier Tilloy | ||||||||||||||||||||||||||||||||||||||||
| Approved revision: | 1427 | ||||||||||||||||||||||||||||||||||||||||
| Merged at revision: | 1418 | ||||||||||||||||||||||||||||||||||||||||
| Proposed branch: | lp://staging/~osomon/webbrowser-app/xenial-sru-1 | ||||||||||||||||||||||||||||||||||||||||
| Merge into: | lp://staging/webbrowser-app/xenial | ||||||||||||||||||||||||||||||||||||||||
| Diff against target: |
905 lines (+274/-86) 27 files modified
debian/changelog (+15/-0) debian/control (+2/-1) src/Ubuntu/CMakeLists.txt (+4/-0) src/Ubuntu/Web/UserAgent02.qml (+4/-10) src/Ubuntu/Web/plugin.cpp (+7/-0) src/Ubuntu/Web/ua-overrides-desktop.js (+5/-0) src/Ubuntu/Web/ua-overrides-mobile.js (+6/-1) src/app/browserapplication.cpp (+32/-24) src/app/browserapplication.h (+1/-2) src/app/config.h.in (+0/-1) src/app/single-instance-manager.cpp (+39/-3) src/app/single-instance-manager.h (+1/-1) src/app/webbrowser/Browser.qml (+21/-15) src/app/webbrowser/BrowserTab.qml (+3/-2) src/app/webbrowser/NavigationBar.qml (+1/-2) src/app/webbrowser/webbrowser-app.cpp (+1/-1) src/app/webcontainer/WebApp.qml (+1/-0) src/app/webcontainer/WebViewImplOxide.qml (+28/-14) src/app/webcontainer/WebappContainerWebview.qml (+3/-1) src/app/webcontainer/webapp-container.cpp (+32/-1) src/app/webcontainer/webapp-container.h (+1/-0) src/app/webcontainer/webapp-container.qml (+2/-0) tests/autopilot/webapp_container/tests/__init__.py (+4/-0) tests/autopilot/webapp_container/tests/fake_servers.py (+29/-0) tests/autopilot/webapp_container/tests/test_popup_webview_overlay.py (+19/-0) tests/autopilot/webapp_container/tests/test_saml_url_patterns.py (+9/-3) tests/unittests/single-instance-manager/tst_SingleInstanceManagerTests.cpp (+4/-4) |
||||||||||||||||||||||||||||||||||||||||
| To merge this branch: | bzr merge lp://staging/~osomon/webbrowser-app/xenial-sru-1 | ||||||||||||||||||||||||||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Phablet Team | Pending | ||
|
Review via email:
|
|||
Commit message
SRU for selected bug fixes:
- LP #1565055: support for google hangouts
- LP #1573017: SAML detection logic broken in webapp container
- LP #1572673: invalid variable access error in webapp container
- LP #1466427: dynamic Ubuntu version in default UA string
- LP #1576639: fine-tune the custom memory-pressure handler
- LP #1581025: secure connection icon not showing
- LP #1580290: only load the current tab when the session is restored
- LP #1577806: browser and container open under the same instance
- LP #1565063: dynamic Chromium version in default UA string
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
