← Back to branch summary

~phablet-team/webbrowser-app/trunk

~phablet-team/webbrowser-app/trunk

Viewing all changes in revision 473.

Committer: CI bot
Author(s): Olivier Tilloy
Date: 2014-03-28 17:07:01 UTC
mfrom: (419.1.74 with-oxide)
Revision ID: ps-jenkins@lists.canonical.com-20140328170701-f89ymdu1ny7lnydg

Land the master Oxide support branch. See individual revisions for details. Fixes: 1271756, 1271759

files added:
src/Ubuntu/Components/Extras/Browser/ItemSelector01.qml

src/Ubuntu/Components/Extras/Browser/UbuntuWebContext.qml

src/Ubuntu/Components/Extras/Browser/UbuntuWebView01.qml

src/Ubuntu/Components/Extras/Browser/UserAgent01.qml

src/Ubuntu/Components/Extras/Browser/dummysingleton.qml

src/Ubuntu/Components/Extras/Browser/selection01.js

src/Ubuntu/Components/Extras/Browser/ua-override-worker.js

src/app/BeforeUnloadDialog.qml

src/app/webcontainer/WebViewImplWebkit.qml

src/app/webcontainer/WebappContainerWebview.qml

tests/unittests/qml/tst_UbuntuWebView01.qml

tests/unittests/qml/tst_UserAgent01.qml

files removed:
src/app/webbrowser/webthumbnail-provider.cpp

src/app/webbrowser/webthumbnail-provider.h

src/app/webbrowser/webthumbnail-utils.cpp

src/app/webbrowser/webthumbnail-utils.h

src/app/webbrowser/webview-thumbnailer.cpp

src/app/webbrowser/webview-thumbnailer.h

tests/unittests/qml/tst_UserAgent.qml

files renamed:
src/Ubuntu/Components/Extras/Browser/ItemSelector.qml => src/Ubuntu/Components/Extras/Browser/ItemSelector02.qml

src/Ubuntu/Components/Extras/Browser/UbuntuWebView.qml => src/Ubuntu/Components/Extras/Browser/UbuntuWebView02.qml

src/Ubuntu/Components/Extras/Browser/UserAgent.qml => src/Ubuntu/Components/Extras/Browser/UserAgent02.qml

src/Ubuntu/Components/Extras/Browser/selection.js => src/Ubuntu/Components/Extras/Browser/selection02.js

tests/unittests/qml/tst_UbuntuWebView.qml => tests/unittests/qml/tst_UbuntuWebView02.qml

files modified:
CMakeLists.txt

debian/control

po/webbrowser-app.pot

src/Ubuntu/Components/Extras/Browser/CMakeLists.txt

src/Ubuntu/Components/Extras/Browser/plugin.cpp

src/Ubuntu/Components/Extras/Browser/qmldir

src/app/AlertDialog.qml

src/app/CMakeLists.txt

src/app/PanelLoader.qml

src/app/PromptDialog.qml

src/app/WebViewImpl.qml

src/app/browserapplication.cpp

src/app/browserapplication.h

src/app/webbrowser/BookmarksView.qml

src/app/webbrowser/Browser.qml

src/app/webbrowser/CMakeLists.txt

src/app/webbrowser/TabsList.qml

src/app/webbrowser/TimelineView.qml

src/app/webbrowser/webbrowser-app.cpp

src/app/webbrowser/webbrowser-app.h

src/app/webcontainer/WebApp.qml

src/app/webcontainer/webapp-container.cpp

src/app/webcontainer/webapp-container.h

src/app/webcontainer/webapp-container.qml

tests/autopilot/webbrowser_app/tests/test_tabs.py

tests/unittests/qml/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

po/webbrowser-app.pot

src/Ubuntu/Components/Extras/Browser/CMakeLists.txt

src/Ubuntu/Components/Extras/Browser/ItemSelector01.qml

src/Ubuntu/Components/Extras/Browser/ItemSelector02.qml

src/Ubuntu/Components/Extras/Browser/UbuntuWebContext.qml

src/Ubuntu/Components/Extras/Browser/UbuntuWebView01.qml

src/Ubuntu/Components/Extras/Browser/UbuntuWebView02.qml

src/Ubuntu/Components/Extras/Browser/UserAgent01.qml

src/Ubuntu/Components/Extras/Browser/UserAgent02.qml

src/Ubuntu/Components/Extras/Browser/dummysingleton.qml

src/Ubuntu/Components/Extras/Browser/plugin.cpp

src/Ubuntu/Components/Extras/Browser/qmldir

src/Ubuntu/Components/Extras/Browser/selection01.js

src/Ubuntu/Components/Extras/Browser/selection02.js

src/Ubuntu/Components/Extras/Browser/ua-override-worker.js

src/app/AlertDialog.qml

src/app/BeforeUnloadDialog.qml

src/app/CMakeLists.txt

src/app/PanelLoader.qml

src/app/PromptDialog.qml

src/app/WebViewImpl.qml

src/app/browserapplication.cpp

src/app/browserapplication.h

src/app/webbrowser/BookmarksView.qml

src/app/webbrowser/Browser.qml

src/app/webbrowser/CMakeLists.txt

src/app/webbrowser/TabsList.qml

src/app/webbrowser/TimelineView.qml

src/app/webbrowser/webbrowser-app.cpp

src/app/webbrowser/webbrowser-app.h

src/app/webbrowser/webthumbnail-provider.cpp

src/app/webbrowser/webthumbnail-provider.h

src/app/webbrowser/webthumbnail-utils.cpp

src/app/webbrowser/webthumbnail-utils.h

src/app/webbrowser/webview-thumbnailer.cpp

src/app/webbrowser/webview-thumbnailer.h

src/app/webcontainer/WebApp.qml

src/app/webcontainer/WebViewImplWebkit.qml

src/app/webcontainer/WebappContainerWebview.qml

src/app/webcontainer/webapp-container.cpp

src/app/webcontainer/webapp-container.h

src/app/webcontainer/webapp-container.qml

tests/autopilot/webbrowser_app/tests/test_tabs.py

tests/unittests/qml/CMakeLists.txt

tests/unittests/qml/tst_UbuntuWebView01.qml

tests/unittests/qml/tst_UbuntuWebView02.qml

tests/unittests/qml/tst_UserAgent.qml

tests/unittests/qml/tst_UserAgent01.qml

Older »