unity-scopes-api

Merge lp:~stolowski/unity-scopes-api/fix-1593035 into lp:unity-scopes-api/devel

  1. fix-1593035
  2. Merge into devel
Proposed by Paweł Stołowski
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 680
Merged at revision: 680
Proposed branch: lp:~stolowski/unity-scopes-api/fix-1593035
Merge into: lp:unity-scopes-api/devel
Diff against target: 12 lines (+1/-1)
1 file modified
src/scopes/CategoryRenderer.cpp (+1/-1)
To merge this branch: bzr merge lp:~stolowski/unity-scopes-api/fix-1593035
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Albert Astals Cid (community) Approve
unity-api-1-bot continuous-integration Needs Fixing
Review via email: [email protected]

Commit message

Documentation fix - collapsed-rows is only supported by grid category renderer.

Description of the change

Documentation fix - collapsed-rows is only supported by grid category renderer.

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:680
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/30/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/81/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/88
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/60/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial/60/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/30/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/scopes/CategoryRenderer.cpp'
2--- src/scopes/CategoryRenderer.cpp 2016-03-08 10:09:42 +0000
3+++ src/scopes/CategoryRenderer.cpp 2016-06-16 09:28:34 +0000
4@@ -66,7 +66,7 @@
5 \arg \c card-layout Specifies layout of the individual result cards; possible values: \c "vertical" (default), \c "horizontal"
6 \arg \c card-size Size of the result cards; possible values: \c "small", \c "medium" (default), \c "large"; when using <tt>"category-layout": "vertical-journal"</tt> any integer between 12 and 38
7 \arg \c overlay Overlay text data on top of the art; boolean, default false
8-\arg \c collapsed-rows Number of result rows displayed while the category is collapsed; possible values: any non-negative integer, where 0 fully expands the category (only affects grid and vertical journal)
9+\arg \c collapsed-rows Number of result rows displayed while the category is collapsed; possible values: any non-negative integer, where 0 fully expands the category (only affects grid)
10 \arg \c card-background Background color for the cards; string; URI in the format \verbatim color:///#rrggbb \endverbatim or \verbatim color:///color_name
11 \endverbatim or \verbatim gradient:///#rrggbb/#rrggbb \endverbatim or an image URI (will be stretched)
12 \arg \c quick-preview-type The type of media content represented by result cards, for use with inline playback; the only currently supported type is "audio".

Subscribers

People subscribed via source and target branches

to all changes: