Merge lp://staging/~boiko/history-service/modify_events into lp://staging/history-service
Proposed by
Gustavo Pichorim Boiko
Status: | Merged |
---|---|
Approved by: | Tiago Salem Herrmann |
Approved revision: | 100 |
Merged at revision: | 98 |
Proposed branch: | lp://staging/~boiko/history-service/modify_events |
Merge into: | lp://staging/history-service |
Diff against target: |
509 lines (+196/-32) 13 files modified
Ubuntu/History/historyeventmodel.cpp (+56/-6) Ubuntu/History/historyeventmodel.h (+6/-0) daemon/historydaemon.cpp (+21/-6) plugins/sqlite/sqlitehistoryplugin.cpp (+58/-15) plugins/sqlite/sqlitehistoryplugin.h (+2/-2) plugins/sqlite/sqlitehistorythreadview.cpp (+1/-1) src/event.cpp (+12/-0) src/event.h (+1/-0) src/plugin.h (+2/-2) src/tests/TextEventTest.cpp (+16/-0) src/textevent.cpp (+12/-0) src/textevent.h (+2/-0) src/types.h (+7/-0) |
To merge this branch: | bzr merge lp://staging/~boiko/history-service/modify_events |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tiago Salem Herrmann (community) | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email: mp+186644@code.staging.launchpad.net |
Commit message
Make it possible to modify events.
Description of the change
Make it possible to modify events.
To post a comment you must log in.
FAILED: Continuous integration, rev:97 jenkins. qa.ubuntu. com/job/ history- service- ci/60/ jenkins. qa.ubuntu. com/job/ history- service- saucy-amd64- ci/60 jenkins. qa.ubuntu. com/job/ history- service- saucy-armhf- ci/61/console jenkins. qa.ubuntu. com/job/ history- service- saucy-i386- ci/60
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ history- service- ci/60/rebuild
http://