content-hub

Merge lp://staging/~ken-vandine/content-hub/1_3 into lp://staging/content-hub

1_3
Merge into trunk

Proposed by Ken VanDine on 2015-09-09

Status:	Merged
Approved by:	Michael Sheldon on 2015-09-22
Approved revision:	251
Merged at revision:	249
Proposed branch:	lp://staging/~ken-vandine/content-hub/1_3
Merge into:	lp://staging/content-hub
Diff against target:	399 lines (+361/-1) 5 files modified debian/changelog (+6/-0) import/Ubuntu/Content/ContentPageHeader.qml (+97/-0) import/Ubuntu/Content/ContentPeerPicker13.qml (+253/-0) import/Ubuntu/Content/contenthubplugin.cpp (+2/-1) import/Ubuntu/Content/qmldir (+3/-0)
To merge this branch:	bzr merge lp://staging/~ken-vandine/content-hub/1_3
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Michael Sheldon (community)		2015-09-09	Approve on 2015-09-22
PS Jenkins bot	continuous-integration		Approve on 2015-09-21
Review via email: mp+270560@code.staging.launchpad.net

Commit message

Added ContentPeerPicker13.qml for 1.3 imports

Description of the change

Added ContentPeerPicker13.qml for 1.3 imports

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-09:

PASSED: Continuous integration, rev:243
http://jenkins.qa.ubuntu.com/job/content-hub-ci/280/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/62
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/62/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/62

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/280/rebuild

review: Approve (continuous-integration)

lp://staging/~ken-vandine/content-hub/1_3 updated on 2015-09-14

244. By Ken VanDine on 2015-09-14: merged trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-14:

PASSED: Continuous integration, rev:244
http://jenkins.qa.ubuntu.com/job/content-hub-ci/281/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/63
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/63
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/63/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/63

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/281/rebuild

review: Approve (continuous-integration)

lp://staging/~ken-vandine/content-hub/1_3 updated on 2015-09-14

245. By Ken VanDine on 2015-09-14: Added ContentPageHeader (copied from webbrowser-app) to provide our own header

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-14:

PASSED: Continuous integration, rev:245
http://jenkins.qa.ubuntu.com/job/content-hub-ci/282/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/64
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/64/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/64

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/282/rebuild

review: Approve (continuous-integration)

lp://staging/~ken-vandine/content-hub/1_3 updated on 2015-09-15

246. By Ken VanDine on 2015-09-15: Added a read-only property to ContentPeerPicker to expose the title

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-15:

PASSED: Continuous integration, rev:246
http://jenkins.qa.ubuntu.com/job/content-hub-ci/283/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/65
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/65
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/65/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/65

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/283/rebuild

review: Approve (continuous-integration)

lp://staging/~ken-vandine/content-hub/1_3 updated on 2015-09-21

247. By Ken VanDine on 2015-09-21: dropped the title property added in the previous commit

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-21:

PASSED: Continuous integration, rev:247
http://jenkins.qa.ubuntu.com/job/content-hub-ci/285/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/67
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/67
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/67/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/67

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/285/rebuild

review: Approve (continuous-integration)

lp://staging/~ken-vandine/content-hub/1_3 updated on 2015-09-21

248. By Ken VanDine on 2015-09-21: Updated for UbuntuShape deprecations

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2015-09-21:

Are there any related MPs required for this MP to build/function as expected? Please list.

* No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

* Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

* Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/content-hub) on device or emulator?

* Yes

If you changed the UI, was the change specified/approved by design?

* No

If you changed UI labels, did you update the pot file?

* No

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

* No

lp://staging/~ken-vandine/content-hub/1_3 updated on 2015-09-21