lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/pullToRefresh

Branch merges

Propose for merging

No branches dependent on this one.

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

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

Tim Peeters: Approve on 2014-06-27

Diff: 1610 lines (+1384/-6)

24 files modified

components.api (+16/-0)
examples/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml (+67/-0)
examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml (+6/-0)
modules/Ubuntu/Components/PullToRefresh.qml (+242/-0)
modules/Ubuntu/Components/Styles/PullToRefreshStyle.qml (+48/-0)
modules/Ubuntu/Components/Styles/qmldir (+1/-0)
modules/Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml (+251/-0)
modules/Ubuntu/Components/Themes/Ambiance/qmldir (+1/-1)
modules/Ubuntu/Components/UbuntuListView11.qdoc (+38/-0)
modules/Ubuntu/Components/UbuntuListView11.qml (+33/-0)
modules/Ubuntu/Components/qmldir (+2/-1)
tests/autopilot/ubuntuuitoolkit/__init__.py (+2/-0)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py (+4/-0)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py (+61/-1)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_qquicklistview.py (+1/-1)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_ubuntulistview.py (+47/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_pull_to_refresh.py (+56/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_pull_to_refresh.qml (+102/-0)
tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py (+2/-1)
tests/autopilot/ubuntuuitoolkit/tests/gallery/test_ubuntulistview.py (+50/-0)
tests/resources/navigation/PullToRefreshTest.qml (+112/-0)
tests/unit_x11/tst_components/tst_pulltorefresh_listview.qml (+135/-0)
tests/unit_x11/tst_components/tst_ubuntulistview.qml (+1/-1)
tests/unit_x11/tst_components/tst_ubuntulistview11.qml (+106/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

974. By Cris Dywan on 2014-06-30

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

973. By Zsombor Egri on 2014-06-27

comments addressed

972. By Zsombor Egri on 2014-06-27

documentation failure fixed

971. By Zsombor Egri on 2014-06-26

final shaping

970. By Zsombor Egri on 2014-06-26

staging merge

969. By Zsombor Egri on 2014-06-26

fixes

968. By Zsombor Egri on 2014-06-25

updates

967. By Zsombor Egri on 2014-06-24

missing unit test added

966. By Zsombor Egri on 2014-06-18

staging merge

965. By Zsombor Egri on 2014-06-17

skip other test failiong on arm, for the same reason as previous