lp:~ken-vandine/content-hub/serialized_content_transfers

Branch merges

Merged into lp:content-hub at revision 200

Michael Sheldon (community): Approve on 2015-04-22

PS Jenkins bot: Approve (continuous-integration) on 2015-04-21

Diff: 565 lines (+189/-28)

21 files modified

examples/exporter/exampleexporter.cpp (+5/-1)
examples/importer/exampleimporter.cpp (+6/-3)
examples/importer/importer.cpp (+1/-0)
import/Ubuntu/Content/contentitem.cpp (+20/-0)
import/Ubuntu/Content/contentitem.h (+5/-0)
import/Ubuntu/Content/contenttype.cpp (+6/-0)
import/Ubuntu/Content/contenttype.h (+2/-1)
include/com/ubuntu/content/item.h (+11/-1)
include/com/ubuntu/content/type.h (+1/-0)
src/com/ubuntu/content/detail/transfer.cpp (+12/-9)
src/com/ubuntu/content/item.cpp (+56/-6)
src/com/ubuntu/content/service/com.ubuntu.content.hub.gschema.xml (+12/-0)
src/com/ubuntu/content/service/hook.cpp (+1/-1)
src/com/ubuntu/content/type.cpp (+6/-0)
tests/acceptance-tests/app_hub_communication_transfer.cpp (+4/-2)
tests/peers/exporter/autoexporter.cpp (+6/-0)
tests/peers/importer/autoimporter.cpp (+6/-0)
tests/peers/importer/content-hub-test-importer.json (+2/-1)
tests/peers/sharer/autosharer.cpp (+6/-0)
tests/peers/sharer/content-hub-test-sharer.json (+2/-1)
tests/qml-tests/tst_ContentHub.qml (+19/-2)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1430460: Apps should able to share plain-text content as well

Wishlist

Fix Released

Link a bug report

Related blueprints

205. By Ken VanDine on 2015-04-21

merged trunk

204. By Ken VanDine on 2015-04-21

Don't create a new Item to for the copied file, just change the url.

203. By Ken VanDine on 2015-04-21

ensure the ContentItem.text property gets set when copying/linking files

202. By Ken VanDine on 2015-04-21

Don't force streamType to x-url when the url is set, this lets a link shared include text as well.

201. By Ken VanDine on 2015-04-14

Added more debug output to the test peers

200. By Ken VanDine on 2015-04-03

Updated the importer and exporter examples to demonstrate serialized content in the transfer

199. By Ken VanDine on 2015-04-03

Don't try to copy files when they aren't needed

198. By Ken VanDine on 2015-04-03

* Changed the data property to stream of type QByteArray.
* Added streamType property to identify the mime-type of the content stored in the stream property.
* Added convienence getter/setter for text, which stores a string in stream and sets the streamType to "plain/text"

197. By Ken VanDine on 2015-04-02

merged text_data branch

196. By CI Train Bot Account on 2015-03-31

Releasing 0.0+15.04.20150331-0ubuntu1