lp://staging/~faenil/ubuntu-ui-toolkit/ContactsAdaptive_UIToolkit

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://staging/ubuntu-ui-toolkit/staging

Zsombor Egri: Disapprove on 2015-12-10

PS Jenkins bot: Needs Fixing (continuous-integration) on 2015-07-10

Diff: 2335 lines (+1712/-203)

27 files modified

components.api (+7/-0)
examples/ubuntu-ui-toolkit-gallery/ListItemWithLabel.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/Popover.qml (+4/-7)
examples/ubuntu-ui-toolkit-gallery/Sections.qml (+1/-1)
examples/ubuntu-ui-toolkit-gallery/Template.qml (+7/-7)
examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml (+45/-125)
modules/Ubuntu/Components/1.2/stack.js (+1/-0)
modules/Ubuntu/Components/1.3/ColumnMetrics.qml (+53/-0)
modules/Ubuntu/Components/1.3/MultiColumnView.qml (+553/-0)
modules/Ubuntu/Components/1.3/OrientationHelper.qml (+1/-1)
modules/Ubuntu/Components/1.3/Page.qml (+1/-0)
modules/Ubuntu/Components/1.3/PageHeadConfiguration.qml (+2/-0)
modules/Ubuntu/Components/1.3/PageWrapper.qml (+37/-0)
modules/Ubuntu/Components/1.3/stack.js (+75/-0)
modules/Ubuntu/Components/Themes/Ambiance/1.3/IconButtonStyle.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml (+51/-22)
modules/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml (+362/-28)
modules/Ubuntu/Components/qmldir (+1/-0)
tests/autopilot/ubuntuuitoolkit/tests/__init__.py (+3/-4)
tests/resources/navigation/MyCustomPage.qml (+1/-1)
tests/resources/navigation/SplitViewStack.qml (+137/-0)
tests/unit_x11/tst_components/ListItemWithLabel.qml (+30/-0)
tests/unit_x11/tst_components/MyExternalPage.qml (+7/-3)
tests/unit_x11/tst_components/tst_components.pro (+2/-1)
tests/unit_x11/tst_components/tst_multicolumnheader.qml (+200/-0)
tests/unit_x11/tst_components/tst_multicolumnview.qml (+128/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1566. By Andrea Bernabei on 2015-07-10

merge multiColumnView branch

1565. By Andrea Bernabei on 2015-07-09

OrientationHelper: check if a valid inputMethod exists before evaluating its props

1564. By Andrea Bernabei on 2015-07-09

merge

1563. By Andrea Bernabei on 2015-07-07

change default color of IconButtonStyle

1562. By Andrea Bernabei on 2015-07-07

change backgroundText in theme Palette

1561. By Andrea Bernabei on 2015-07-07

add white background to header

1560. By Andrea Bernabei on 2015-07-07

update backgroundText palette value

1559. By Andrea Bernabei on 2015-07-07

PageHeadStyle: take number of actions available into account when computing numberOfSlots

1558. By Andrea Bernabei on 2015-07-06

merge tims branch

1557. By Andrea Bernabei on 2015-07-06

Implement dynamic number of slots in PageHeadStyle