Conflict resolution
Bug #1431456 reported by
Alan Pope 🍺🐧🐱 🦄
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Ubuntu Notes app |
Fix Released
|
Medium
|
Michael Zanetti | ||
Bug Description
When notes are edited in client and on the server, we don't currently resolve the conflicts that result. We should implement a conflict resolution system.
Related branches
lp://staging/~mzanetti/reminders-app/conflict-handling
- Riccardo Padovani: Approve
- Ubuntu Phone Apps Jenkins Bot: Approve (continuous-integration)
- Alan Pope 🍺🐧🐱 🦄 (community): Approve
-
Diff: 1114 lines (+549/-50)24 files modifiedsrc/app/qml/components/ConflictDelegate.qml (+74/-0)
src/app/qml/components/ListItemWithActions.qml (+2/-1)
src/app/qml/components/NotebooksDelegate.qml (+2/-0)
src/app/qml/components/NotesDelegate.qml (+18/-1)
src/app/qml/components/RemindersDelegate.qml (+2/-0)
src/app/qml/components/ResolveConflictConfirmationDialog.qml (+73/-0)
src/app/qml/components/TagsDelegate.qml (+2/-0)
src/app/qml/reminders.qml (+43/-8)
src/app/qml/ui/NoteConflictPage.qml (+40/-0)
src/app/qml/ui/NoteConflictView.qml (+104/-0)
src/app/qml/ui/NotePage.qml (+11/-13)
src/app/qml/ui/NotebooksPage.qml (+0/-1)
src/app/qml/ui/NotesPage.qml (+7/-7)
src/app/qml/ui/RemindersPage.qml (+0/-1)
src/app/qml/ui/SearchNotesPage.qml (+1/-1)
src/app/qml/ui/TagsPage.qml (+0/-1)
src/libqtevernote/jobs/fetchnotejob.cpp (+3/-2)
src/libqtevernote/jobs/fetchnotejob.h (+6/-5)
src/libqtevernote/jobs/savenotejob.cpp (+3/-0)
src/libqtevernote/note.cpp (+20/-2)
src/libqtevernote/note.h (+6/-0)
src/libqtevernote/notes.cpp (+1/-1)
src/libqtevernote/notesstore.cpp (+121/-5)
src/libqtevernote/notesstore.h (+10/-1)
| Changed in reminders-app: | |
| assignee: | nobody → Michael Zanetti (mzanetti) |
| Changed in reminders-app: | |
| milestone: | none → 2015-03-19 |
| status: | New → Confirmed |
| importance: | Undecided → Medium |
| Changed in reminders-app: | |
| status: | Confirmed → In Progress |
| Changed in reminders-app: | |
| milestone: | 2015-03-19 → 2015-03-26 |
Revision history for this message
| Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote | #1 |
| Changed in reminders-app: | |
| status: | In Progress → Fix Committed |
| Changed in reminders-app: | |
| status: | Fix Committed → Fix Released |
To post a comment you must log in.
Fix committed into lp:reminders-app at revision 393, scheduled for release in reminders-app, milestone 2014-11-27