Merge lp://staging/~abreu-alexandre/ubuntu-html5-theme/fix-oxide-support-rtm-14.09 into lp://staging/ubuntu-html5-theme/rtm-14.09
Proposed by
Alexandre Abreu
| Status: | Merged |
|---|---|
| Merged at revision: | 178 |
| Proposed branch: | lp://staging/~abreu-alexandre/ubuntu-html5-theme/fix-oxide-support-rtm-14.09 |
| Merge into: | lp://staging/ubuntu-html5-theme/rtm-14.09 |
| Diff against target: |
1175 lines (+388/-225) 18 files modified
CMakeLists.txt (+4/-0) debian/control (+5/-6) src/plugin/Ubuntu/WebApps/CordovaLoader.qml (+5/-0) src/plugin/Ubuntu/WebApps/UbuntuJavascriptBindings.qml (+5/-1) src/plugin/Ubuntu/WebApps/WebAppContainer.qml (+26/-63) src/ubuntu-html5-app-launcher/main.cpp (+47/-11) src/ubuntu-html5-app-launcher/main.qml (+4/-1) tests/autopilot/tools/qml/webview.qml (+91/-25) tests/autopilot/ubuntu_html5_container/__init__.py (+2/-4) tests/autopilot/ubuntu_html5_container/emulators/__init__.py (+0/-10) tests/autopilot/ubuntu_html5_container/tests/__init__.py (+12/-7) tests/autopilot/ubuntu_html5_container/tests/test_appLaunch.py (+5/-6) tests/autopilot/ubuntu_html5_ui_toolkit/__init__.py (+2/-3) tests/autopilot/ubuntu_html5_ui_toolkit/emulators/__init__.py (+0/-10) tests/autopilot/ubuntu_html5_ui_toolkit/tests/__init__.py (+88/-38) tests/autopilot/ubuntu_html5_ui_toolkit/tests/test_pagestack.py (+58/-22) tests/autopilot/ubuntu_html5_ui_toolkit/tests/test_rss_reader.py (+7/-6) tests/autopilot/ubuntu_html5_ui_toolkit/tests/test_tabs.py (+27/-12) |
| To merge this branch: | bzr merge lp://staging/~abreu-alexandre/ubuntu-html5-theme/fix-oxide-support-rtm-14.09 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu HTML5 Theme Developers | Pending | ||
|
Review via email:
|
|||
Commit message
Fix oxide support
Description of the change
Fix oxide support
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
