Merge lp:~abreu-alexandre/unity-webapps-qml/rtm-fix-local-script-handling into lp:unity-webapps-qml/rtm-14.09
Proposed by
Alexandre Abreu
Status: | Merged |
---|---|
Approved by: | Alexandre Abreu |
Approved revision: | 134 |
Merged at revision: | 136 |
Proposed branch: | lp:~abreu-alexandre/unity-webapps-qml/rtm-fix-local-script-handling |
Merge into: | lp:unity-webapps-qml/rtm-14.09 |
Diff against target: |
219 lines (+58/-41) 5 files modified
debian/control (+1/-1) src/Ubuntu/UnityWebApps/UnityWebApps.js (+14/-16) src/Ubuntu/UnityWebApps/UnityWebApps.qml (+2/-2) src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js (+41/-20) src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp (+0/-2) |
To merge this branch: | bzr merge lp:~abreu-alexandre/unity-webapps-qml/rtm-fix-local-script-handling |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
WebApps | Pending | ||
Review via email: mp+246734@code.launchpad.net |
Commit message
When using a webapp-properties file for an unamed webapp the user script does not get injected.
Description of the change
When using a webapp-properties file for an unamed webapp the user script does not get injected.
To post a comment you must log in.