Merge lp://staging/~phablet-team/history-service/include-sender-in-info-events into lp://staging/history-service/staging
Proposed by
Tiago Salem Herrmann
Status: | Merged |
---|---|
Approved by: | Gustavo Pichorim Boiko |
Approved revision: | 303 |
Merged at revision: | 237 |
Proposed branch: | lp://staging/~phablet-team/history-service/include-sender-in-info-events |
Merge into: | lp://staging/history-service/staging |
Prerequisite: | lp://staging/~phablet-team/history-service/group-invitation-info-event |
Diff against target: |
95 lines (+18/-14) 4 files modified
Ubuntu/History/historyeventmodel.cpp (+11/-0) Ubuntu/History/historyeventmodel.h (+1/-0) daemon/historydaemon.cpp (+5/-13) daemon/historydaemon.h (+1/-1) |
To merge this branch: | bzr merge lp://staging/~phablet-team/history-service/include-sender-in-info-events |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gustavo Pichorim Boiko (community) | Approve | ||
Tiago Salem Herrmann | Pending | ||
system-apps-ci-bot | continuous-integration | Pending | |
Review via email: mp+308432@code.staging.launchpad.net |
This proposal supersedes a proposal from 2016-09-16.
Commit message
- added sender as parameter for info events just in case event needs two actors (source and destination of the action)
- added subjectAsAlias event model role to translate contact id<->alias before showing, to avoid having id some milliseconds before showing the alias
Description of the change
- added sender as parameter for info events just in case event needs two actors (source and destination of the action)
- added subjectAsAlias event model role to translate contact id<->alias before showing, to avoid having id some milliseconds before showing the alias
To post a comment you must log in.
FAILED: Continuous integration, rev:301 /jenkins. canonical. com/system- apps/job/ lp-history- service- ci/18/ /jenkins. canonical. com/system- apps/job/ build/1530/ console /jenkins. canonical. com/system- apps/job/ build-0- fetch/1530 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 1378 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 1378/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1378 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1378/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= yakkety/ 1378 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= yakkety/ 1378/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 1378 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 1378/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 1378 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 1378/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= yakkety/ 1378 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= yakkety/ 1378/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 1378 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 1378/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 1378/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= yakkety/ 1378 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= yakkety/ 1378/artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /jenkins. canonical. com/system- apps/job/ lp-history- service- ci/18/rebuild
https:/