Merge lp://staging/~zsombi/messaging-app/prototypeWithMCV into lp://staging/messaging-app

Proposed by Cris Dywan
Status: Work in progress
Proposed branch: lp://staging/~zsombi/messaging-app/prototypeWithMCV
Merge into: lp://staging/messaging-app
Diff against target: 873 lines (+122/-118)
41 files modified
src/qml/AccountSectionDelegate.qml (+3/-3)
src/qml/ColoredImage.qml (+1/-1)
src/qml/ContactSearchList.qml (+3/-3)
src/qml/Dialogs/NoDefaultSIMCardDialog.qml (+2/-2)
src/qml/Dialogs/NoSIMCardSelectedDialog.qml (+2/-2)
src/qml/Dialogs/SetDefaultSIMCardDialog.qml (+2/-2)
src/qml/Dialogs/SimLockedDialog.qml (+2/-2)
src/qml/KeyboardRectangle.qml (+1/-1)
src/qml/LocalPageWithBottomEdge.qml (+2/-2)
src/qml/MMS/MMSBase.qml (+1/-1)
src/qml/MMS/MMSContact.qml (+2/-2)
src/qml/MMS/MMSDefault.qml (+2/-2)
src/qml/MMS/MMSImage.qml (+2/-2)
src/qml/MMS/MMSVideo.qml (+2/-2)
src/qml/MMS/Previewer.qml (+4/-4)
src/qml/MMS/PreviewerContact.qml (+2/-2)
src/qml/MMS/PreviewerImage.qml (+2/-2)
src/qml/MMS/PreviewerVideo.qml (+2/-2)
src/qml/MMSDelegate.qml (+2/-2)
src/qml/MMSMessageBubble.qml (+1/-1)
src/qml/MainPage.qml (+5/-5)
src/qml/MessageBubble.qml (+2/-2)
src/qml/MessageDateSection.qml (+3/-3)
src/qml/MessageDelegate.qml (+1/-1)
src/qml/MessageDelegateFactory.qml (+2/-2)
src/qml/MessageInfoDialog.qml (+2/-2)
src/qml/Messages.qml (+7/-6)
src/qml/MessagesListView.qml (+3/-3)
src/qml/MessagingContactEditorPage.qml (+2/-2)
src/qml/MessagingContactViewPage.qml (+7/-7)
src/qml/MultiRecipientInput.qml (+3/-3)
src/qml/NewRecipientPage.qml (+4/-4)
src/qml/PictureImport.qml (+2/-2)
src/qml/RegularMessageDelegate.qml (+1/-1)
src/qml/SMSDelegate.qml (+2/-2)
src/qml/SettingsPage.qml (+3/-3)
src/qml/StandardAnimation.qml (+1/-1)
src/qml/SwipeItemDemo.qml (+3/-3)
src/qml/ThreadDelegate.qml (+2/-2)
src/qml/messaging-app.qml (+26/-23)
tests/qml/tst_MessageBubble.qml (+1/-1)
To merge this branch: bzr merge lp://staging/~zsombi/messaging-app/prototypeWithMCV
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+262592@code.staging.launchpad.net
To post a comment you must log in.

Unmerged revisions

382. By Zsombor Egri

MultiColumnView API changes

381. By Zsombor Egri

1.3 used and MultiColumnView added

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches