lp://staging/~tpeeters/ubuntu-ui-toolkit/60-back-override

Branch merges

Propose for merging

No branches dependent on this one.

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

PS Jenkins bot: Approve (continuous-integration) on 2014-05-05

Florian Boucault (community): Approve on 2014-05-05

Diff: 177 lines (+63/-6)

7 files modified

components.api (+1/-0)
modules/Ubuntu/Components/Header.qml (+8/-0)
modules/Ubuntu/Components/MainView.qml (+5/-0)
modules/Ubuntu/Components/Themes/Ambiance/NewHeaderStyle.qml (+16/-3)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py (+15/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py (+13/-1)
tests/resources/toolbar/headerTools.qml (+5/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1314945: Header back button override

Critical

Fix Released

Link a bug report

Related blueprints

1062. By Tim Peeters on 2014-05-05

merge trunk

1061. By Tim Peeters on 2014-05-04

no change

1060. By Tim Peeters on 2014-05-02

trigger jenkins

1059. By Tim Peeters on 2014-05-02

fix flake8 too long lines

1058. By Tim Peeters on 2014-05-02

check that back is not null

1057. By Tim Peeters on 2014-05-02

rename customLeftButton to customBackButton

1056. By Tim Peeters on 2014-05-02

rename __leftAction to __customBackAction

1055. By Tim Peeters on 2014-05-02

add autopilot test

1054. By Tim Peeters on 2014-05-02

move __leftAction binding from Page to MainView

1053. By Tim Peeters on 2014-05-02

merge 55-MainView-Page-clean