lp:~phablet-team/messaging-app/stickers

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:messaging-app at revision 491

Gustavo Pichorim Boiko (community): Approve on 2015-12-17

PS Jenkins bot: Needs Fixing (continuous-integration) on 2015-12-16

Diff: 1985 lines (+1651/-14)

25 files modified

.bzrignore (+37/-0)
debian/control (+1/-0)
debian/messaging-app.install (+1/-0)
src/CMakeLists.txt (+3/-1)
src/messagingapplication.cpp (+18/-4)
src/qml/AttachmentPanel.qml (+6/-0)
src/qml/CMakeLists.txt (+1/-0)
src/qml/ComposeBar.qml (+59/-4)
src/qml/KeyboardRectangle.qml (+8/-0)
src/qml/Messages.qml (+3/-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 (+140/-0)
src/qml/assets/face-smile-big-symbolic-2.svg (+182/-0)
src/qml/assets/history.svg (+173/-0)
src/qml/assets/input-keyboard-symbolic.svg (+221/-0)
src/stickers-history-model.cpp (+307/-0)
src/stickers-history-model.h (+91/-0)
tests/qml/CMakeLists.txt (+7/-1)
tests/qml/tst_QmlTests.cpp (+29/-4)
tests/qml/tst_StickersHistoryModel.qml (+188/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

503. By Gustavo Pichorim Boiko on 2015-12-16

Merge parent

502. By Gustavo Pichorim Boiko on 2015-12-08

Merge latest changes from parent branch.

501. By Gustavo Pichorim Boiko on 2015-12-07

Merge parent

500. By Gustavo Pichorim Boiko on 2015-12-04

Only show the stickers button when there is a sticker pack around.

499. By Gustavo Pichorim Boiko on 2015-12-04

Fix sending stickers.

498. By Gustavo Pichorim Boiko on 2015-12-03

Merge parent

497. By Gustavo Pichorim Boiko on 2015-12-03

Fix the interaction between the attachments and stickers panels

496. By Gustavo Pichorim Boiko on 2015-12-03

Fix some interactions between the stickers panel and the OSK

495. By Gustavo Pichorim Boiko on 2015-12-01

Merge latest changes from parent branch.

494. By Gustavo Pichorim Boiko on 2015-12-01

Fix the panel interaction with the rest of the screen and implement
sending.