lp://qastaging/~charlesk/indicator-datetime/lp-1387231-honor-x-canonical-disabled-tag

Branch merges

Propose for merging

1 branch dependent on this one.

Merged into lp://qastaging/indicator-datetime/rtm-14.09 at revision 387

Ted Gould (community): Approve on 2014-12-10

Diff: 373 lines (+65/-40)

14 files modified

debian/changelog (+7/-0)
include/datetime/appointment.h (+4/-1)
src/actions-live.cpp (+1/-1)
src/appointment.cpp (+3/-3)
src/engine-eds.cpp (+19/-3)
src/menu.cpp (+4/-4)
src/snap.cpp (+0/-6)
tests/manual (+15/-10)
tests/manual-test-snap.cpp (+1/-1)
tests/test-actions.cpp (+2/-2)
tests/test-alarm-queue.cpp (+2/-2)
tests/test-live-actions.cpp (+2/-2)
tests/test-menus.cpp (+4/-4)
tests/test-snap.cpp (+1/-1)

api

Merged into lp://qastaging/indicator-datetime/15.04 at revision 390

Ted Gould (community): Approve on 2014-12-08

PS Jenkins bot (community): Approve (continuous-integration) on 2014-12-08

Diff: 312 lines (+53/-30)

13 files modified

include/datetime/appointment.h (+4/-1)
src/actions-live.cpp (+1/-1)
src/appointment.cpp (+3/-3)
src/engine-eds.cpp (+19/-3)
src/menu.cpp (+4/-4)
src/snap.cpp (+0/-6)
tests/manual (+10/-0)
tests/manual-test-snap.cpp (+1/-1)
tests/test-actions.cpp (+2/-2)
tests/test-alarm-queue.cpp (+2/-2)
tests/test-live-actions.cpp (+2/-2)
tests/test-menus.cpp (+4/-4)
tests/test-snap.cpp (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1361702: clock-app alarms need to be handled differently from other VTODO events	High	Fix Released
Bug #1387231: [regression][clock] alarm still rings once it's been disabled or deleted	Critical	Fix Released

Link a bug report

Related blueprints

389. By Charles Kerr on 2014-12-08

ensure that disabled alarms aren't shown in indicator-datetime and that notifications aren't shown for them.

388. By PS Jenkins bot on 2014-11-03

Releasing 13.10.0+15.04.20141103-0ubuntu1

387. By Ted Gould on 2014-11-03

Small tag typo in integration test
Approved by: PS Jenkins bot

386. By PS Jenkins bot on 2014-10-09

Releasing 13.10.0+14.10.20141009-0ubuntu1

385. By Charles Kerr on 2014-10-09

Fix appointment comparison function to include the audio_url field in its test. Fixes: 1364949
Approved by: Antti Kaijanmäki

384. By PS Jenkins bot on 2014-10-07

Releasing 13.10.0+14.10.20141007-0ubuntu1

383. By Charles Kerr on 2014-10-07

Change title to read "Time & Date" Fixes: 1377286
Approved by: Ted Gould, PS Jenkins bot

382. By PS Jenkins bot on 2014-09-19

Releasing 13.10.0+14.10.20140919-0ubuntu1

381. By Charles Kerr on 2014-09-19

Make alarm notifications icons and button color match Design's specs. Fixes: 1370594
Approved by: Ted Gould, PS Jenkins bot, Nekhelesh Ramananthan

380. By Charles Kerr on 2014-09-19

Fix flint++ warnings
Approved by: Ted Gould, PS Jenkins bot