Merge lp://staging/~faenil/ubuntu-ui-toolkit/ContactsAdaptive_UIToolkit into lp://staging/ubuntu-ui-toolkit/staging
Proposed by
Andrea Bernabei
| Status: | Rejected |
|---|---|
| Rejected by: | Zsombor Egri |
| Proposed branch: | lp://staging/~faenil/ubuntu-ui-toolkit/ContactsAdaptive_UIToolkit |
| Merge into: | lp://staging/ubuntu-ui-toolkit/staging |
| Diff against target: |
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) |
| To merge this branch: | bzr merge lp://staging/~faenil/ubuntu-ui-toolkit/ContactsAdaptive_UIToolkit |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Zsombor Egri | Disapprove | ||
| PS Jenkins bot | continuous-integration | Needs Fixing | |
|
Review via email:
|
|||
Description of the change
Changes needed for UI Convergency prototype
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Unmerged revisions
- 1566. By Andrea Bernabei
-
merge multiColumnView branch
- 1565. By Andrea Bernabei
-
OrientationHelper: check if a valid inputMethod exists before evaluating its props
- 1564. By Andrea Bernabei
-
merge
- 1563. By Andrea Bernabei
-
change default color of IconButtonStyle
- 1562. By Andrea Bernabei
-
change backgroundText in theme Palette
- 1561. By Andrea Bernabei
-
add white background to header
- 1560. By Andrea Bernabei
-
update backgroundText palette value
- 1559. By Andrea Bernabei
-
PageHeadStyle: take number of actions available into account when computing numberOfSlots
- 1558. By Andrea Bernabei
-
merge tims branch
- 1557. By Andrea Bernabei
-
Implement dynamic number of slots in PageHeadStyle
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:1566
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://