lp:~boiko/messaging-app/more_attachment_types

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:messaging-app at revision 487

Tiago Salem Herrmann (community): Approve on 2015-11-30

PS Jenkins bot: Needs Fixing (continuous-integration) on 2015-11-26

Diff: 723 lines (+594/-27)

6 files modified

src/qml/AttachmentPanel.qml (+166/-0)
src/qml/ComposeBar.qml (+28/-18)
src/qml/ContentImport.qml (+17/-4)
src/qml/Messages.qml (+3/-5)
src/qml/assets/burn-after-read.svg (+191/-0)
src/qml/assets/stock_document.svg (+189/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

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

Merge parent branch.

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

Merge parent

457. By Gustavo Pichorim Boiko on 2015-12-02

Merge parent.

456. By Gustavo Pichorim Boiko on 2015-11-26

Re-add wrongly removed variable.

455. By Gustavo Pichorim Boiko on 2015-11-26

Add missing copyright header.

454. By Gustavo Pichorim Boiko on 2015-11-26

Merge latest changes from parent branch.

453. By Gustavo Pichorim Boiko on 2015-11-25

Fix import versions

452. By Gustavo Pichorim Boiko on 2015-11-25

Merge latest from parent.

451. By Gustavo Pichorim Boiko on 2015-11-24

More attachment fixes.

450. By Gustavo Pichorim Boiko on 2015-11-24

Add assets.