← Back to branch summary

~phablet-team/messaging-app/23-add-dri-rules-to-apparmor

~phablet-team/messaging-app/23-add-dri-rules-to-apparmor

Viewing all changes in revision 640.

Committer: Tiago Salem Herrmann
Date: 2017-03-20 17:16:06 UTC
mfrom: (639.15.45 22-delay_filling_participants)
Revision ID: tiago.herrmann@canonical.com-20170320171606-zhrd96m7fqizh41z

merge parent branch

files added:
accounts

accounts/CMakeLists.txt

accounts/messaging-app.application

src/qml/FavoriteChannels.qml

src/qml/OnlineAccountsHelper.qml

src/qml/RegularMessageDelegate_irc.qml

files modified:
CMakeLists.txt

debian/control

debian/messaging-app-apparmor.additions

debian/messaging-app.install

src/main.cpp

src/messagingapplication.cpp

src/messagingapplication.h

src/qml/ComposeBar.qml

src/qml/ContactSearchList.qml

src/qml/ContactSearchWidget.qml

src/qml/Dialogs/InformationDialog.qml

src/qml/GroupChatInfoPage.qml

src/qml/MainPage.qml

src/qml/MessageBubble.qml

src/qml/MessageDelegate.qml

src/qml/MessageInfoDialog.qml

src/qml/Messages.qml

src/qml/MessagesListView.qml

src/qml/MessagingContactEditorPage.qml

src/qml/MessagingContactViewPage.qml

src/qml/MultiRecipientInput.qml

src/qml/NewGroupPage.qml

src/qml/NewRecipientPage.qml

src/qml/ParticipantDelegate.qml

src/qml/ParticipantInfoPage.qml

src/qml/ParticipantsPopover.qml

src/qml/RegularMessageDelegate.qml

src/qml/SettingsPage.qml

src/qml/ThreadDelegate.qml

src/qml/ThreadsSectionDelegate.qml

src/qml/TransparentButton.qml

src/qml/messaging-app.qml

tests/qml/tst_MessagesView.qml

Show diffs side-by-side

added added

removed removed

accounts/CMakeLists.txt

accounts/messaging-app.application

debian/messaging-app-apparmor.additions

debian/messaging-app.install

src/messagingapplication.cpp

src/messagingapplication.h

src/qml/ComposeBar.qml

src/qml/ContactSearchList.qml

src/qml/ContactSearchWidget.qml

src/qml/Dialogs/InformationDialog.qml

src/qml/FavoriteChannels.qml

src/qml/GroupChatInfoPage.qml

src/qml/MainPage.qml

src/qml/MessageBubble.qml

src/qml/MessageDelegate.qml

src/qml/MessageInfoDialog.qml

src/qml/Messages.qml

src/qml/MessagesListView.qml

src/qml/MessagingContactEditorPage.qml

src/qml/MessagingContactViewPage.qml

src/qml/MultiRecipientInput.qml

src/qml/NewGroupPage.qml

src/qml/NewRecipientPage.qml

src/qml/OnlineAccountsHelper.qml

src/qml/ParticipantDelegate.qml

src/qml/ParticipantInfoPage.qml

src/qml/ParticipantsPopover.qml

src/qml/RegularMessageDelegate.qml

src/qml/RegularMessageDelegate_irc.qml

src/qml/SettingsPage.qml

src/qml/ThreadDelegate.qml

src/qml/ThreadsSectionDelegate.qml

src/qml/TransparentButton.qml

src/qml/messaging-app.qml

tests/qml/tst_MessagesView.qml

Older »