Merge lp://qastaging/~charlesk/indicator-datetime/lp-1320880-shorter-notifications-for-calendar-events into lp://qastaging/indicator-datetime/15.04
Status: | Merged |
---|---|
Approved by: | Charles Kerr |
Approved revision: | 390 |
Merged at revision: | 391 |
Proposed branch: | lp://qastaging/~charlesk/indicator-datetime/lp-1320880-shorter-notifications-for-calendar-events |
Merge into: | lp://qastaging/indicator-datetime/15.04 |
Prerequisite: | lp://qastaging/~charlesk/indicator-datetime/lp-1387231-honor-x-canonical-disabled-tag |
Diff against target: |
67 lines (+19/-4) 2 files modified
src/snap.cpp (+9/-4) tests/manual (+10/-0) |
To merge this branch: | bzr merge lp://qastaging/~charlesk/indicator-datetime/lp-1320880-shorter-notifications-for-calendar-events |
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ted Gould (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Review via email: mp+243939@code.qastaging.launchpad.net |
Commit message
Change notifications for calendar events s.t. the sound is nonrepeating and the notification is temporary, not requiring user interaction to disappear.
Description of the change
Description of the Change
=======
This branch culls the bugfix for bug #1320880 from my development branch so that it's easier to review and to backport in isolation.
It's a fairly simple patch: it changes notifications for calendar events s.t. the sound is nonrepeating and the notification is temporary, not requiring user interaction to disappear.
Checklist
=========
> Are there any related MPs required for this MP to build/function as expected? Please list.
This MP stacks on top of lp:~charlesk/indicator-datetime/lp-1387231-honor-x-canonical-disabled-tag
> Is your branch in sync with latest trunk? (e.g. bzr pull lp:trunk -> no changes)
Yes
> Did the code build without warnings?
Yes
> Did the tests run successfully?
Yes
> Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
> If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
> What device (or emulator) has your component test plan been executed successfully on?
Krillin running ubuntu-
> What manual tests are relevant for this MP?
indicator-
> Did you include a link to the MR Review Checklist Template to make your reviewer's life easier?
https:/
FAILED: Continuous integration, rev:390 jenkins. qa.ubuntu. com/job/ indicator- datetime- ci/287/ jenkins. qa.ubuntu. com/job/ indicator- datetime- vivid-amd64- ci/1/console jenkins. qa.ubuntu. com/job/ indicator- datetime- vivid-armhf- ci/1 jenkins. qa.ubuntu. com/job/ indicator- datetime- vivid-armhf- ci/1/artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/indicator- datetime- ci/287/ rebuild
http://