history-service

Merge lp://staging/~phablet-team/history-service/improve_information_events into lp://staging/history-service

  1. improve_information_events
  2. Merge into trunk
Proposed by Tiago Salem Herrmann
Status: Superseded
Proposed branch: lp://staging/~phablet-team/history-service/improve_information_events
Merge into: lp://staging/history-service
Prerequisite: lp://staging/~phablet-team/history-service/notify-group-changes-in-conversation
Diff against target: 648 lines (+127/-50)
14 files modified
Ubuntu/History/historyeventmodel.cpp (+6/-0)
Ubuntu/History/historyeventmodel.h (+1/-0)
Ubuntu/History/historymodel.h (+20/-0)
daemon/historydaemon.cpp (+19/-19)
daemon/historydaemon.h (+1/-1)
plugins/sqlite/schema/v17.sql (+2/-0)
plugins/sqlite/sqlitehistoryplugin.cpp (+11/-6)
src/textevent.cpp (+13/-3)
src/textevent.h (+2/-0)
src/textevent_p.h (+2/-0)
src/types.h (+19/-0)
tests/Ubuntu.History/HistoryEventModelTest.cpp (+1/-0)
tests/libhistoryservice/TextEventTest.cpp (+26/-17)
tests/plugins/sqlite/SqlitePluginTest.cpp (+4/-4)
To merge this branch: bzr merge lp://staging/~phablet-team/history-service/improve_information_events
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing
Roberto Mier Escandon (community) Approve
Review via email: mp+305390@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2016-10-13.

Commit message

Improve information events handling.
Now all strings have to be translated on the app side.

Description of the change

Improve information events handling.
Now all strings have to be translated on the app side.

To post a comment you must log in.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:231
https://jenkins.canonical.com/system-apps/job/lp-history-service-ci/13/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1474/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1474
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1322
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1322/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1322/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1322/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1322
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1322/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1322/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1322/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1322
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1322/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1322/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1322/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-history-service-ci/13/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Roberto Mier Escandon (rmescandon) wrote :

LGTM

review: Approve
lp://staging/~phablet-team/history-service/improve_information_events updated
232. By Roberto Mier Escandon

differenciate self leaving from self kicked

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:232
https://jenkins.canonical.com/system-apps/job/lp-history-service-ci/15/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1493/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1493
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1341/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1341/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1341/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1341/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1341
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1341/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1341/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1341/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1341/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1341/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-history-service-ci/15/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~phablet-team/history-service/improve_information_events updated
233. By Tiago Salem Herrmann

merge parent branch

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:233
https://jenkins.canonical.com/system-apps/job/lp-history-service-ci/26/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1773/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1773
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1618
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1618/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1618
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1618/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1618
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1618/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1618
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1618/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1618
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1618/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1618
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1618/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1618
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1618/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1618/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1618
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1618/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-history-service-ci/26/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~phablet-team/history-service/improve_information_events updated
234. By Gustavo Pichorim Boiko

Remove obsolete comments

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: