Merge lp://qastaging/~charlesk/indicator-datetime/lp-1302004-fix-event-list-culling-and-sorting into lp://qastaging/indicator-datetime/15.10

Proposed by Charles Kerr
Status: Merged
Approved by: Renato Araujo Oliveira Filho
Approved revision: 436
Merged at revision: 445
Proposed branch: lp://qastaging/~charlesk/indicator-datetime/lp-1302004-fix-event-list-culling-and-sorting
Merge into: lp://qastaging/indicator-datetime/15.10
Diff against target: 512 lines (+383/-17)
7 files modified
include/datetime/date-time.h (+2/-0)
include/datetime/menu.h (+6/-0)
src/date-time.cpp (+10/-0)
src/menu.cpp (+91/-17)
tests/CMakeLists.txt (+1/-0)
tests/print-to.h (+10/-0)
tests/test-menu-appointments.cpp (+263/-0)
To merge this branch: bzr merge lp://qastaging/~charlesk/indicator-datetime/lp-1302004-fix-event-list-culling-and-sorting
Reviewer Review Type Date Requested Status
Renato Araujo Oliveira Filho (community) Approve
Review via email: mp+289517@code.qastaging.launchpad.net

Commit message

Bring the code up-to-date with the spec wrt which calendar events are shown in the menu, and in what order.

Description of the change

Bring the code up-to-date with the spec wrt which calendar events are shown in the menu, and in what order. Add unit tests to cover event selection and display order.

https://wiki.ubuntu.com/TimeAndDate#Calendar_events

To post a comment you must log in.
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

code looks good.

review: Approve
437. By Charles Kerr

sync with trunk

438. By Charles Kerr

fix r437 merge error

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches