Merge lp://staging/~mardy/unity-webapps-qml/app-access into lp://staging/unity-webapps-qml

Proposed by Alberto Mardegan
Status: Superseded
Proposed branch: lp://staging/~mardy/unity-webapps-qml/app-access
Merge into: lp://staging/unity-webapps-qml
Diff against target: 3951 lines (+1739/-1838)
17 files modified
examples/api-bindings/alarm/main.qml.in (+1/-0)
examples/api-bindings/content-hub-exporter/main.qml.in (+1/-0)
examples/api-bindings/content-hub/main.qml.in (+1/-0)
examples/api-bindings/content-peer-picker/main.qml.in (+2/-1)
examples/api-bindings/content-peer-picker/www/js/app.js (+17/-16)
examples/api-bindings/online-accounts/main.qml.in (+1/-0)
examples/api-bindings/online-accounts/www/index.html (+5/-0)
examples/api-bindings/online-accounts/www/js/app.js (+21/-0)
src/Ubuntu/UnityWebApps/UnityWebApps.js (+1/-1)
src/Ubuntu/UnityWebApps/UnityWebApps.pro (+13/-2)
src/Ubuntu/UnityWebApps/UnityWebApps.qml (+14/-6)
src/Ubuntu/UnityWebApps/UnityWebAppsBackendComponents.js (+0/-1668)
src/Ubuntu/UnityWebApps/bindings/alarm-api/backend/alarm-api.js (+246/-0)
src/Ubuntu/UnityWebApps/bindings/content-hub/backend/content-hub.js (+568/-33)
src/Ubuntu/UnityWebApps/bindings/online-accounts/backend/online-accounts-client.js (+87/-0)
src/Ubuntu/UnityWebApps/bindings/online-accounts/backend/online-accounts.js (+686/-109)
src/Ubuntu/UnityWebApps/bindings/online-accounts/client/online-accounts.js (+75/-2)
To merge this branch: bzr merge lp://staging/~mardy/unity-webapps-qml/app-access
Reviewer Review Type Date Requested Status
WebApps Pending
Review via email: mp+219319@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2014-05-13.

Commit message

Bindings for the OnlineAccounts.Client module

Description of the change

Bindings for the OnlineAccounts.Client module

To post a comment you must log in.
105. By Alberto Mardegan

Add Suggests for qtdeclarative5-online-accounts-client0.1

106. By Alberto Mardegan

Merge trunk

[ Ubuntu daily release ]
* New rebuild forced
[ Alexandre Abreu ]
* Bindings for the download manager (LP: #1295842)
[ Ubuntu daily release ]
* New rebuild forced
[ Alexandre Abreu ]
* Cleanup the structure of the QML bindings to make it clearer. No
  Changes in functionality all features are still working & same, This
  is an updated version of: https://code.launchpad.net/~abreu-
  alexandre/unity-webapps-qml/restructure-cleanup-bindings-qml-
  structure/+merge/208148 with the latest changes that got in in
  between (LP: #1288801)
* Simplifies the manifest.json handling in some instances. More
  precisely when one is using a custom model search path for the
  webapp lookup, some restrictions are being put on what is expected
  to be found in the folder among which: a common/ subfolder (even if
  the webapp doesnt require one),. one or more unity-webapps-* folders
  with manifest.json & *.user.js files in it,. More over the manifest
  files do require user scripts to be defined. This imposes a set of
  constraints over a given webapp that simply wants to use the
  container (w/o js injection). This simplifies it an allows one to
  define a manifest.json file (still with some required elements, but
  a smaller set), directly in the model search path. E.g. something
  like: {     "name": "MyWebApp",     "homepage":
  "http://www.bbc.co.uk/news/",     "domain": "bbc.co.uk",
      "includes": [] } will do, or to avoid any confusion w/ the click
  manifest.json file, one also searches for a webapp-properties.json
  w/ the same content as above.

107. By Alberto Mardegan

Install missing file

108. By Alberto Mardegan

From trunk

[ Ubuntu daily release ]
* New rebuild forced
[ Alexandre Abreu ]
* When using a webapp-properties file for an unamed webapp the user
  script does not get injected. (LP: #1409051)
[ Ubuntu daily release ]
* New rebuild forced
[ Alexandre Abreu ]
* Make sure that the content hub bindings are fail safe since the
  content hub package is a suggests (which is fine since it is not
  there by default on desktop). (LP: #1395524)
* The content hub has been updated with some changes that caused the
  getPeers() fonction to break on the HTML5 API side.
[ Ubuntu daily release ]
* New rebuild forced
[ Alexandre Abreu ]
* Improve testability for the desktop webapp search path
[ Ubuntu daily release ]
* New rebuild forced
[ Alexandre Abreu ]
* Port qml bindings to oxide (LP: #1374100)
[ Ubuntu daily release ]
* New rebuild forced
[ Alexandre Abreu ]
* Add small guard before url navigation (LP: #1378437)
* debian/control:
  - update libqt5webkit5-qmlwebkitplugin -> qml-module-qtwebkit
    (fixes a multiarch install failure)
[ Ken VanDine ]
* handle qtdeclarative5-ubuntu-content1 package rename
[ Ubuntu daily release ]
* New rebuild forced
[ Alexandre Abreu ]
* Simplify the click webapp definition for things like overrides etc.
[ Alexandre Abreu ]
* Add bidirectional callback support between js <-> qml,
[ Alexandre Abreu ]
* Fix issue with qmlplugindump using 100% cpu Fix and expanded AP
  tests to properly test the installed webapps case (LP: #1300957)
[ Ken VanDine ]
* add content share
[ Alexandre Abreu ]
* add content share
[ Ubuntu daily release ]
* New rebuild forced
[ Olivier Tilloy ]
* Do not override existing message handlers. Oxide has this nice
  feature that it automatically attaches the instantiated message
  handler to the webview anyway, so this line was useless. (LP:
  #1323735)

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: