lp:~phablet-team/messaging-app/group-chat

Branch merges

Merged into lp:messaging-app/staging at revision 600

Gustavo Pichorim Boiko (community): Approve on 2016-10-17

Diff: 2357 lines (+716/-643)

31 files modified

debian/messaging-app.install (+1/-1)
src/messagingapplication.cpp (+17/-8)
src/qml/AttachmentDelegates/AudioDelegate.qml (+3/-3)
src/qml/AttachmentDelegates/BaseDelegate.qml (+1/-1)
src/qml/AttachmentDelegates/CMakeLists.txt (+3/-3)
src/qml/AttachmentDelegates/ContactDelegate.qml (+3/-3)
src/qml/AttachmentDelegates/DefaultDelegate.qml (+2/-2)
src/qml/AttachmentDelegates/ImageDelegate.qml (+3/-3)
src/qml/AttachmentDelegates/PreviewerMultipleContacts.qml (+2/-1)
src/qml/AttachmentDelegates/PreviewerVideo.qml (+2/-2)
src/qml/AttachmentDelegates/VideoDelegate.qml (+3/-3)
src/qml/AttachmentsDelegate.qml (+55/-168)
src/qml/CMakeLists.txt (+1/-5)
src/qml/ComposeBar.qml (+2/-3)
src/qml/MMSMessageBubble.qml (+0/-48)
src/qml/MainPage.qml (+4/-1)
src/qml/MessageBubble.qml (+6/-4)
src/qml/MessageDelegate.qml (+199/-44)
src/qml/Messages.qml (+188/-39)
src/qml/MessagesListView.qml (+2/-45)
src/qml/MessagingContactViewPage.qml (+2/-1)
src/qml/MultiRecipientInput.qml (+53/-2)
src/qml/RegularMessageDelegate.qml (+4/-21)
src/qml/SMSDelegate.qml (+0/-91)
src/qml/SwipeItemDemo.qml (+2/-2)
src/qml/ThreadDelegate.qml (+19/-3)
src/qml/messaging-app.qml (+81/-29)
tests/qml/CMakeLists.txt (+1/-1)
tests/qml/tst_AttachmentsDelegate.qml (+49/-103)
tests/qml/tst_DualSim.qml (+4/-1)
tests/qml/tst_MessagesView.qml (+4/-2)

api

Superseded for merging into lp:messaging-app

Ubuntu Phablet Team: Pending requested 2016-04-25

Diff: 2287 lines (+706/-633)

31 files modified

debian/messaging-app.install (+1/-1)
src/messagingapplication.cpp (+16/-7)
src/qml/AttachmentDelegates/AudioDelegate.qml (+3/-3)
src/qml/AttachmentDelegates/BaseDelegate.qml (+1/-1)
src/qml/AttachmentDelegates/CMakeLists.txt (+3/-3)
src/qml/AttachmentDelegates/ContactDelegate.qml (+3/-3)
src/qml/AttachmentDelegates/DefaultDelegate.qml (+2/-2)
src/qml/AttachmentDelegates/ImageDelegate.qml (+3/-3)
src/qml/AttachmentDelegates/PreviewerMultipleContacts.qml (+2/-1)
src/qml/AttachmentDelegates/PreviewerVideo.qml (+1/-1)
src/qml/AttachmentDelegates/VideoDelegate.qml (+3/-3)
src/qml/AttachmentsDelegate.qml (+55/-168)
src/qml/CMakeLists.txt (+1/-5)
src/qml/ComposeBar.qml (+1/-2)
src/qml/MMSMessageBubble.qml (+0/-48)
src/qml/MainPage.qml (+3/-0)
src/qml/MessageBubble.qml (+5/-3)
src/qml/MessageDelegate.qml (+199/-44)
src/qml/Messages.qml (+188/-39)
src/qml/MessagesListView.qml (+2/-45)
src/qml/MessagingContactViewPage.qml (+2/-1)
src/qml/MultiRecipientInput.qml (+52/-1)
src/qml/RegularMessageDelegate.qml (+4/-21)
src/qml/SMSDelegate.qml (+0/-91)
src/qml/SwipeItemDemo.qml (+2/-2)
src/qml/ThreadDelegate.qml (+18/-2)
src/qml/messaging-app.qml (+80/-28)
tests/qml/CMakeLists.txt (+1/-1)
tests/qml/tst_AttachmentsDelegate.qml (+48/-102)
tests/qml/tst_DualSim.qml (+4/-1)
tests/qml/tst_MessagesView.qml (+3/-1)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

603. By Gustavo Pichorim Boiko on 2016-10-17

Update copyright headers

602. By Tiago Salem Herrmann on 2016-09-29

merge parent branch

601. By Tiago Salem Herrmann on 2016-09-08

Do not mark messages as read if view is not active

600. By Tiago Salem Herrmann on 2016-09-08

merge parent branch

599. By Tiago Salem Herrmann on 2016-08-24

merge trunk

598. By Tiago Salem Herrmann on 2016-08-12

merge parent branch

597. By Tiago Salem Herrmann on 2016-08-12

set thread id correctly in Messages.qml

596. By Tiago Salem Herrmann on 2016-08-04

merge parent branch

595. By Gustavo Pichorim Boiko on 2016-08-04

Merge bottom edge and AdaptivePageLayout fixes

594. By Gustavo Pichorim Boiko on 2016-08-04

Merge trunk