← Back to branch summary

~phablet-team/history-service/staging

~phablet-team/history-service/staging

Viewing all changes in revision 227.2.2.

Committer: Gustavo Pichorim Boiko
Date: 2017-03-21 14:16:46 UTC
mfrom: (254.8.11 no_participants_on_threads)
mto: This revision was merged to the branch mainline in revision 264.
Revision ID: gustavo.boiko@canonical.com-20170321141646-65bnsbt21qpi1a0x

Rebase this branch using the VOIP and IRC changes.

files added:
daemon/rolesinterface.cpp

daemon/rolesinterface.h

plugins/sqlite/schema/v13.sql

plugins/sqlite/schema/v14.sql

plugins/sqlite/schema/v15.sql

plugins/sqlite/schema/v16.sql

plugins/sqlite/schema/v17.sql

plugins/sqlite/schema/v18.sql

snap

snap/ubuntu-app-platform

snapcraft.yaml

files modified:
CMakeLists.txt

Ubuntu/History/historyeventmodel.cpp

Ubuntu/History/historyeventmodel.h

Ubuntu/History/historygroupedthreadsmodel.cpp

Ubuntu/History/historygroupedthreadsmodel.h

Ubuntu/History/historymodel.cpp

Ubuntu/History/historymodel.h

Ubuntu/History/historythreadmodel.cpp

Ubuntu/History/historythreadmodel.h

cmake/modules/GenerateTest.cmake

daemon/CMakeLists.txt

daemon/HistoryService.xml

daemon/callchannelobserver.cpp

daemon/callchannelobserver.h

daemon/historydaemon.cpp

daemon/historydaemon.h

daemon/historyservicedbus.cpp

daemon/historyservicedbus.h

daemon/main.cpp

daemon/pluginmanager.cpp

daemon/textchannelobserver.cpp

daemon/textchannelobserver.h

debian/changelog

debian/control

plugins/sqlite/sqlitedatabase.cpp

plugins/sqlite/sqlitedatabase.h

plugins/sqlite/sqlitehistoryeventview.cpp

plugins/sqlite/sqlitehistoryplugin.cpp

plugins/sqlite/sqlitehistoryplugin.h

plugins/sqlite/sqlitehistorythreadview.cpp

src/channelobserver.cpp

src/contactmatcher.cpp

src/contactmatcher_p.h

src/eventview.cpp

src/eventview.h

src/manager.cpp

src/manager.h

src/managerdbus.cpp

src/managerdbus_p.h

src/participant.cpp

src/participant.h

src/participant_p.h

src/plugin.h

src/plugineventview.cpp

src/pluginthreadview.cpp

src/textevent.cpp

src/textevent.h

src/textevent_p.h

src/thread.cpp

src/thread.h

src/thread_p.h

src/threadview.cpp

src/threadview.h

src/threadview_p.h

src/types.h

src/utils.cpp

src/utils_p.h

tests/Ubuntu.History/HistoryEventModelTest.cpp

tests/Ubuntu.History/HistoryGroupedThreadsModelTest.cpp

tests/common/mock/CMakeLists.txt

tests/common/mock/callchannel.cpp

tests/common/mock/mockconnectiondbus.cpp

tests/common/mock/textchannel.cpp

tests/common/mock/textchannel.h

tests/daemon/DaemonTest.cpp

tests/libhistoryservice/ManagerTest.cpp

tests/libhistoryservice/ParticipantTest.cpp

tests/libhistoryservice/TextEventTest.cpp

tests/libhistoryservice/ThreadTest.cpp

tests/plugins/sqlite/SqliteEventViewTest.cpp

tests/plugins/sqlite/SqlitePluginTest.cpp

Show diffs side-by-side

added added

removed removed

Ubuntu/History/historyeventmodel.cpp

Ubuntu/History/historyeventmodel.h

Ubuntu/History/historygroupedthreadsmodel.cpp

Ubuntu/History/historygroupedthreadsmodel.h

Ubuntu/History/historymodel.cpp

Ubuntu/History/historymodel.h

Ubuntu/History/historythreadmodel.cpp

Ubuntu/History/historythreadmodel.h

cmake/modules/GenerateTest.cmake

daemon/CMakeLists.txt

daemon/HistoryService.xml

daemon/callchannelobserver.cpp

daemon/callchannelobserver.h

daemon/historydaemon.cpp

daemon/historydaemon.h

daemon/historyservicedbus.cpp

daemon/historyservicedbus.h

daemon/main.cpp

daemon/pluginmanager.cpp

daemon/rolesinterface.cpp

daemon/rolesinterface.h

daemon/textchannelobserver.cpp

daemon/textchannelobserver.h

debian/changelog

plugins/sqlite/schema/v13.sql

plugins/sqlite/schema/v14.sql

plugins/sqlite/schema/v15.sql

plugins/sqlite/schema/v16.sql

plugins/sqlite/schema/v17.sql

plugins/sqlite/schema/v18.sql

plugins/sqlite/sqlitedatabase.cpp

plugins/sqlite/sqlitedatabase.h

plugins/sqlite/sqlitehistoryeventview.cpp

plugins/sqlite/sqlitehistoryplugin.cpp

plugins/sqlite/sqlitehistoryplugin.h

plugins/sqlite/sqlitehistorythreadview.cpp

snap/ubuntu-app-platform/

src/channelobserver.cpp

src/contactmatcher.cpp

src/contactmatcher_p.h

src/eventview.cpp

src/eventview.h

src/manager.cpp

src/managerdbus.cpp

src/managerdbus_p.h

src/participant.cpp

src/participant.h

src/participant_p.h

src/plugineventview.cpp

src/pluginthreadview.cpp

src/textevent.cpp

src/textevent.h

src/textevent_p.h

src/threadview.cpp

src/threadview.h

src/threadview_p.h

tests/Ubuntu.History/HistoryEventModelTest.cpp

tests/Ubuntu.History/HistoryGroupedThreadsModelTest.cpp

tests/common/mock/CMakeLists.txt

tests/common/mock/callchannel.cpp

tests/common/mock/mockconnectiondbus.cpp

tests/common/mock/textchannel.cpp

tests/common/mock/textchannel.h

tests/daemon/DaemonTest.cpp

tests/libhistoryservice/ManagerTest.cpp

tests/libhistoryservice/ParticipantTest.cpp

tests/libhistoryservice/TextEventTest.cpp

tests/libhistoryservice/ThreadTest.cpp

tests/plugins/sqlite/SqliteEventViewTest.cpp

tests/plugins/sqlite/SqlitePluginTest.cpp

Older »