← Back to branch summary

~ubuntu-sdk-team/ubuntu-ui-toolkit/locDemo

~ubuntu-sdk-team/ubuntu-ui-toolkit/locDemo

Viewing all changes in revision 1045.

Committer: Christian Dywan
Date: 2014-05-19 13:11:32 UTC
mfrom: (1041.2.19 staging)
Revision ID: christian.dywan@canonical.com-20140519131132-8syc77nqqotvb744

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

files added:
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/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py

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

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/ListItems/Empty.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/TabBar.qml

modules/Ubuntu/Components/TextInputPopover.qml

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

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

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

modules/Ubuntu/Components/ToolbarItems.qml

modules/Ubuntu/Components/plugin/i18n.cpp

modules/Ubuntu/Components/plugin/plugin.cpp

modules/Ubuntu/Components/plugin/plugin.pro

modules/Ubuntu/Components/plugin/ucalarm.cpp

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

tests/autopilot/ubuntuuitoolkit/__init__.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_qquicklistview.py

tests/autopilot/ubuntuuitoolkit/emulators.py

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

tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py

tests/resources/alarm/Alarms.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

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/ListItems/Empty.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/TabBar.qml

modules/Ubuntu/Components/TextInputPopover.qml

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

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

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

modules/Ubuntu/Components/ToolbarItems.qml

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

tests/autopilot/ubuntuuitoolkit/__init__.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_qquicklistview.py

tests/autopilot/ubuntuuitoolkit/emulators.py

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

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

tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py

tests/resources/alarm/Alarms.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

Older »