lp:~osomon/webbrowser-app/with-oxide

Branch merges

Merged into lp:webbrowser-app at revision 473

PS Jenkins bot: Needs Fixing (continuous-integration) on 2014-03-28

Ubuntu Phablet Team: Pending requested 2014-03-28

Diff: 3771 lines (+1789/-1133)

50 files modified

CMakeLists.txt (+1/-0)
debian/control (+5/-2)
po/webbrowser-app.pot (+93/-67)
src/Ubuntu/Components/Extras/Browser/CMakeLists.txt (+1/-1)
src/Ubuntu/Components/Extras/Browser/ItemSelector01.qml (+63/-0)
src/Ubuntu/Components/Extras/Browser/ItemSelector02.qml (+5/-2)
src/Ubuntu/Components/Extras/Browser/UbuntuWebContext.qml (+58/-0)
src/Ubuntu/Components/Extras/Browser/UbuntuWebView01.qml (+272/-0)
src/Ubuntu/Components/Extras/Browser/UbuntuWebView02.qml (+86/-50)
src/Ubuntu/Components/Extras/Browser/UserAgent01.qml (+90/-0)
src/Ubuntu/Components/Extras/Browser/UserAgent02.qml (+34/-62)
src/Ubuntu/Components/Extras/Browser/dummysingleton.qml (+27/-0)
src/Ubuntu/Components/Extras/Browser/plugin.cpp (+34/-0)
src/Ubuntu/Components/Extras/Browser/qmldir (+5/-1)
src/Ubuntu/Components/Extras/Browser/selection01.js (+193/-0)
src/Ubuntu/Components/Extras/Browser/selection02.js (+128/-174)
src/Ubuntu/Components/Extras/Browser/ua-override-worker.js (+46/-0)
src/app/AlertDialog.qml (+2/-2)
src/app/BeforeUnloadDialog.qml (+38/-0)
src/app/CMakeLists.txt (+2/-0)
src/app/PanelLoader.qml (+4/-1)
src/app/PromptDialog.qml (+7/-1)
src/app/WebViewImpl.qml (+14/-18)
src/app/browserapplication.cpp (+29/-2)
src/app/browserapplication.h (+3/-3)
src/app/webbrowser/BookmarksView.qml (+2/-2)
src/app/webbrowser/Browser.qml (+4/-22)
src/app/webbrowser/CMakeLists.txt (+1/-13)
src/app/webbrowser/TabsList.qml (+1/-1)
src/app/webbrowser/TimelineView.qml (+5/-5)
src/app/webbrowser/webbrowser-app.cpp (+4/-28)
src/app/webbrowser/webbrowser-app.h (+0/-5)
src/app/webbrowser/webthumbnail-provider.cpp (+0/-53)
src/app/webbrowser/webthumbnail-provider.h (+0/-39)
src/app/webbrowser/webthumbnail-utils.cpp (+0/-108)
src/app/webbrowser/webthumbnail-utils.h (+0/-51)
src/app/webbrowser/webview-thumbnailer.cpp (+0/-162)
src/app/webbrowser/webview-thumbnailer.h (+0/-64)
src/app/webcontainer/WebApp.qml (+18/-103)
src/app/webcontainer/WebViewImplWebkit.qml (+159/-0)
src/app/webcontainer/WebappContainerWebview.qml (+151/-0)
src/app/webcontainer/webapp-container.cpp (+56/-0)
src/app/webcontainer/webapp-container.h (+1/-0)
src/app/webcontainer/webapp-container.qml (+1/-0)
tests/autopilot/webbrowser_app/tests/test_tabs.py (+5/-0)
tests/unittests/qml/CMakeLists.txt (+10/-3)
tests/unittests/qml/tst_UbuntuWebView01.qml (+46/-0)
tests/unittests/qml/tst_UbuntuWebView02.qml (+3/-6)
tests/unittests/qml/tst_UserAgent.qml (+0/-82)
tests/unittests/qml/tst_UserAgent01.qml (+82/-0)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1271756: [oxide] history not working	High	Fix Released
Bug #1271759: [oxide] can't invoke combo boxes	High	Fix Released

Link a bug report

Related blueprints

493. By Olivier Tilloy on 2014-03-28

Clean up changelog.

492. By Alexandre Abreu on 2014-03-28

Make the webapp-container adaptable to the runtime context (oxide or not) and instanciate the proper web backend.
To account for the multiple potential frameworks (13.10, and soon 14.04) and avoid
    1. user having their webapps not working anymore,
    2. asking user to update their click package,
a bit of runtime behavior has been added (ack'd by Jamie Strandboge) to validate the presence of oxide.

Merged branch lp:~abreu-alexandre/webbrowser-app/support-oxide-and-qtwebkit

491. By Olivier Tilloy on 2014-03-28

Temporarily disable the javascript dialogs again, until a suitable version of oxide hits the archive.

490. By Olivier Tilloy on 2014-03-27

Fix importing version 0.1 of Ubuntu.Components.Extras.Browser.
This is a work-around for what’s likely a bug in Qt.

489. By Olivier Tilloy on 2014-03-27

Instantiate the networkRequestDelegate and userAgentOverrideDelegate only when needed.

488. By Olivier Tilloy on 2014-03-27

Share a single WebContext between all the WebViews, to avoid undefined behaviours.

487. By Alexandre Abreu on 2014-03-26

Container updates: Enable localstorage + some fixes.

Merged branch lp:~abreu-alexandre/webbrowser-app/with-oxide

486. By Olivier Tilloy on 2014-03-26

Merge the latest changes from trunk.

485. By Olivier Tilloy on 2014-03-26

Re-enable javascript dialogs, now that they are implemented in oxide.

484. By Olivier Tilloy on 2014-03-24

releasing package webbrowser-app version 0.23+14.04.20140324-0ubuntu1~withoxide2