lp:~canonical-platform-qa/ubuntu-ui-toolkit/fix1324469-untabify

Branch merges

Propose for merging

No branches dependent on this one.

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

PS Jenkins bot: Needs Fixing (continuous-integration) on 2014-10-21

Cris Dywan: Approve on 2014-10-21

Diff: 171 lines (+71/-72)

1 file modified

modules/Ubuntu/Test/UbuntuTestCase.qml (+71/-72)

api

Superseded for merging into lp:ubuntu-ui-toolkit

PS Jenkins bot: Needs Fixing (continuous-integration) on 2014-10-01

Ubuntu SDK team: Pending requested 2014-10-01

Diff: 2006 lines (+771/-613)

19 files modified

debian/control (+1/-0)
modules/Ubuntu/Components/PageStack.qml (+82/-7)
modules/Ubuntu/Components/Popups/Popover.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml (+426/-304)
modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml (+2/-2)
modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml (+10/-4)
modules/Ubuntu/Components/Themes/Ambiance/TextSelectionEndCursorStyle.qml (+0/-73)
modules/Ubuntu/Components/Themes/Ambiance/TextSelectionStartCursorStyle.qml (+0/-73)
modules/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp (+50/-21)
modules/Ubuntu/Components/plugin/shapeitem.cpp (+0/-14)
modules/Ubuntu/Components/plugin/shapeitem.h (+0/-18)
modules/Ubuntu/Test/UbuntuTestCase.qml (+90/-91)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py (+17/-0)
tests/autopilot/ubuntuuitoolkit/tests/components/test_header.py (+2/-0)
tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py (+5/-5)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.py (+1/-0)
tests/unit/tst_alarms/tst_alarms.cpp (+23/-0)
tests/unit_x11/tst_components/tst_headActions.qml (+13/-0)
tests/unit_x11/tst_components/tst_pagestack_new_header.qml (+48/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1324469: modules/Ubuntu/Test/UbuntuTestCase.qml uses tabs instead of spaces

Undecided

Fix Released

Link a bug report

Related blueprints

1273. By Leo Arias on 2014-10-21

Merged with staging.

1272. By Leo Arias on 2014-10-10

Merged with staging.

1271. By Leo Arias on 2014-10-01

Replaced the tabs for spaces in UbuntuTestCase.

1270. By Cris Dywan on 2014-10-01

autopilot package should source-depend on QML plugin. Fixes: https://bugs.launchpad.net/bugs/1236085.

Approved by PS Jenkins bot, Zoltan Balogh.

1269. By Tim Peeters on 2014-09-30

Implement header animations in PageHeadStyle and prepare PageStack for enabling the animations.

Approved by PS Jenkins bot, Zsombor Egri.

1268. By Cris Dywan on 2014-09-30

Hide pop over when changing orientation. Fixes: https://bugs.launchpad.net/bugs/1369506, https://bugs.launchpad.net/bugs/1375837.

Approved by PS Jenkins bot, Tim Peeters.

1267. By Cris Dywan on 2014-09-26

Selection handler should be centered and not blinking. Fixes: https://bugs.launchpad.net/bugs/1371205.

Approved by PS Jenkins bot, Zsombor Egri.

1266. By Zsombor Egri on 2014-09-25

Use tags as workaround for an alarm and an additional one for a disabled alarm as agreed in the attached bug #1361702. The alarm should always save the visual and audible reminder attachments no matter if disabled or not. Fixes: https://bugs.launchpad.net/bugs/1361702.

Approved by PS Jenkins bot, Christian Dywan.

1265. By Zoltan Balogh on 2014-09-23

Sync with trunk

1264. By Loïc Molinari on 2014-09-22

[UbuntuShape] Removed useless dirty flags.

Approved by PS Jenkins bot, Zsombor Egri.