Merge lp://qastaging/~charlesk/indicator-datetime/merge-vivid-fixes-and-tests-into-wily into lp://qastaging/indicator-datetime/15.10
Proposed by
Charles Kerr
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Ted Gould | ||||||||
| Approved revision: | 413 | ||||||||
| Merged at revision: | 412 | ||||||||
| Proposed branch: | lp://qastaging/~charlesk/indicator-datetime/merge-vivid-fixes-and-tests-into-wily | ||||||||
| Merge into: | lp://qastaging/indicator-datetime/15.10 | ||||||||
| Diff against target: |
1611 lines (+1133/-268) 16 files modified
src/engine-eds.cpp (+486/-186) tests/CMakeLists.txt (+16/-13) tests/print-to.h (+34/-1) tests/run-eds-ics-test.sh (+10/-0) tests/test-eds-ics-all-day-events.cpp (+91/-0) tests/test-eds-ics-all-day-events.ics (+19/-0) tests/test-eds-ics-config-files/.config/evolution/sources/system-proxy.source (+21/-0) tests/test-eds-ics-missing-trigger.cpp (+116/-0) tests/test-eds-ics-missing-trigger.ics (+45/-0) tests/test-eds-ics-nonrepeating-events.cpp (+93/-0) tests/test-eds-ics-nonrepeating-events.ics (+27/-0) tests/test-eds-ics-repeating-events.cpp (+100/-0) tests/test-eds-ics-repeating-events.ics (+28/-0) tests/test-eds-ics-repeating-valarms.ics (+47/-0) tests/test-eds-valarms-config-files/.config/evolution/sources/system-proxy.source (+0/-21) tests/test-eds-valarms-config-files/.local/share/evolution/calendar/system/calendar.ics (+0/-47) |
||||||||
| To merge this branch: | bzr merge lp://qastaging/~charlesk/indicator-datetime/merge-vivid-fixes-and-tests-into-wily | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Ted Gould (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Fix bugs relating to timezones and triggers from clock-app alarms.
Description of the change
As the branch name suggests, this brings the recent 15.04 bugfixes and test improvements to the 15.10 branch.
* Fixes https:/
* Fixes https:/
* Adds improved EDS testing
To post a comment you must log in.
Revision history for this message
| Ted Gould (ted) | # |
review:
Approve
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
PASSED: Continuous integration, rev:413
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://