Merge lp://staging/~renatofilho/qtorganizer5-eds/changes-notify into lp://staging/~ubuntu-sdk-team/qtorganizer5-eds/trunk
Proposed by
Renato Araujo Oliveira Filho
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Gustavo Pichorim Boiko | ||||
| Approved revision: | 20 | ||||
| Merged at revision: | 15 | ||||
| Proposed branch: | lp://staging/~renatofilho/qtorganizer5-eds/changes-notify | ||||
| Merge into: | lp://staging/~ubuntu-sdk-team/qtorganizer5-eds/trunk | ||||
| Diff against target: |
1229 lines (+583/-119) 14 files modified
qorganizer/CMakeLists.txt (+2/-0) qorganizer/qorganizer-eds-collection-engineid.cpp (+25/-19) qorganizer/qorganizer-eds-collection-engineid.h (+2/-2) qorganizer/qorganizer-eds-engine.cpp (+180/-47) qorganizer/qorganizer-eds-engine.h (+10/-3) qorganizer/qorganizer-eds-engineid.cpp (+21/-19) qorganizer/qorganizer-eds-engineid.h (+4/-4) qorganizer/qorganizer-eds-fetchrequestdata.cpp (+1/-0) qorganizer/qorganizer-eds-requestdata.cpp (+6/-2) qorganizer/qorganizer-eds-savecollectionrequestdata.cpp (+1/-1) qorganizer/qorganizer-eds-viewwatcher.cpp (+211/-0) qorganizer/qorganizer-eds-viewwatcher.h (+63/-0) tests/unittest/collections-test.cpp (+28/-19) tests/unittest/itemid-test.cpp (+29/-3) |
||||
| To merge this branch: | bzr merge lp://staging/~renatofilho/qtorganizer5-eds/changes-notify | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Approve | |
| Gustavo Pichorim Boiko (community) | Approve | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2013-09-25.
Commit message
*Fixed default source/collection load;
*Implemented changes notify.
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:
Approve
(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) 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:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) | # |
review:
Approve
(continuous-integration)
Revision history for this message
| Kunal Parmar (pkunal-parmar) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:13
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://