Merge lp://staging/~abreu-alexandre/ubuntu-html5-theme/rtm-content-picker-ui-fix into lp://staging/ubuntu-html5-theme/rtm-14.09
Proposed by
Alexandre Abreu
| Status: | Merged |
|---|---|
| Approved by: | David Barth |
| Approved revision: | 191 |
| Merged at revision: | 188 |
| Proposed branch: | lp://staging/~abreu-alexandre/ubuntu-html5-theme/rtm-content-picker-ui-fix |
| Merge into: | lp://staging/ubuntu-html5-theme/rtm-14.09 |
| Diff against target: |
421 lines (+217/-122) 7 files modified
debian/control (+1/-0) src/ubuntu-html5-app-launcher/UbuntuJavascriptBindings.qml (+0/-59) src/ubuntu-html5-app-launcher/main.qml (+80/-57) tests/autopilot/ubuntu_html5_container/tests/__init__.py (+10/-3) tests/autopilot/ubuntu_html5_container/tests/test_appLaunch.py (+3/-3) tests/autopilot/ubuntu_html5_container/tests/test_contentPickerLaunch.py (+57/-0) tests/data/html/test-content-picker-launch/index.html (+66/-0) |
| To merge this branch: | bzr merge lp://staging/~abreu-alexandre/ubuntu-html5-theme/rtm-content-picker-ui-fix |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu HTML5 Theme Developers | Pending | ||
|
Review via email:
|
|||
Commit message
re-parent the UnityWebappsBin
Description of the change
re-parent the UnityWebappsBin
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
