lp:~libqtelegram-team/telegram-app/bugfix-1350234

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~libqtelegram-team/telegram-app/qml-plugin at revision 186

Michał Karnicki (community): Approve on 2014-08-13

Diff: 3140 lines (+1318/-597)

38 files modified

qmlplugin/CMakeLists.txt (+8/-2)
qmlplugin/config.cpp (+0/-8)
qmlplugin/config.h (+0/-2)
qmlplugin/data.cpp (+162/-98)
qmlplugin/data.h (+20/-7)
qmlplugin/dbmanager.cpp (+2/-0)
qmlplugin/dbmanager.h (+2/-0)
qmlplugin/models/contactsmodel.cpp (+92/-24)
qmlplugin/models/contactsmodel.h (+12/-3)
qmlplugin/models/contactsproxy.cpp (+6/-2)
qmlplugin/models/contactsproxy.h (+2/-3)
qmlplugin/models/contactsview.cpp (+88/-0)
qmlplugin/models/contactsview.h (+30/-0)
qmlplugin/models/dialogitem.cpp (+6/-39)
qmlplugin/models/dialogitem.h (+4/-14)
qmlplugin/models/dialogsmodel.cpp (+173/-114)
qmlplugin/models/dialogsmodel.h (+15/-9)
qmlplugin/models/dialogsproxy.cpp (+9/-8)
qmlplugin/models/dialogsproxy.h (+7/-7)
qmlplugin/models/dialogsview.cpp (+127/-0)
qmlplugin/models/dialogsview.h (+30/-0)
qmlplugin/models/messageitem.cpp (+5/-9)
qmlplugin/models/messagesmodel.cpp (+171/-79)
qmlplugin/models/messagesmodel.h (+40/-17)
qmlplugin/models/messagesview.cpp (+96/-0)
qmlplugin/models/messagesview.h (+32/-0)
qmlplugin/models/sortproxymodel.cpp (+49/-0)
qmlplugin/models/sortproxymodel.h (+51/-0)
qmlplugin/modelsmanager.cpp (+0/-23)
qmlplugin/modelsmanager.h (+0/-25)
qmlplugin/telegramclient.cpp (+16/-76)
qmlplugin/telegramclient.h (+0/-12)
qmlplugin/telegramplugin.cpp (+3/-0)
uitest/components/listitems/DlgItem.qml (+11/-10)
uitest/ui/ContactsPage.qml (+15/-2)
uitest/ui/DialogDesignPage.qml (+18/-2)
uitest/ui/DialogsPage.qml (+15/-1)
uitest/uitest.qml (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1350234: App crashes when scrolling chat window

Critical

Fix Released

Link a bug report

Related blueprints

200. By Roberto Mier Escandon on 2014-08-13

UPDATED code as two small coments from review

199. By Roberto Mier Escandon on 2014-08-13

reconciled this branch with qml-plugin lp:~achiang/libqtelegram/gtest-fixups branch merge

198. By Roberto Mier Escandon on 2014-08-12

UPDATED code as review comments

197. By Roberto Mier Escandon on 2014-08-12

ADDED sort by to the temp table creation for dialogs and contacts. CHECKED for received messages if most recent than topMessage in dialogs model

196. By Roberto Mier Escandon on 2014-08-12

FIXING conflicts with qml-plugin branch after a pull

195. By Roberto Mier Escandon on 2014-08-12

REMOVED models manager class not needed anymore. Cleaned code

194. By Roberto Mier Escandon on 2014-08-12

ADDED filter to avoid showing 'self' dialogs or users

193. By Roberto Mier Escandon on 2014-08-12

MERGED lp:~karni/libqtelegram/qml-plugin-messages-order. Adapt rest of proxy models to inherit from just created sort proxy class. Tested they are sorted

Merged branch lp:~karni/telegram-app/qml-plugin-messages-order

192. By Roberto Mier Escandon on 2014-08-11

changed contacts model to new design

191. By Roberto Mier Escandon on 2014-08-11

reviewed received and send message operations, as read messages one