lp:~bfiller/gallery-app/silo-14-changes

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:gallery-app

PS Jenkins bot: Needs Fixing (continuous-integration) on 2014-04-09

Ubuntu Phablet Team: Pending requested 2014-04-04

Diff: 1216 lines (+471/-128)

29 files modified

rc/js/GraphicsRoutines.js (+4/-0)
rc/qml/AlbumEditor/AlbumEditor.qml (+1/-1)
rc/qml/AlbumViewer/AlbumInternals/AlbumPageContents.qml (+7/-3)
rc/qml/AlbumViewer/AlbumViewer.qml (+24/-20)
rc/qml/AlbumViewer/AlbumViewerTransition.qml (+11/-4)
rc/qml/Components/MouseAreaWithMultipoint.qml (+73/-0)
rc/qml/MediaViewer/MediaListView.qml (+27/-0)
rc/qml/MediaViewer/VideoViewerDelegate.qml (+6/-0)
rc/qml/MediaViewer/ZoomablePhotoComponent.qml (+5/-2)
rc/qml/OrganicView/OrganicView.qml (+4/-0)
src/media-object-factory.cpp (+2/-2)
src/util/resource.cpp (+6/-0)
src/util/resource.h (+2/-0)
src/video/video.cpp (+5/-0)
src/video/video.h (+2/-0)
tests/autopilot/gallery_app/emulators/album_view.py (+5/-0)
tests/autopilot/gallery_app/emulators/events_view.py (+40/-0)
tests/autopilot/gallery_app/emulators/gallery_utils.py (+8/-24)
tests/autopilot/gallery_app/emulators/main_screen.py (+10/-2)
tests/autopilot/gallery_app/emulators/toolbar.py (+33/-1)
tests/autopilot/gallery_app/tests/__init__.py (+7/-24)
tests/autopilot/gallery_app/tests/test_album_view.py (+37/-1)
tests/autopilot/gallery_app/tests/test_albums_view.py (+7/-14)
tests/autopilot/gallery_app/tests/test_events_view.py (+32/-8)
tests/autopilot/gallery_app/tests/test_photo_viewer.py (+28/-21)
tests/autopilot/gallery_app/tests/test_picker_mode.py (+1/-0)
tests/unittests/mediaobjectfactory/CMakeLists.txt (+1/-0)
tests/unittests/mediaobjectfactory/tst_mediaobjectfactory.cpp (+24/-1)
tests/unittests/stubs/video_stub.cpp (+59/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

953. By Bill Filler on 2014-04-08

merge

952. By Bill Filler on 2014-04-08

skip content hub test

951. By Bill Filler on 2014-04-08

merge

950. By Bill Filler on 2014-04-07

merge

949. By Bill Filler on 2014-04-04

merge

948. By Bill Filler on 2014-04-04

merge

947. By Bill Filler on 2014-04-04

merge

946. By Bill Filler on 2014-04-04

merge

945. By Bill Filler on 2014-04-04

merge

944. By Bill Filler on 2014-04-04

merge