lp:~artmello/messaging-app/messaging-app-video_attachment

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:messaging-app at revision 488

PS Jenkins bot: Needs Fixing (continuous-integration) on 2015-12-08

Tiago Salem Herrmann (community): Needs Fixing on 2015-11-25

Diff: 1483 lines (+1035/-123)

20 files modified

debian/control (+2/-0)
src/CMakeLists.txt (+2/-0)
src/fileoperations.cpp (+48/-0)
src/fileoperations.h (+39/-0)
src/messagingapplication.cpp (+28/-1)
src/messagingapplication.h (+7/-1)
src/qml/AttachmentPanel.qml (+2/-3)
src/qml/ComposeBar.qml (+2/-0)
src/qml/MMS/MMSImage.qml (+1/-0)
src/qml/MMS/MMSVideo.qml (+60/-44)
src/qml/MMS/PreviewerImage.qml (+183/-8)
src/qml/MMS/PreviewerVideo.qml (+124/-33)
src/qml/MMSDelegate.qml (+6/-7)
src/qml/ThumbnailVideo.qml (+76/-0)
src/qml/messaging-app.qml (+3/-1)
tests/qml/CMakeLists.txt (+34/-25)
tests/qml/tst_MMSDelegate.qml (+167/-0)
tests/qml/tst_PreviewerImage.qml (+103/-0)
tests/qml/tst_PreviewerVideo.qml (+87/-0)
tests/qml/tst_QmlTests.cpp (+61/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

498. By Arthur Mello on 2015-12-08

Merge with parent branch

497. By Arthur Mello on 2015-12-07

Merge with parent branch

496. By Arthur Mello on 2015-12-04

Use VideoOutput instead of Video QML component

495. By Arthur Mello on 2015-12-03

Show ActivityIndicator while loading thumbnail
Fix thumbnail path

494. By Arthur Mello on 2015-12-03

Fix typo

493. By Arthur Mello on 2015-12-03

Add Video Thumbnail

492. By Arthur Mello on 2015-12-02

Merge with lp:~boiko/messaging-app/more_attachment_types

491. By Arthur Mello on 2015-11-27

Add sample file

490. By Arthur Mello on 2015-11-27

Fix QML tests

489. By Arthur Mello on 2015-11-27

Fix QML test