← Back to branch summary

~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-batched-renderer-support-for-ubuntushape2

~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-batched-renderer-support-for-ubuntushape2

Viewing all changes in revision 1034.1.12.

Committer: Christian Dywan
Date: 2014-05-19 09:44:22 UTC
mfrom: (967.11.6 swipe_into_view)
mto: This revision was merged to the branch mainline in revision 1098.
Revision ID: christian.dywan@canonical.com-20140519094422-73onth19puzklw9w

Merge lp:~elopio/ubuntu-ui-toolkit/swipe_into_view

files added:
modules/Ubuntu/Components/Themes/Ambiance/TextSelectionEndCursorStyle.qml

modules/Ubuntu/Components/Themes/Ambiance/TextSelectionStartCursorStyle.qml

modules/Ubuntu/Components/Themes/Ambiance/artwork/teardrop-left@20.png

modules/Ubuntu/Components/Themes/Ambiance/artwork/teardrop-right@20.png

modules/Ubuntu/Components/plugin/filterbehavior.cpp

modules/Ubuntu/Components/plugin/filterbehavior.h

modules/Ubuntu/Components/plugin/sortbehavior.cpp

modules/Ubuntu/Components/plugin/sortbehavior.h

modules/Ubuntu/Components/plugin/sortfiltermodel.cpp

modules/Ubuntu/Components/plugin/sortfiltermodel.h

tests/resources/toolbar/headerTextInput.qml

tests/unit/tst_components/tst_sortfiltermodel.qml

tests/unit/tst_i18n/localizedApp/.click

tests/unit/tst_i18n/localizedApp/.click/status

tests/unit/tst_i18n/localizedApp/share

tests/unit_x11/tst_components/tst_textinput_common.qml

files removed:
tests/unit/tst_i18n/appropriate/localizedApp

files renamed:
tests/unit/tst_i18n/appropriate/ => tests/unit/tst_i18n/localizedApp/

tests/unit/tst_i18n/appropriate/locale/ => tests/unit/tst_i18n/localizedApp/share/locale/

files modified:
components.api

debian/changelog

debian/control

examples/ubuntu-ui-toolkit-gallery/Icons.qml

examples/ubuntu-ui-toolkit-gallery/ListItems.qml

modules/Ubuntu/Components/AbstractButton.qml

modules/Ubuntu/Components/Action.qml

modules/Ubuntu/Components/Header.qml

modules/Ubuntu/Components/InputHandler.qml

modules/Ubuntu/Components/MainView.qml

modules/Ubuntu/Components/Page.qml

modules/Ubuntu/Components/PageStack.qml

modules/Ubuntu/Components/PageTreeNode.qml

modules/Ubuntu/Components/Popups/PopupBase.qml

modules/Ubuntu/Components/Popups/internalPopupUtils.js

modules/Ubuntu/Components/TabBar.qml

modules/Ubuntu/Components/TextArea.qml

modules/Ubuntu/Components/TextCursor.qml

modules/Ubuntu/Components/TextField.qml

modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml

modules/Ubuntu/Components/Themes/Ambiance/NewHeaderStyle.qml

modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml

modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml

modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml

modules/Ubuntu/Components/Themes/Ambiance/TextFieldStyle.qml

modules/Ubuntu/Components/Themes/Ambiance/qmldir

modules/Ubuntu/Components/plugin/i18n.cpp

modules/Ubuntu/Components/plugin/plugin.cpp

modules/Ubuntu/Components/plugin/plugin.pro

modules/Ubuntu/Components/plugin/ucalarm.cpp

modules/Ubuntu/Test/UbuntuTestCase.qml

po/ca.po

po/de.po

po/es.po

po/fi.po

po/fr.po

po/gl.po

po/he.po

po/hu.po

po/ko.po

po/my.po

po/nl.po

po/oc.po

po/pt_BR.po

po/sv.po

po/uk.po

run_tests.sh

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py

tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py

tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py

