Merge lp://staging/~michael-sheldon/content-hub/fix-1383732-rtm into lp://staging/content-hub/rtm-14.09
Proposed by
Michael Sheldon
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Ken VanDine | ||||
Approved revision: | 139 | ||||
Merged at revision: | 139 | ||||
Proposed branch: | lp://staging/~michael-sheldon/content-hub/fix-1383732-rtm | ||||
Merge into: | lp://staging/content-hub/rtm-14.09 | ||||
Diff against target: |
138 lines (+29/-2) 7 files modified
import/Ubuntu/Content/contentpeermodel.cpp (+1/-0) import/Ubuntu/Content/contenttype.cpp (+6/-0) import/Ubuntu/Content/contenttype.h (+2/-1) include/com/ubuntu/content/type.h (+1/-0) src/com/ubuntu/content/service/com.ubuntu.content.hub.gschema.xml (+12/-0) src/com/ubuntu/content/service/hook.cpp (+1/-1) src/com/ubuntu/content/type.cpp (+6/-0) |
||||
To merge this branch: | bzr merge lp://staging/~michael-sheldon/content-hub/fix-1383732-rtm | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ken VanDine | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email: mp+246885@code.staging.launchpad.net |
Commit message
Add support for EBook content type
Description of the change
Add support for EBook content type
To post a comment you must log in.
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 (in sync with RTM branch)
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 change
If you changed UI labels, did you update the pot file?
* No change
If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
* No change