messaging-app

Merge lp://staging/~phablet-team/messaging-app/group_chat_ui into lp://staging/messaging-app

  1. group_chat_ui
  2. Merge into trunk
Proposed by Gustavo Pichorim Boiko
Status: Superseded
Proposed branch: lp://staging/~phablet-team/messaging-app/group_chat_ui
Merge into: lp://staging/messaging-app
Prerequisite: lp://staging/~phablet-team/messaging-app/group-chat
Diff against target: 911 lines (+279/-398)
18 files modified
src/qml/AttachmentDelegates/BaseDelegate.qml (+1/-0)
src/qml/AttachmentsDelegate.qml (+8/-1)
src/qml/ComposeBar.qml (+2/-3)
src/qml/ContactSearchList.qml (+1/-1)
src/qml/GroupChatInfoPage.qml (+175/-0)
src/qml/MainPage.qml (+1/-1)
src/qml/MessageBubble.qml (+4/-1)
src/qml/MessageDelegate.qml (+0/-320)
src/qml/Messages.qml (+3/-60)
src/qml/MessagesListView.qml (+2/-0)
src/qml/MultiRecipientInput.qml (+2/-2)
src/qml/ParticipantDelegate.qml (+68/-0)
src/qml/RegularMessageDelegate.qml (+4/-0)
src/qml/ThreadDelegate.qml (+1/-1)
src/qml/ThumbnailContact.qml (+1/-1)
src/qml/TransparentButton.qml (+1/-1)
src/qml/TransparentTextFieldStype.qml (+1/-1)
src/qml/messaging-app.qml (+4/-5)
To merge this branch: bzr merge lp://staging/~phablet-team/messaging-app/group_chat_ui
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing
PS Jenkins bot continuous-integration Pending
Ubuntu Phablet Team Pending
Review via email: mp+294741@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2016-10-13.

Commit message

Add a new screen to show information about groups.
Also, update colors and bubbles.

Description of the change

Add a new screen to show information about groups.
Also, update colors and bubbles.

To post a comment you must log in.
lp://staging/~phablet-team/messaging-app/group_chat_ui updated
572. By Gustavo Pichorim Boiko

Update copyright headers.

573. By Gustavo Pichorim Boiko

Fix some more colors and sizes.

574. By Gustavo Pichorim Boiko

Merge parent branch

575. By Tiago Salem Herrmann

merge parent branch

576. By Tiago Salem Herrmann

merge parent branch

577. By Tiago Salem Herrmann

merge parent trunk

578. By Tiago Salem Herrmann

merge parent trunk

579. By Gustavo Pichorim Boiko

Merge parent branch

580. By Gustavo Pichorim Boiko

Merge parent.

581. By Gustavo Pichorim Boiko

Make it possible to rename groups.

582. By Gustavo Pichorim Boiko

OSK does not emmit onEnterPressed, so use onAccepted

583. By Tiago Salem Herrmann

merge parent branch

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:583
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/6/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/660/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/660
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/624
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/624
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/624
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/616/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/616/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/616/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/616/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/616/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/616/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/616/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/616/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/616/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/6/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~phablet-team/messaging-app/group_chat_ui updated
584. By Tiago Salem Herrmann

merge parent branch

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:584
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/24/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/735/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/735
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/681
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/681
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/681
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/673/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/673/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/673/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/673/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/673/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/673/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/673/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/673/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/673/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/24/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~phablet-team/messaging-app/group_chat_ui updated
585. By Tiago Salem Herrmann

merge parent branch

586. By Tiago Salem Herrmann

merge parent branch

587. By Gustavo Pichorim Boiko

Move the add participant button to the same row as the label.

588. By Gustavo Pichorim Boiko

Update message bubble delegates according to the spec.

589. By Tiago Salem Herrmann

merge parent branch

590. By Gustavo Pichorim Boiko

More design fixes.

591. By Gustavo Pichorim Boiko

Fix crop in attachments.

592. By Gustavo Pichorim Boiko

Merge parent branch

593. By Tiago Salem Herrmann

Remove string that's not used

594. By Tiago Salem Herrmann

merge parent branch

595. By Tiago Salem Herrmann

merge parent branch

596. By Tiago Salem Herrmann

merge parent branch

597. By Gustavo Pichorim Boiko

Clip the Flickable.

598. By Gustavo Pichorim Boiko

Merge parent

599. By Gustavo Pichorim Boiko

Remove obsolete APL stuff

600. By Tiago Salem Herrmann

merge parent branch

601. By Tiago Salem Herrmann

merge parent branch

602. By Tiago Salem Herrmann

merge trunk

603. By Tiago Salem Herrmann

merge parent branch

604. By Tiago Salem Herrmann

merge parent branch

605. By Tiago Salem Herrmann

accountsForType does not work in qml, iterate over all accounts

606. By Tiago Salem Herrmann

merge parent branch

607. By Tiago Salem Herrmann

Fix message forwarding

608. By Gustavo Pichorim Boiko

Merge parent branch

Unmerged revisions

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

to all changes: