lp:~charlesk/indicator-datetime/alarms

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:indicator-datetime/14.04 at revision 305

Ted Gould (community): Approve on 2014-02-06

PS Jenkins bot (community): Approve (continuous-integration) on 2014-02-06

Diff: 1743 lines (+1011/-204)

25 files modified

CMakeLists.txt (+2/-2)
debian/control (+1/-1)
include/datetime/clock-watcher.h (+72/-0)
include/datetime/date-time.h (+3/-0)
include/datetime/planner-eds.h (+3/-2)
include/datetime/snap.h (+51/-0)
include/datetime/timezone-file.h (+2/-2)
po/POTFILES.in (+2/-0)
src/CMakeLists.txt (+2/-0)
src/actions-live.cpp (+1/-1)
src/clock-watcher.cpp (+71/-0)
src/date-time.cpp (+18/-0)
src/main.cpp (+22/-9)
src/menu.cpp (+37/-66)
src/planner-eds.cpp (+216/-105)
src/snap.cpp (+256/-0)
src/timezone-file.cpp (+4/-4)
tests/CMakeLists.txt (+5/-0)
tests/geoclue-fixture.h (+1/-1)
tests/manual-test-snap.cpp (+63/-0)
tests/test-clock-watcher.cpp (+166/-0)
tests/test-clock.cpp (+2/-2)
tests/test-planner.cpp (+8/-6)
tests/test-settings.cpp (+2/-2)
tests/test-utils.cpp (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1233176: Alarm notifications do not appear when an alarm is triggered	High	Fix Released
Bug #1237752: alarm / appointment times aren't displayed on touch	High	Fix Released
Bug #1255716: Running the "click" command on the desktop greeter seems wrong	High	Fix Released

Link a bug report

Related blueprints

406. By Charles Kerr on 2014-02-19

sync with trunk

405. By Charles Kerr on 2014-02-06

another pass at removing alarms from the menu once they're no longer upcoming. This version fixes the header's icon as well.

404. By Charles Kerr on 2014-02-05

when playing a sound in canberra, don't use CA_PROP_EVENT_ID if caching failed

403. By Charles Kerr on 2014-02-05

remove upcoming events from the menu once they're no longer upcoming.

402. By Charles Kerr on 2014-02-05

revert r400; we can't block alarms by UID because that would hide recurring alarms

401. By Charles Kerr on 2014-02-05

if an alarm doesn't have a URL associated with it, use 'appid://com.ubuntu.clock/clock/current-user-version' as a fallback url.

400. By Charles Kerr on 2014-02-05

remove alarms from the menu once they've been shown in a snap decision.

399. By Charles Kerr on 2014-02-05

add utils.c to POTFILES.in

398. By Charles Kerr on 2014-02-05

copyediting: make the Snap lambdas a little easier to read.

397. By Charles Kerr on 2014-02-05

bugfix: when closing the snap decision, ensure there's not a timeout waiting to loop the ringtone