tests/resources/alarm/Alarms.qml

tests/resources/inputs/TextInputs.qml

tests/resources/navigation/StackWithTabs.qml

tests/resources/toolbar/headerTools.qml

tests/unit/tst_alarms/tst_alarms.cpp

tests/unit/tst_components/tst_pagestack.qml

tests/unit/tst_i18n/src/tst_i18n.cpp

tests/unit/tst_i18n/tst_i18n.pro

tests/unit/tst_mainview/PageStack.qml

tests/unit_x11/tst_components/tst_datepicker.qml

tests/unit_x11/tst_components/tst_textarea.qml

tests/unit_x11/tst_components/tst_textfield.qml

Show diffs side-by-side

added added

removed removed

debian/changelog

examples/ubuntu-ui-toolkit-gallery/Icons.qml

examples/ubuntu-ui-toolkit-gallery/ListItems.qml

modules/Ubuntu/Components/AbstractButton.qml

modules/Ubuntu/Components/Action.qml

modules/Ubuntu/Components/InputHandler.qml

modules/Ubuntu/Components/MainView.qml

modules/Ubuntu/Components/Page.qml

modules/Ubuntu/Components/PageStack.qml

modules/Ubuntu/Components/PageTreeNode.qml

modules/Ubuntu/Components/Popups/PopupBase.qml

modules/Ubuntu/Components/Popups/internalPopupUtils.js

modules/Ubuntu/Components/TabBar.qml

modules/Ubuntu/Components/TextArea.qml

modules/Ubuntu/Components/TextCursor.qml

modules/Ubuntu/Components/TextField.qml

modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml

modules/Ubuntu/Components/Themes/Ambiance/NewHeaderStyle.qml

modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml

modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml

modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml

modules/Ubuntu/Components/Themes/Ambiance/TextFieldStyle.qml

modules/Ubuntu/Components/Themes/Ambiance/TextSelectionEndCursorStyle.qml

modules/Ubuntu/Components/Themes/Ambiance/TextSelectionStartCursorStyle.qml

modules/Ubuntu/Components/Themes/Ambiance/artwork/teardrop-left@20.png

modules/Ubuntu/Components/Themes/Ambiance/artwork/teardrop-right@20.png

modules/Ubuntu/Components/Themes/Ambiance/qmldir

modules/Ubuntu/Components/plugin/filterbehavior.cpp

modules/Ubuntu/Components/plugin/filterbehavior.h

modules/Ubuntu/Components/plugin/i18n.cpp

modules/Ubuntu/Components/plugin/plugin.cpp

modules/Ubuntu/Components/plugin/plugin.pro

modules/Ubuntu/Components/plugin/sortbehavior.cpp

modules/Ubuntu/Components/plugin/sortbehavior.h

modules/Ubuntu/Components/plugin/sortfiltermodel.cpp

modules/Ubuntu/Components/plugin/sortfiltermodel.h

modules/Ubuntu/Components/plugin/ucalarm.cpp

modules/Ubuntu/Test/UbuntuTestCase.qml

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py

tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py

tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py

tests/resources/alarm/Alarms.qml

tests/resources/inputs/TextInputs.qml

tests/unit/tst_alarms/tst_alarms.cpp

tests/unit/tst_components/tst_pagestack.qml

tests/unit/tst_components/tst_sortfiltermodel.qml

tests/unit/tst_i18n/appropriate/localizedApp/

tests/unit/tst_i18n/localizedApp/.click/

tests/unit/tst_i18n/localizedApp/.click/status

tests/unit/tst_i18n/src/tst_i18n.cpp

tests/unit/tst_i18n/tst_i18n.pro

tests/unit/tst_mainview/PageStack.qml

tests/unit_x11/tst_components/tst_datepicker.qml

tests/unit_x11/tst_components/tst_textarea.qml

tests/unit_x11/tst_components/tst_textfield.qml

tests/unit_x11/tst_components/tst_textinput_common.qml

Older »