lp://staging/~phablet-team/history-service/thread_search_model

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp://staging/history-service

system-apps-ci-bot: Needs Fixing (continuous-integration) on 2017-01-26

PS Jenkins bot: Needs Fixing (continuous-integration) on 2016-03-01

Ubuntu Phablet Team: Pending requested 2016-02-19

Diff: 1280 lines (+645/-114)

21 files modified

Ubuntu/History/CMakeLists.txt (+1/-1)
Ubuntu/History/historygroupedthreadsmodel.cpp (+25/-8)
Ubuntu/History/historythreadmodel.cpp (+172/-16)
Ubuntu/History/historythreadmodel.h (+24/-0)
daemon/historydaemon.cpp (+37/-11)
daemon/historydaemon.h (+11/-0)
daemon/historyservicedbus.cpp (+0/-30)
daemon/historyservicedbus.h (+0/-8)
plugins/sqlite/sqlitehistoryplugin.cpp (+5/-5)
plugins/sqlite/sqlitehistoryplugin.h (+1/-1)
plugins/sqlite/sqlitehistorythreadview.cpp (+226/-4)
plugins/sqlite/sqlitehistorythreadview.h (+28/-1)
src/PluginThreadView.xml (+28/-0)
src/contactmatcher.cpp (+9/-1)
src/pluginthreadview.cpp (+19/-1)
src/pluginthreadview.h (+11/-2)
src/thread.cpp (+13/-4)
src/thread.h (+1/-0)
src/threadview.cpp (+25/-15)
src/threadview.h (+3/-3)
src/threadview_p.h (+6/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

244. By Gustavo Pichorim Boiko on 2017-01-26

Merge trunk

243. By Gustavo Pichorim Boiko on 2016-03-01

Handle thread removing and adding.

242. By Gustavo Pichorim Boiko on 2016-03-01

Fix the dbus connection of signals.

241. By Gustavo Pichorim Boiko on 2016-03-01

Implement the group updating.

240. By Gustavo Pichorim Boiko on 2016-03-01

Fix parsing grouped threads.

239. By Gustavo Pichorim Boiko on 2016-02-29

Fix ContactMatcher.

238. By Gustavo Pichorim Boiko on 2016-02-29

Start to add code to handle thread changes in the server side of the thread view.
Also fix the SqlitePluginTest.

237. By Gustavo Pichorim Boiko on 2016-02-26

Get the signals from the thread view itself and not from the manager as
it will have the threads already filtered.

236. By Gustavo Pichorim Boiko on 2016-02-26

Make it possible to handle thread changes in the server side view.

235. By Gustavo Pichorim Boiko on 2016-02-25

Emit the signals in the manager itself so that they can be used in the views.