Merge lp://staging/~mzanetti/reminders-app/add-reminders into lp://staging/reminders-app
Proposed by
Michael Zanetti
Status: | Merged |
---|---|
Approved by: | Michael Zanetti |
Approved revision: | 19 |
Merged at revision: | 17 |
Proposed branch: | lp://staging/~mzanetti/reminders-app/add-reminders |
Merge into: | lp://staging/reminders-app |
Prerequisite: | lp://staging/~mzanetti/reminders-app/get-username |
Diff against target: |
952 lines (+375/-195) 13 files modified
src/app/qml/ui/NotesPage.qml (+2/-3) src/app/qml/ui/RemindersPage.qml (+9/-10) src/plugin/Evernote/jobs/evernotejob.cpp (+1/-1) src/plugin/Evernote/jobs/fetchnotesjob.cpp (+13/-3) src/plugin/Evernote/jobs/savenotejob.cpp (+22/-13) src/plugin/Evernote/jobs/savenotejob.h (+2/-6) src/plugin/Evernote/note.cpp (+90/-10) src/plugin/Evernote/note.h (+44/-4) src/plugin/Evernote/notebooks.cpp (+0/-1) src/plugin/Evernote/notes.cpp (+38/-80) src/plugin/Evernote/notes.h (+11/-24) src/plugin/Evernote/notesstore.cpp (+116/-31) src/plugin/Evernote/notesstore.h (+27/-9) |
To merge this branch: | bzr merge lp://staging/~mzanetti/reminders-app/add-reminders |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
Jordan Keyes | Approve | ||
Review via email: mp+197261@code.staging.launchpad.net |
Commit message
Add support for reminders
Description of the change
This adds support for reminders.
Also moves the QAbstractListModel logic into notesstore, so that Notes is just a stupid QSortFilterProx
To post a comment you must log in.
PASSED: Continuous integration, rev:16 91.189. 93.70:8080/ job/reminders- app-ci/ 31/ 91.189. 93.70:8080/ job/generic- mediumtests- trusty/ 317 91.189. 93.70:8080/ job/reminders- app-saucy- amd64-ci/ 31 91.189. 93.70:8080/ job/reminders- app-trusty- amd64-ci/ 31
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: 91.189. 93.70:8080/ job/reminders- app-ci/ 31/rebuild
http://