Merge lp:~tpeeters/ubuntu-ui-toolkit/back-in-header into lp:ubuntu-ui-toolkit
Proposed by
Tim Peeters
Status: | Work in progress |
---|---|
Proposed branch: | lp:~tpeeters/ubuntu-ui-toolkit/back-in-header |
Merge into: | lp:ubuntu-ui-toolkit |
Diff against target: |
110 lines (+48/-3) 4 files modified
modules/Ubuntu/Components/Header.qml (+3/-0) modules/Ubuntu/Components/MainView.qml (+9/-0) modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml (+33/-2) modules/Ubuntu/Components/ToolbarItems.qml (+3/-1) |
To merge this branch: | bzr merge lp:~tpeeters/ubuntu-ui-toolkit/back-in-header |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Needs Fixing | |
Ubuntu SDK team | Pending | ||
Review via email: mp+202471@code.launchpad.net |
Description of the change
Don't review yet, I just need to see the diff
To post a comment you must log in.
Unmerged revisions
- 889. By Tim Peeters
-
merge trunk
- 888. By Tim Peeters
-
remove test program that was meant for another branch
- 887. By Tim Peeters
-
add test program
- 886. By Tim Peeters
-
lock empty toolbar even when there is back
- 885. By Tim Peeters
-
adjust text margin if there are controls
- 884. By Tim Peeters
-
move the back button to the header
FAILED: Continuous integration, rev:889 jenkins. qa.ubuntu. com/job/ ubuntu- ui-toolkit- ci/1613/ jenkins. qa.ubuntu. com/job/ generic- mediumtests- trusty/ 2496/console jenkins. qa.ubuntu. com/job/ generic- mediumtests- trusty- touch/2325/ console jenkins. qa.ubuntu. com/job/ ubuntu- ui-toolkit- trusty- amd64-ci/ 561/console jenkins. qa.ubuntu. com/job/ ubuntu- ui-toolkit- trusty- armhf-ci/ 561/console jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- trusty- amd64/2498/ console jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- trusty- armhf/2325/ console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- ui-toolkit- ci/1613/ rebuild
http://