Merge lp://staging/~renatofilho/qtorganizer5-eds/recurrence into lp://staging/~ubuntu-sdk-team/qtorganizer5-eds/trunk
Proposed by
Renato Araujo Oliveira Filho
| Status: | Merged |
|---|---|
| Approved by: | Gustavo Pichorim Boiko |
| Approved revision: | 25 |
| Merged at revision: | 12 |
| Proposed branch: | lp://staging/~renatofilho/qtorganizer5-eds/recurrence |
| Merge into: | lp://staging/~ubuntu-sdk-team/qtorganizer5-eds/trunk |
| Diff against target: |
2806 lines (+2033/-178) 17 files modified
qorganizer/CMakeLists.txt (+4/-1) qorganizer/qorganizer-eds-collection-engineid.cpp (+12/-0) qorganizer/qorganizer-eds-collection-engineid.h (+3/-0) qorganizer/qorganizer-eds-engine.cpp (+922/-151) qorganizer/qorganizer-eds-engine.h (+62/-17) qorganizer/qorganizer-eds-fetchrequestdata.cpp (+19/-3) qorganizer/qorganizer-eds-removecollectionrequestdata.cpp (+76/-0) qorganizer/qorganizer-eds-removecollectionrequestdata.h (+44/-0) qorganizer/qorganizer-eds-removerequestdata.cpp (+0/-3) qorganizer/qorganizer-eds-requestdata.cpp (+2/-2) qorganizer/qorganizer-eds-requestdata.h (+1/-1) qorganizer/qorganizer-eds-savecollectionrequestdata.cpp (+139/-0) qorganizer/qorganizer-eds-savecollectionrequestdata.h (+49/-0) tests/unittest/CMakeLists.txt (+5/-0) tests/unittest/collections-test.cpp (+191/-0) tests/unittest/event-test.cpp (+138/-0) tests/unittest/parseecal-test.cpp (+366/-0) |
| To merge this branch: | bzr merge lp://staging/~renatofilho/qtorganizer5-eds/recurrence |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Approve | |
| Gustavo Pichorim Boiko (community) | Approve | ||
|
Review via email:
|
|||
Commit message
- Implemented recurrence support;
- Implemented support for different collection type.
- Implemented Reminder support;
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:24
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://