← Back to branch summary

~renatofilho/messaging-app/fix-1417341-rtm

~renatofilho/messaging-app/fix-1417341-rtm

Viewing all changes in revision 191.3.5.

Committer: Gustavo Pichorim Boiko
Date: 2014-09-02 20:49:19 UTC
mfrom: (192.1.19 messaging-app)
mto: (192.1.22 messaging-app)
mto: This revision was merged to the branch mainline in revision 195.
Revision ID: gustavo.boiko@canonical.com-20140902204919-bds6zuuy38snm8r4

Merge latest changes from trunk.

files added:
src/qml/ColoredImage.qml

src/qml/MMSMessageBubble.qml

src/qml/MessagesListView.qml

src/qml/PictureImport.qml

src/qml/assets/conversation_bubble_arrow.png

files removed:
src/qml/assets/conversation_error@27.png

src/qml/assets/conversation_error@27.sci

src/qml/assets/conversation_incoming@27.png

src/qml/assets/conversation_incoming@27.sci

src/qml/assets/conversation_outgoing@27.png

src/qml/assets/conversation_outgoing@27.sci

src/qml/assets/conversation_pending@27.png

src/qml/assets/conversation_pending@27.sci

files modified:
CMakeLists.txt

debian/changelog

debian/control

debian/rules

po/am.po

po/ar.po

po/ast.po

po/az.po

po/bg.po

po/br.po

po/ca.po

po/cs.po

po/da.po

po/de.po

po/el.po

po/en_AU.po

po/en_GB.po

po/es.po

po/eu.po

po/fa.po

po/fi.po

po/fr.po

po/gd.po

po/gl.po

po/he.po

po/hu.po

po/is.po

po/it.po

po/ja.po

po/km.po

po/ko.po

po/lo.po

po/lv.po

po/messaging-app.pot

po/ml.po

po/ms.po

po/my.po

po/nb.po

po/nl.po

po/pl.po

po/pt.po

po/pt_BR.po

po/ro.po

po/ru.po

po/shn.po

po/sl.po

po/sr.po

po/sv.po

po/ta.po

po/te.po

po/tr.po

po/ug.po

po/uk.po

po/zh_CN.po

po/zh_HK.po

po/zh_TW.po

src/main.cpp

src/qml/Dialogs/NoDefaultSIMCardDialog.qml

src/qml/MMS/MMSBase.qml

src/qml/MMS/MMSContact.qml

src/qml/MMS/MMSImage.qml

src/qml/MMS/PreviewerImage.qml

src/qml/MMSDelegate.qml

src/qml/MainPage.qml

src/qml/MessageBubble.qml

src/qml/MessageDelegate.qml

src/qml/MessageDelegateFactory.qml

src/qml/MessageInfoDialog.qml

src/qml/Messages.qml

src/qml/SMSDelegate.qml

src/qml/dateUtils.js

src/qml/messaging-app.qml

tests/autopilot/messaging_app/emulators.py

tests/qml/tst_MessageBubble.qml

Show diffs side-by-side

added added

removed removed

debian/changelog

po/messaging-app.pot

src/qml/ColoredImage.qml

src/qml/Dialogs/NoDefaultSIMCardDialog.qml

src/qml/MMS/MMSBase.qml

src/qml/MMS/MMSContact.qml

src/qml/MMS/MMSImage.qml

src/qml/MMS/PreviewerImage.qml

src/qml/MMSDelegate.qml

src/qml/MMSMessageBubble.qml

src/qml/MainPage.qml

src/qml/MessageBubble.qml

src/qml/MessageDelegate.qml

src/qml/MessageDelegateFactory.qml

src/qml/MessageInfoDialog.qml

src/qml/Messages.qml

src/qml/MessagesListView.qml

src/qml/PictureImport.qml

src/qml/SMSDelegate.qml

src/qml/assets/conversation_bubble_arrow.png

src/qml/assets/conversation_error@27.png

src/qml/assets/conversation_error@27.sci

src/qml/assets/conversation_incoming@27.png

src/qml/assets/conversation_incoming@27.sci

src/qml/assets/conversation_outgoing@27.png

src/qml/assets/conversation_outgoing@27.sci

src/qml/assets/conversation_pending@27.png

src/qml/assets/conversation_pending@27.sci

src/qml/dateUtils.js

src/qml/messaging-app.qml

tests/autopilot/messaging_app/emulators.py

tests/qml/tst_MessageBubble.qml

Older »