Merge lp://staging/~abreu-alexandre/unity-webapps-qml/backport-14-10 into lp://staging/unity-webapps-qml/14.10
Proposed by
Alexandre Abreu
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~abreu-alexandre/unity-webapps-qml/backport-14-10 |
| Merge into: | lp://staging/unity-webapps-qml/14.10 |
| Diff against target: |
191 lines (+44/-26) 6 files modified
debian/control (+1/-2) src/Ubuntu/UnityWebApps/UnityWebApps.js (+1/-2) src/Ubuntu/UnityWebApps/UnityWebApps.qml (+11/-1) src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js (+5/-3) src/Ubuntu/UnityWebApps/bindings/content-hub/backend/content-hub.js (+25/-17) src/Ubuntu/UnityWebApps/common/js/unity-backend-messaging-proxy.js (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~abreu-alexandre/unity-webapps-qml/backport-14-10 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| WebApps | Pending | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2014-12-02.
Description of the change
backport getpeers content hub fix
backport content hub issue on desktop webapp startup,
backport oxide integration fixes,
To post a comment you must log in.
Unmerged revisions
- 135. By Alexandre Abreu
-
backport oxide integration
- 134. By Alexandre Abreu
-
backport desktop fix for content hub; backport getpeers fix
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
