Merge lp://staging/~abreu-alexandre/ubuntu-html5-theme/backport-oxide-fixes-14.09 into lp://staging/ubuntu-html5-theme/rtm-14.09
Proposed by
Alexandre Abreu
| Status: | Approved |
|---|---|
| Approved by: | Alexandre Abreu |
| Approved revision: | 193 |
| Proposed branch: | lp://staging/~abreu-alexandre/ubuntu-html5-theme/backport-oxide-fixes-14.09 |
| Merge into: | lp://staging/ubuntu-html5-theme/rtm-14.09 |
| Diff against target: |
1531 lines (+515/-411) 21 files modified
CMakeLists.txt (+5/-0) debian/control (+7/-7) src/plugin/Ubuntu/WebApps/CordovaLoader.qml (+0/-91) src/plugin/Ubuntu/WebApps/UbuntuJavascriptBindings.qml (+0/-59) src/plugin/Ubuntu/WebApps/WebAppContainer.qml (+55/-68) src/plugin/Ubuntu/WebApps/WebViewOxide.qml (+42/-0) src/plugin/Ubuntu/WebApps/WebViewWebkit.qml (+54/-0) src/ubuntu-html5-app-launcher/CMakeLists.txt (+3/-1) src/ubuntu-html5-app-launcher/main.cpp (+53/-41) 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/backport-oxide-fixes-14.09 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu HTML5 Theme Developers | Pending | ||
|
Review via email:
|
|||
Commit message
Fix oxide bindings, fix content hub apis
Description of the change
Fix oxide bindings, fix content hub apis
To post a comment you must log in.
Unmerged revisions
- 193. By Alexandre Abreu
-
oxide only bits
- 192. By Alexandre Abreu
-
add --oxide
- 191. By Alexandre Abreu
-
cleanup oxide
- 190. By Alexandre Abreu
-
updates
- 189. By Alexandre Abreu
-
fix compilation
- 188. By Alexandre Abreu
-
add oxide hw compositiing support; remove clutter
- 187. By Alexandre Abreu
-
fixes
- 186. By Alexandre Abreu
-
fixes
- 185. By Alexandre Abreu
-
add --oxide flag
- 184. By Alexandre Abreu
-
Fix oxide bindings, fix content hub apis
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
