Merge lp://staging/~dholbach/unity-webapps-qml/add-update-docs-command into lp://staging/unity-webapps-qml

Proposed by Daniel Holbach
Status: Merged
Approved by: Alexandre Abreu
Approved revision: 153
Merged at revision: 149
Proposed branch: lp://staging/~dholbach/unity-webapps-qml/add-update-docs-command
Merge into: lp://staging/unity-webapps-qml
Diff against target: 16167 lines (+15652/-0)
85 files modified
debian/changelog (+10/-0)
debian/copyright (+32/-0)
debian/unity-webapps-qml-doc.install (+4/-0)
src/Ubuntu/UnityWebApps/bindings/alarm-api/client/docsbuild/api.js (+18/-0)
src/Ubuntu/UnityWebApps/bindings/alarm-api/client/docsbuild/assets/css/main.css (+429/-0)
src/Ubuntu/UnityWebApps/bindings/alarm-api/client/docsbuild/assets/index.html (+10/-0)
src/Ubuntu/UnityWebApps/bindings/alarm-api/client/docsbuild/assets/js/api-filter.js (+52/-0)
src/Ubuntu/UnityWebApps/bindings/alarm-api/client/docsbuild/assets/js/api-list.js (+251/-0)
src/Ubuntu/UnityWebApps/bindings/alarm-api/client/docsbuild/assets/js/api-search.js (+98/-0)
src/Ubuntu/UnityWebApps/bindings/alarm-api/client/docsbuild/assets/js/apidocs.js (+370/-0)
src/Ubuntu/UnityWebApps/bindings/alarm-api/client/docsbuild/assets/js/tabs.js (+67/-0)
src/Ubuntu/UnityWebApps/bindings/alarm-api/client/docsbuild/assets/js/yui-prettify.js (+44/-0)
src/Ubuntu/UnityWebApps/bindings/alarm-api/client/docsbuild/assets/vendor/prettify/CHANGES.html (+130/-0)
src/Ubuntu/UnityWebApps/bindings/alarm-api/client/docsbuild/assets/vendor/prettify/COPYING (+202/-0)
src/Ubuntu/UnityWebApps/bindings/alarm-api/client/docsbuild/assets/vendor/prettify/README.html (+203/-0)
src/Ubuntu/UnityWebApps/bindings/alarm-api/client/docsbuild/assets/vendor/prettify/prettify-min.css (+1/-0)
src/Ubuntu/UnityWebApps/bindings/alarm-api/client/docsbuild/assets/vendor/prettify/prettify-min.js (+28/-0)
src/Ubuntu/UnityWebApps/bindings/alarm-api/client/docsbuild/classes/Alarm.html (+481/-0)
src/Ubuntu/UnityWebApps/bindings/alarm-api/client/docsbuild/classes/AlarmApi.html (+289/-0)
src/Ubuntu/UnityWebApps/bindings/alarm-api/client/docsbuild/data.json (+491/-0)
src/Ubuntu/UnityWebApps/bindings/alarm-api/client/docsbuild/files/alarm-api.js.html (+566/-0)
src/Ubuntu/UnityWebApps/bindings/alarm-api/client/docsbuild/index.html (+67/-0)
src/Ubuntu/UnityWebApps/bindings/alarm-api/client/docsbuild/modules/AlarmApi.html (+92/-0)
src/Ubuntu/UnityWebApps/bindings/content-hub/client/docsbuild/api.js (+20/-0)
src/Ubuntu/UnityWebApps/bindings/content-hub/client/docsbuild/assets/css/main.css (+429/-0)
src/Ubuntu/UnityWebApps/bindings/content-hub/client/docsbuild/assets/index.html (+10/-0)
src/Ubuntu/UnityWebApps/bindings/content-hub/client/docsbuild/assets/js/api-filter.js (+52/-0)
src/Ubuntu/UnityWebApps/bindings/content-hub/client/docsbuild/assets/js/api-list.js (+251/-0)
src/Ubuntu/UnityWebApps/bindings/content-hub/client/docsbuild/assets/js/api-search.js (+98/-0)
src/Ubuntu/UnityWebApps/bindings/content-hub/client/docsbuild/assets/js/apidocs.js (+370/-0)
src/Ubuntu/UnityWebApps/bindings/content-hub/client/docsbuild/assets/js/tabs.js (+67/-0)
src/Ubuntu/UnityWebApps/bindings/content-hub/client/docsbuild/assets/js/yui-prettify.js (+44/-0)
src/Ubuntu/UnityWebApps/bindings/content-hub/client/docsbuild/assets/vendor/prettify/CHANGES.html (+130/-0)
src/Ubuntu/UnityWebApps/bindings/content-hub/client/docsbuild/assets/vendor/prettify/COPYING (+202/-0)
src/Ubuntu/UnityWebApps/bindings/content-hub/client/docsbuild/assets/vendor/prettify/README.html (+203/-0)
src/Ubuntu/UnityWebApps/bindings/content-hub/client/docsbuild/assets/vendor/prettify/prettify-min.css (+1/-0)
src/Ubuntu/UnityWebApps/bindings/content-hub/client/docsbuild/assets/vendor/prettify/prettify-min.js (+28/-0)
src/Ubuntu/UnityWebApps/bindings/content-hub/client/docsbuild/classes/ContentHub.html (+460/-0)
src/Ubuntu/UnityWebApps/bindings/content-hub/client/docsbuild/classes/ContentPeer.html (+411/-0)
src/Ubuntu/UnityWebApps/bindings/content-hub/client/docsbuild/classes/ContentStore.html (+205/-0)
src/Ubuntu/UnityWebApps/bindings/content-hub/client/docsbuild/classes/ContentTransfer.html (+415/-0)
src/Ubuntu/UnityWebApps/bindings/content-hub/client/docsbuild/data.json (+909/-0)
src/Ubuntu/UnityWebApps/bindings/content-hub/client/docsbuild/files/content-hub.js.html (+1025/-0)
src/Ubuntu/UnityWebApps/bindings/content-hub/client/docsbuild/index.html (+69/-0)
src/Ubuntu/UnityWebApps/bindings/content-hub/client/docsbuild/modules/ContentHub.html (+97/-0)
src/Ubuntu/UnityWebApps/bindings/online-accounts/client/docsbuild/api.js (+18/-0)
src/Ubuntu/UnityWebApps/bindings/online-accounts/client/docsbuild/assets/css/main.css (+429/-0)
src/Ubuntu/UnityWebApps/bindings/online-accounts/client/docsbuild/assets/index.html (+10/-0)
src/Ubuntu/UnityWebApps/bindings/online-accounts/client/docsbuild/assets/js/api-filter.js (+52/-0)
src/Ubuntu/UnityWebApps/bindings/online-accounts/client/docsbuild/assets/js/api-list.js (+251/-0)
src/Ubuntu/UnityWebApps/bindings/online-accounts/client/docsbuild/assets/js/api-search.js (+98/-0)
src/Ubuntu/UnityWebApps/bindings/online-accounts/client/docsbuild/assets/js/apidocs.js (+370/-0)
src/Ubuntu/UnityWebApps/bindings/online-accounts/client/docsbuild/assets/js/tabs.js (+67/-0)
src/Ubuntu/UnityWebApps/bindings/online-accounts/client/docsbuild/assets/js/yui-prettify.js (+44/-0)
src/Ubuntu/UnityWebApps/bindings/online-accounts/client/docsbuild/assets/vendor/prettify/CHANGES.html (+130/-0)
src/Ubuntu/UnityWebApps/bindings/online-accounts/client/docsbuild/assets/vendor/prettify/COPYING (+202/-0)
src/Ubuntu/UnityWebApps/bindings/online-accounts/client/docsbuild/assets/vendor/prettify/README.html (+203/-0)
src/Ubuntu/UnityWebApps/bindings/online-accounts/client/docsbuild/assets/vendor/prettify/prettify-min.css (+1/-0)
src/Ubuntu/UnityWebApps/bindings/online-accounts/client/docsbuild/assets/vendor/prettify/prettify-min.js (+28/-0)
src/Ubuntu/UnityWebApps/bindings/online-accounts/client/docsbuild/classes/AccountService.html (+226/-0)
src/Ubuntu/UnityWebApps/bindings/online-accounts/client/docsbuild/classes/OnlineAccounts.html (+247/-0)
src/Ubuntu/UnityWebApps/bindings/online-accounts/client/docsbuild/data.json (+253/-0)
src/Ubuntu/UnityWebApps/bindings/online-accounts/client/docsbuild/files/online-accounts.js.html (+359/-0)
src/Ubuntu/UnityWebApps/bindings/online-accounts/client/docsbuild/index.html (+67/-0)
src/Ubuntu/UnityWebApps/bindings/online-accounts/client/docsbuild/modules/OnlineAccounts.html (+92/-0)
src/Ubuntu/UnityWebApps/bindings/runtime-api/client/docsbuild/api.js (+17/-0)
src/Ubuntu/UnityWebApps/bindings/runtime-api/client/docsbuild/assets/css/main.css (+429/-0)
src/Ubuntu/UnityWebApps/bindings/runtime-api/client/docsbuild/assets/index.html (+10/-0)
src/Ubuntu/UnityWebApps/bindings/runtime-api/client/docsbuild/assets/js/api-filter.js (+52/-0)
src/Ubuntu/UnityWebApps/bindings/runtime-api/client/docsbuild/assets/js/api-list.js (+251/-0)
src/Ubuntu/UnityWebApps/bindings/runtime-api/client/docsbuild/assets/js/api-search.js (+98/-0)
src/Ubuntu/UnityWebApps/bindings/runtime-api/client/docsbuild/assets/js/apidocs.js (+370/-0)
src/Ubuntu/UnityWebApps/bindings/runtime-api/client/docsbuild/assets/js/tabs.js (+67/-0)
src/Ubuntu/UnityWebApps/bindings/runtime-api/client/docsbuild/assets/js/yui-prettify.js (+44/-0)
src/Ubuntu/UnityWebApps/bindings/runtime-api/client/docsbuild/assets/vendor/prettify/CHANGES.html (+130/-0)
src/Ubuntu/UnityWebApps/bindings/runtime-api/client/docsbuild/assets/vendor/prettify/COPYING (+202/-0)
src/Ubuntu/UnityWebApps/bindings/runtime-api/client/docsbuild/assets/vendor/prettify/README.html (+203/-0)
src/Ubuntu/UnityWebApps/bindings/runtime-api/client/docsbuild/assets/vendor/prettify/prettify-min.css (+1/-0)
src/Ubuntu/UnityWebApps/bindings/runtime-api/client/docsbuild/assets/vendor/prettify/prettify-min.js (+28/-0)
src/Ubuntu/UnityWebApps/bindings/runtime-api/client/docsbuild/classes/RuntimeApi.html (+372/-0)
src/Ubuntu/UnityWebApps/bindings/runtime-api/client/docsbuild/data.json (+289/-0)
src/Ubuntu/UnityWebApps/bindings/runtime-api/client/docsbuild/files/runtime-api.js.html (+347/-0)
src/Ubuntu/UnityWebApps/bindings/runtime-api/client/docsbuild/index.html (+66/-0)
src/Ubuntu/UnityWebApps/bindings/runtime-api/client/docsbuild/modules/RuntimeApi.html (+90/-0)
update-docs (+8/-0)
To merge this branch: bzr merge lp://staging/~dholbach/unity-webapps-qml/add-update-docs-command
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
David Barth (community) Approve
Review via email: mp+254603@code.staging.launchpad.net

Commit message

Add ./update-docs script which generates API docs locally. We can't make this part of the build as not all node dependencies of yuidocsjs are packaged in the archive.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:152
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~dholbach/unity-webapps-qml/add-update-docs-command/+merge/254603/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/170/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-vivid-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-vivid-armhf-ci/24

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-webapps-qml-ci/170/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
David Barth (dbarth) wrote :

+1 on the untruncated merge proposal ;) Thanks for your help Daniel

review: Approve
153. By Daniel Holbach

update d/copyright

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

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: