Merge lp://qastaging/~mardy/webbrowser-app/oa-runtime into lp://qastaging/~abreu-alexandre/webbrowser-app/add-onlineaccount-support-for-container
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://qastaging/~mardy/webbrowser-app/oa-runtime |
| Merge into: | lp://qastaging/~abreu-alexandre/webbrowser-app/add-onlineaccount-support-for-container |
| Diff against target: |
3012 lines (+1086/-652) 61 files modified
debian/changelog (+54/-0) debian/control (+7/-2) po/br.po (+293/-0) po/ug.po (+56/-57) src/Ubuntu/Components/Extras/Browser/CMakeLists.txt (+2/-25) src/Ubuntu/Components/Extras/Browser/UbuntuWebView.qml (+19/-31) src/Ubuntu/Components/Extras/Browser/domain-utils.cpp (+0/-45) src/Ubuntu/Components/Extras/Browser/plugin.cpp (+0/-41) src/Ubuntu/Components/Extras/Browser/plugin.h (+0/-8) src/Ubuntu/Components/Extras/Browser/qmldir (+0/-1) src/Ubuntu/Components/Extras/Browser/selection.js (+175/-160) src/app/AddressBar.qml (+6/-1) src/app/CMakeLists.txt (+11/-1) src/app/WebViewImpl.qml (+1/-7) src/app/browserapplication.cpp (+1/-7) src/app/browserapplication.h (+1/-3) src/app/webbrowser/ActivityView.qml (+0/-1) src/app/webbrowser/BookmarksView.qml (+0/-1) src/app/webbrowser/Browser.qml (+23/-2) src/app/webbrowser/CMakeLists.txt (+32/-9) src/app/webbrowser/TimelineView.qml (+5/-5) src/app/webbrowser/domain-utils.h (+26/-9) src/app/webbrowser/webbrowser-app.cpp (+45/-1) src/app/webbrowser/webbrowser-app.h (+6/-1) src/app/webbrowser/webbrowser-app.qml (+0/-1) src/app/webcontainer/AccountsPage.qml (+73/-0) src/app/webcontainer/CMakeLists.txt (+8/-12) src/app/webcontainer/WebApp.qml (+0/-1) src/app/webcontainer/webapp-container.cpp (+1/-45) src/app/webcontainer/webapp-container.h (+1/-6) src/app/webcontainer/webapp-container.qml (+33/-73) tests/autopilot/webbrowser_app/__init__.py (+9/-0) tests/autopilot/webbrowser_app/emulators/__init__.py (+9/-0) tests/autopilot/webbrowser_app/emulators/browser.py (+9/-0) tests/autopilot/webbrowser_app/tests/__init__.py (+10/-2) tests/autopilot/webbrowser_app/tests/http_server.py (+11/-26) tests/autopilot/webbrowser_app/tests/test_activity.py (+9/-1) tests/autopilot/webbrowser_app/tests/test_addressbar_action_button.py (+9/-1) tests/autopilot/webbrowser_app/tests/test_addressbar_selection.py (+9/-1) tests/autopilot/webbrowser_app/tests/test_addressbar_states.py (+9/-1) tests/autopilot/webbrowser_app/tests/test_backforward.py (+9/-1) tests/autopilot/webbrowser_app/tests/test_chromeless.py (+9/-1) tests/autopilot/webbrowser_app/tests/test_errorsheet.py (+9/-1) tests/autopilot/webbrowser_app/tests/test_history.py (+9/-1) tests/autopilot/webbrowser_app/tests/test_progressbar.py (+10/-3) tests/autopilot/webbrowser_app/tests/test_tabs.py (+9/-1) tests/autopilot/webbrowser_app/tests/test_title.py (+9/-1) tests/autopilot/webbrowser_app/tests/test_toolbar.py (+9/-1) tests/unittests/bookmarks-model/CMakeLists.txt (+2/-2) tests/unittests/domain-utils/CMakeLists.txt (+2/-6) tests/unittests/history-domain-model/CMakeLists.txt (+4/-5) tests/unittests/history-domainlist-chronological-model/CMakeLists.txt (+6/-7) tests/unittests/history-domainlist-model/CMakeLists.txt (+5/-6) tests/unittests/history-matches-model/CMakeLists.txt (+3/-3) tests/unittests/history-model/CMakeLists.txt (+2/-2) tests/unittests/history-timeframe-model/CMakeLists.txt (+3/-3) tests/unittests/qml/CMakeLists.txt (+7/-0) tests/unittests/qml/tst_AddressBar.qml (+6/-0) tests/unittests/qml/tst_UbuntuWebView.qml (+7/-17) tests/unittests/qml/tst_UserAgent.qml (+1/-1) tests/unittests/tabs-model/CMakeLists.txt (+2/-2) |
| To merge this branch: | bzr merge lp://qastaging/~mardy/webbrowser-app/oa-runtime |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Alberto Mardegan (community) | Disapprove | ||
| Olivier Tilloy | Pending | ||
| PS Jenkins bot | continuous-integration | Pending | |
| Alexandre Abreu | Pending | ||
|
Review via email:
|
|||
Description of the change
Do not depend on qtdeclarative5-
Do not hard-depend on qtdeclarative5-
the accountsPage component into its own QML file, and try to load it at
runtime. If that fails (because Ubuntu.
imported), go straight to the webapp.
| Alberto Mardegan (mardy) wrote | # |
| Alberto Mardegan (mardy) | # |
Unmerged revisions
- 461. By Alberto Mardegan
-
Merge from trunk
[ Colin Watson ]
* Add multiarch annotations.
[ daker ]
* Fix to open URL that start with / (local files)
[ Leo Arias ]
* Updated the copyright header on all the python files.
[ Adnane Belmadiaf ]
* Fix to open URL that start with / (local files)
[ Olivier Tilloy ]
* Do not register private types in the public plugin. Register them in
the webbrowser application scope instead. I have made sure that
private types that were previously public are currently not being
used by any application in the store, so this refactoring is safe.
* Refactor the test HTTP server to use a random port at startup.
* New rebuild forced
* Reverting as desktop image isn't installable (main/universe
mismatch) and causing all signon-ui tests on Touch failing - 460. By Alberto Mardegan
-
Avoid instantiating an unused object
- 459. By Alberto Mardegan
-
Make sure we don't access an invalid cookie store.
- 458. By Alberto Mardegan
-
Coding style
- 457. By Alberto Mardegan
-
Coding style
- 456. By Alberto Mardegan
-
Do not depend on qtdeclarative5-
online- accounts- client0. 1 Do not hard-depend on qtdeclarative5-
online- accounts- client0. 1; instead, move
the accountsPage component into its own QML file, and try to load it at
runtime. If that fails (because Ubuntu.OnlineAccounts. Client couldn't be
imported), go straight to the webapp. - 455. By PS Jenkins bot
-
Releasing 0.23+14.
04.20140304- 0ubuntu1 - 454. By Alexandre Abreu
-
Add online account support in the webapp container
- 453. By Launchpad Translations on behalf of phablet-team
-
Launchpad automatic translations update.
- 452. By PS Jenkins bot
-
Releasing 0.23+14.
04.20140219- 0ubuntu1
We don't need this branch; it's contents are part of https:/