lp:~tpeeters/ubuntu-ui-toolkit/headlock

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-ui-toolkit/staging at revision 1463

PS Jenkins bot: Approve (continuous-integration) on 2015-04-02

Zsombor Egri: Approve on 2015-03-30

Diff: 1300 lines (+680/-256)

16 files modified

components.api (+5/-1)
modules/Ubuntu/Components/AppHeader.qml (+103/-15)
modules/Ubuntu/Components/MainView.qml (+2/-1)
modules/Ubuntu/Components/MainView12.qml (+9/-4)
modules/Ubuntu/Components/Page10.qml (+1/-1)
modules/Ubuntu/Components/Page11.qml (+5/-3)
modules/Ubuntu/Components/PageHeadConfiguration.qdoc (+202/-0)
modules/Ubuntu/Components/PageHeadConfiguration11.qml (+3/-155)
modules/Ubuntu/Components/PageHeadConfiguration13.qml (+30/-0)
modules/Ubuntu/Components/Tabs.qml (+4/-1)
modules/Ubuntu/Components/qmldir (+2/-1)
modules/Ubuntu/Test/UbuntuTestCase.qml (+3/-4)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py (+4/-1)
tests/resources/header/lockedToolbar.deprecated.qml (+0/-52)
tests/unit_x11/tst_components/tst_header_visible.qml (+288/-0)
tests/unit_x11/tst_components/tst_page13.qml (+19/-17)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1402054: Page header with no title does not have a back button	High	Fix Released
Bug #1424592: Header needs locked and visible properties	High	Fix Released

Link a bug report

Related blueprints

1483. By Tim Peeters on 2015-04-02

merge waitForHeaderAnimation prerequisite branch

1482. By Tim Peeters on 2015-03-27

update components.api

1481. By Tim Peeters on 2015-03-26

merge staging

1480. By Tim Peeters on 2015-03-24

merge staging

1479. By Tim Peeters on 2015-03-23

use waitForHeaderAnimation(mainView) in tst_page13.qml

1478. By Tim Peeters on 2015-03-23

clean

1477. By Tim Peeters on 2015-03-23

mere wait_for_head_animation branch

1476. By Tim Peeters on 2015-03-23

flake8

1475. By Tim Peeters on 2015-03-20

update components.api

1474. By Tim Peeters on 2015-03-20

update header CPO