Merge lp://staging/~tiagosh/messaging-app/multiple-files into lp://staging/messaging-app
Proposed by
Tiago Salem Herrmann
Status: | Superseded | ||||
---|---|---|---|---|---|
Proposed branch: | lp://staging/~tiagosh/messaging-app/multiple-files | ||||
Merge into: | lp://staging/messaging-app | ||||
Diff against target: |
7666 lines (+5837/-719) 76 files modified
.bzrignore (+37/-0) debian/control (+10/-1) debian/messaging-app-apparmor.additions (+86/-0) debian/messaging-app-apparmor.manifest (+37/-0) debian/messaging-app.install (+2/-0) debian/rules (+22/-0) src/CMakeLists.txt (+7/-1) src/audiorecorder.cpp (+245/-0) src/audiorecorder.h (+142/-0) src/fileoperations.cpp (+63/-0) src/fileoperations.h (+41/-0) src/messagingapplication.cpp (+44/-1) src/messagingapplication.h (+7/-1) src/qml/AttachmentPanel.qml (+174/-0) src/qml/AudioPlaybackBar.qml (+187/-0) src/qml/AudioRecordingBar.qml (+161/-0) src/qml/CMakeLists.txt (+1/-0) src/qml/ComposeBar.qml (+545/-0) src/qml/ContentImport.qml (+23/-6) src/qml/DeliveryStatus.qml (+38/-0) src/qml/Dialogs/FileSizeWarningDialog.qml (+70/-0) src/qml/Dialogs/NoMicrophonePermission.qml (+58/-0) src/qml/KeyboardRectangle.qml (+8/-0) src/qml/MMS/MMSAudio.qml (+199/-0) src/qml/MMS/MMSBase.qml (+2/-0) src/qml/MMS/MMSContact.qml (+15/-2) src/qml/MMS/MMSImage.qml (+14/-0) src/qml/MMS/MMSVideo.qml (+73/-43) src/qml/MMS/PreviewerImage.qml (+183/-8) src/qml/MMS/PreviewerVideo.qml (+178/-33) src/qml/MMSDelegate.qml (+20/-17) src/qml/MMSMessageBubble.qml (+1/-0) src/qml/MainPage.qml (+1/-0) src/qml/MessageBubble.qml (+63/-77) src/qml/MessageDelegate.qml (+1/-0) src/qml/MessageDelegateFactory.qml (+2/-0) src/qml/Messages.qml (+173/-493) src/qml/MessagesHeader.qml (+1/-1) src/qml/SMSDelegate.qml (+1/-0) src/qml/Stickers/CMakeLists.txt (+4/-0) src/qml/Stickers/HistoryButton.qml (+35/-0) src/qml/Stickers/StickerDelegate.qml (+32/-0) src/qml/Stickers/StickerPackDelegate.qml (+53/-0) src/qml/Stickers/StickerPacksModel.qml (+25/-0) src/qml/Stickers/StickersModel.qml (+27/-0) src/qml/Stickers/StickersPicker.qml (+138/-0) src/qml/ThreadDelegate.qml (+64/-5) src/qml/ThumbnailContact.qml (+106/-0) src/qml/ThumbnailImage.qml (+49/-0) src/qml/ThumbnailUnknown.qml (+45/-0) src/qml/ThumbnailVideo.qml (+76/-0) src/qml/TransparentButton.qml (+104/-0) src/qml/assets/blue_bubble@27.sci (+5/-0) src/qml/assets/burn-after-read.svg (+191/-0) src/qml/assets/double_tick.svg (+21/-0) src/qml/assets/face-smile-big-symbolic-2.svg (+182/-0) src/qml/assets/green_bubble@27.sci (+5/-0) src/qml/assets/grey_bubble@27.sci (+5/-0) src/qml/assets/history.svg (+173/-0) src/qml/assets/input-keyboard-symbolic.svg (+221/-0) src/qml/assets/media_bubble@27.sci (+5/-0) src/qml/assets/red_bubble@27.sci (+5/-0) src/qml/assets/single_tick.svg (+20/-0) src/qml/assets/stock_document.svg (+189/-0) src/qml/assets/white_bubble@27.sci (+5/-0) src/qml/dateUtils.js (+6/-1) src/qml/messaging-app.qml (+13/-1) src/stickers-history-model.cpp (+307/-0) src/stickers-history-model.h (+91/-0) tests/qml/CMakeLists.txt (+35/-25) tests/qml/tst_MMSDelegate.qml (+196/-0) tests/qml/tst_MessageBubble.qml (+3/-3) tests/qml/tst_PreviewerImage.qml.disabled (+103/-0) tests/qml/tst_PreviewerVideo.qml.disabled (+87/-0) tests/qml/tst_QmlTests.cpp (+88/-0) tests/qml/tst_StickersHistoryModel.qml (+188/-0) |
||||
To merge this branch: | bzr merge lp://staging/~tiagosh/messaging-app/multiple-files | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Needs Fixing | |
Ubuntu Phablet Team | Pending | ||
Review via email: mp+285785@code.staging.launchpad.net |
This proposal has been superseded by a proposal from 2016-02-11.
Commit message
Enable receiving multiple files from content-hub.
Description of the change
Enable receiving multiple files from content-hub.
To post a comment you must log in.
Unmerged revisions
- 486. By Launchpad Translations on behalf of phablet-team
-
Launchpad automatic translations update.
FAILED: Continuous integration, rev:487 jenkins. qa.ubuntu. com/job/ messaging- app-ci/ 947/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- vivid-touch/ 6432 jenkins. qa.ubuntu. com/job/ messaging- app-vivid- i386-ci/ 456 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- vivid-touch/ 4923 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 6443 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 6443/artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 27510
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/messaging- app-ci/ 947/rebuild
http://