Merge lp://qastaging/~osomon/webbrowser-app/staging-20170307 into lp://qastaging/webbrowser-app
| Status: | Merged |
|---|---|
| Approved by: | Olivier Tilloy |
| Approved revision: | 1633 |
| Merged at revision: | 1581 |
| Proposed branch: | lp://qastaging/~osomon/webbrowser-app/staging-20170307 |
| Merge into: | lp://qastaging/webbrowser-app |
| Diff against target: |
2693 lines (+636/-948) 42 files modified
.bzrignore (+1/-0) debian/changelog (+46/-0) debian/control (+2/-1) debian/rules (+2/-1) debian/webbrowser-app-apparmor.manifest (+2/-0) snap/snapcraft.yaml (+20/-9) snap/webbrowser-app.launcher (+1/-1) src/Ubuntu/CMakeLists.txt (+1/-20) src/Ubuntu/Web/ItemSelector02.qml (+139/-21) src/Ubuntu/Web/UbuntuWebView02.qml (+2/-2) src/Ubuntu/Web/ua-overrides-desktop.js.in (+6/-0) src/Ubuntu/Web/ua-overrides-mobile.js.in (+3/-0) src/Ubuntu/chromium-version.qml (+0/-6) src/app/BrowserWindow.qml (+5/-2) src/app/webbrowser/AddressBar.qml (+1/-1) src/app/webbrowser/Browser.qml (+97/-92) src/app/webbrowser/BrowserTab.qml (+10/-1) src/app/webbrowser/CMakeLists.txt (+0/-1) src/app/webbrowser/Chrome.qml (+22/-21) src/app/webbrowser/HistoryViewWide.qml (+2/-2) src/app/webbrowser/TabComponent.qml (+15/-12) src/app/webbrowser/TabsBar.qml (+0/-345) src/app/webbrowser/UrlDelegate.qml (+3/-3) src/app/webbrowser/UrlDelegateWide.qml (+3/-3) src/app/webbrowser/drag-helper.cpp (+0/-203) src/app/webbrowser/drag-helper.h (+0/-91) src/app/webbrowser/searchengines/peekier.xml (+10/-0) src/app/webbrowser/tabs-model.cpp (+29/-4) src/app/webbrowser/tabs-model.h (+2/-1) src/app/webbrowser/webbrowser-app.cpp (+1/-4) src/app/webbrowser/webbrowser-app.desktop.in.in (+4/-4) src/app/webbrowser/webbrowser-app.qml (+16/-36) src/app/webcontainer/webapp-container.qml (+3/-1) tests/autopilot/webbrowser_app/emulators/browser.py (+3/-4) tests/autopilot/webbrowser_app/tests/__init__.py (+10/-1) tests/autopilot/webbrowser_app/tests/test_contextmenu.py (+31/-5) tests/autopilot/webbrowser_app/tests/test_fullscreen.py (+31/-0) tests/autopilot/webbrowser_app/tests/test_tabs.py (+21/-1) tests/unittests/qml/CMakeLists.txt (+0/-1) tests/unittests/qml/tst_QmlTests.cpp (+1/-4) tests/unittests/qml/tst_TabsBar.qml (+56/-38) tests/unittests/tabs-model/tst_TabsModelTests.cpp (+35/-6) |
| To merge this branch: | bzr merge lp://qastaging/~osomon/webbrowser-app/staging-20170307 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Phablet Team | Pending | ||
|
Review via email:
|
|||
Commit message
[ Alexandre Abreu ]
* Explicitely define Ctrl+R as the refresh shortcut for the browser (LP: #1593877)
[ Andrew Hayzen ]
* Use the new TabsBar component from Ubuntu.
[ Florian Boucault ]
* Add Peekier to available search engines (LP: #1649673)
* Bookmarks and history: increased font size one level
* Make new tabs opened in the background to be placed next to the tab requesting them instead of at the end of the list of tabs (LP: #1499780)
* Enable predictive text in address bar (LP: #1378750)
* Fix issue with new tab page sometimes never being unloaded (LP: #1659435)
* Snap: embed ubuntu-ui-extras by building it from source
* Improved UX for <select> dropdowns in web content
* Store and restore on startup the size of each window (LP: #1312892)
* Do not go fullscreen if already fullscreen (LP: #1665727)
* Do not rely on qmake as webbrowser is CMake based
[ Matthieu James ]
* Updated browser icon (LP: #1358050)
[ Michael Terry ]
* Properly set the APP_ID variable for the snappy world
[ Olivier Tilloy ]
* Use the no-system-libraries build attribute instead of specifying extra stage packages
* Move snapcraft.yaml to snap directory (new in snapcraft 2.26)
* Drop X-Ubuntu-
* Add a desktop UA override for dailymotion.com (LP: #1662826)
* Log oxide and chromium versions at app startup
* Add UA overrides for google photos (desktop and mobile) (LP: #1665926)
* Explicitly plug to the "mir" interface (LP: #1662145)
* Add "ibus" and "nvidia" apparmor abstractions to webbrowser-app apparmor profile
* Additional holes in generated apparmor profile to allow webbrowser-app to run under unity8 in zesty (LP: #1590561)
