lp:~charlesk/indicator-datetime/lp-1354400-add-snooze

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:indicator-datetime/13.10 at revision 370

Jussi Pakkanen (community): Approve on 2014-09-03

PS Jenkins bot (community): Approve (continuous-integration) on 2014-09-03

Diff: 849 lines (+476/-39)

21 files modified

data/com.canonical.indicator.datetime.AlarmProperties.xml (+8/-0)
data/com.canonical.indicator.datetime.gschema.xml.in (+8/-0)
include/datetime/planner-aggregate.h (+52/-0)
include/datetime/planner-snooze.h (+56/-0)
include/datetime/planner.h (+3/-2)
include/datetime/settings-live.h (+1/-0)
include/datetime/settings-shared.h (+1/-0)
include/datetime/settings.h (+1/-0)
include/datetime/snap.h (+2/-2)
src/CMakeLists.txt (+3/-0)
src/exporter.cpp (+1/-0)
src/main.cpp (+16/-16)
src/planner-aggregate.cpp (+106/-0)
src/planner-snooze.cpp (+115/-0)
src/planner.cpp (+54/-0)
src/settings-live.cpp (+12/-0)
src/snap.cpp (+11/-13)
tests/manual (+10/-0)
tests/manual-test-snap.cpp (+5/-5)
tests/test-exporter.cpp (+10/-1)
tests/test-settings.cpp (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1354400: Implement Alarm Snooze functionality

Critical

Fix Released

Link a bug report

Related blueprints

377. By Charles Kerr on 2014-09-03

minor copyediting: rename a variable for better clarity

376. By Charles Kerr on 2014-09-03

remove the new code that we're not using yet

375. By Charles Kerr on 2014-09-03

use the 'override' keyword in the new planner class declarations

374. By Charles Kerr on 2014-09-03

update manual-test-snap's diagnostic text to reflect snooze/ok buttons

373. By Charles Kerr on 2014-09-03

reverse OK/snooze button order

372. By Charles Kerr on 2014-09-03

add manual test for snooze

371. By Charles Kerr on 2014-09-02

update Snap Decisions to include snooze

370. By Charles Kerr on 2014-09-02

add planner.cpp to the build

369. By Charles Kerr on 2014-09-02

add snooze properties to our schema; export it on the bus; add tests

368. By Charles Kerr on 2014-09-02

add SnoozePlanner, AggregatePlanner