Merge lp://qastaging/~renatofilho/indicator-datetime/notify-missing-alarm into lp://qastaging/indicator-datetime/15.10
Proposed by
Renato Araujo Oliveira Filho
Status: | Merged |
---|---|
Approved by: | Charles Kerr |
Approved revision: | 472 |
Merged at revision: | 448 |
Proposed branch: | lp://qastaging/~renatofilho/indicator-datetime/notify-missing-alarm |
Merge into: | lp://qastaging/indicator-datetime/15.10 |
Prerequisite: | lp://qastaging/~renatofilho/indicator-datetime/fix-1533681 |
Diff against target: |
1157 lines (+401/-218) 19 files modified
CMakeLists.txt (+4/-1) data/CMakeLists.txt (+1/-1) data/indicator-datetime.desktop.in (+1/-0) debian/control (+4/-0) include/datetime/actions-live.h (+13/-10) include/datetime/actions.h (+4/-8) include/notifications/haptic.h (+1/-1) include/notifications/notifications.h (+8/-1) src/actions-live.cpp (+71/-63) src/actions.cpp (+34/-58) src/haptic.cpp (+15/-9) src/main.cpp (+3/-1) src/notifications.cpp (+169/-5) src/snap.cpp (+14/-3) tests/actions-mock.h (+18/-38) tests/test-actions.cpp (+8/-8) tests/test-live-actions.cpp (+31/-9) tests/test-notification.cpp (+1/-1) tests/test-sound.cpp (+1/-1) |
To merge this branch: | bzr merge lp://qastaging/~renatofilho/indicator-datetime/notify-missing-alarm |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Charles Kerr (community) | Approve | ||
Review via email:
|
This proposal supersedes a proposal from 2016-04-19.
Commit message
Post message on messaging menu if the notification get timeout.
Description of the change
QA: Jenkins is failing because it is missing the new version of libubuntu-
To post a comment you must log in.
PASSED: Continuous integration, rev:462 jenkins. qa.ubuntu. com/job/ indicator- datetime- ci/374/ jenkins. qa.ubuntu. com/job/ indicator- datetime- wily-amd64- ci/64 jenkins. qa.ubuntu. com/job/ indicator- datetime- wily-armhf- ci/64 jenkins. qa.ubuntu. com/job/ indicator- datetime- wily-armhf- ci/64/artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/indicator- datetime- ci/374/ rebuild
http://