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

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/history-service/staging at revision 264

Tiago Salem Herrmann (community): Approve on 2017-03-22

PS Jenkins bot: Pending (continuous-integration) requested 2017-03-21

system-apps-ci-bot: Pending (continuous-integration) requested 2017-03-21

Diff: 43 lines (+15/-0)

2 files modified

CMakeLists.txt (+5/-0)
plugins/sqlite/sqlitedatabase.cpp (+10/-0)

api

Superseded for merging into lp://staging/history-service

system-apps-ci-bot: Approve (continuous-integration) on 2017-03-21

PS Jenkins bot: Pending (continuous-integration) requested 2016-06-17

Ubuntu Phablet Team: Pending requested 2016-06-17

Diff: 3373 lines (+1280/-447)

49 files modified

CMakeLists.txt (+5/-0)
Ubuntu/History/historyeventmodel.cpp (+39/-42)
Ubuntu/History/historyeventmodel.h (+2/-5)
Ubuntu/History/historygroupedthreadsmodel.cpp (+54/-2)
Ubuntu/History/historygroupedthreadsmodel.h (+5/-0)
Ubuntu/History/historymodel.cpp (+108/-10)
Ubuntu/History/historymodel.h (+11/-0)
Ubuntu/History/historythreadmodel.cpp (+48/-9)
Ubuntu/History/historythreadmodel.h (+2/-0)
cmake/modules/GenerateTest.cmake (+1/-0)
daemon/HistoryService.xml (+29/-0)
daemon/callchannelobserver.cpp (+16/-2)
daemon/callchannelobserver.h (+2/-1)
daemon/historydaemon.cpp (+323/-186)
daemon/historydaemon.h (+21/-10)
daemon/historyservicedbus.cpp (+111/-8)
daemon/historyservicedbus.h (+25/-0)
daemon/main.cpp (+15/-5)
daemon/textchannelobserver.cpp (+1/-14)
daemon/textchannelobserver.h (+1/-2)
plugins/sqlite/schema/v18.sql (+14/-0)
plugins/sqlite/sqlitedatabase.cpp (+10/-0)
plugins/sqlite/sqlitehistoryeventview.cpp (+8/-1)
plugins/sqlite/sqlitehistoryplugin.cpp (+136/-53)
plugins/sqlite/sqlitehistoryplugin.h (+6/-1)
plugins/sqlite/sqlitehistorythreadview.cpp (+8/-1)
src/contactmatcher.cpp (+57/-22)
src/contactmatcher_p.h (+2/-0)
src/eventview.cpp (+6/-2)
src/eventview.h (+3/-1)
src/manager.cpp (+24/-0)
src/manager.h (+4/-1)
src/managerdbus.cpp (+55/-10)
src/managerdbus_p.h (+10/-2)
src/participant.cpp (+9/-0)
src/participant.h (+1/-0)
src/plugin.h (+6/-0)
src/thread.cpp (+16/-0)
src/thread.h (+2/-0)
src/threadview.cpp (+15/-0)
src/threadview.h (+8/-0)
src/threadview_p.h (+4/-0)
src/utils.cpp (+16/-1)
src/utils_p.h (+2/-0)
tests/Ubuntu.History/HistoryEventModelTest.cpp (+1/-1)
tests/daemon/DaemonTest.cpp (+0/-8)
tests/libhistoryservice/ManagerTest.cpp (+16/-43)
tests/plugins/sqlite/SqliteEventViewTest.cpp (+22/-2)
tests/plugins/sqlite/SqlitePluginTest.cpp (+0/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

229. By Gustavo Pichorim Boiko on 2017-03-21

Rebase this branch using the VOIP and IRC changes.

228. By Gustavo Pichorim Boiko on 2016-06-17

Add option sqlite command tracing

227. By CI Train Bot Account on 2016-04-25

Releasing 0.1+16.04.20160425-0ubuntu1

226. By Gustavo Pichorim Boiko on 2016-04-25

Make sure Telepathy types are always initialized. Fixes: #1563050
Approved by: PS Jenkins bot

225. By CI Train Bot Account on 2016-01-04

Releasing 0.1+16.04.20160104-0ubuntu1

224. By Tiago Salem Herrmann on 2016-01-04

Do proper dbus demarshalling of detailProperties. Fixes: #1510655

223. By CI Train Bot Account on 2015-12-07

Releasing 0.1+16.04.20151207-0ubuntu1

222. By Tiago Salem Herrmann on 2015-12-07

Fix build with new qt on xenial-proposed.

221. By Tiago Salem Herrmann on 2015-12-07

Mark messages as read on onMessageRead(). Fixes: #1373059
Approved by: Gustavo Pichorim Boiko

220. By Tiago Salem Herrmann on 2015-12-07

Allow removing empty threads Fixes: #1517602
Approved by: PS Jenkins bot, Gustavo Pichorim Boiko