lp://staging/~mzanetti/reminders-app/conflict-handling

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/reminders-app at revision 393

Riccardo Padovani: Approve on 2015-03-31

Ubuntu Phone Apps Jenkins Bot: Approve (continuous-integration) on 2015-03-30

Alan Pope 🍺🐧🐱 🦄 (community): Approve on 2015-03-26

Diff: 1114 lines (+549/-50)

24 files modified

src/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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1431456: Conflict resolution

Medium

Fix Released

Link a bug report

Related blueprints

388. By Michael Zanetti on 2015-03-30

merge trunk

387. By Michael Zanetti on 2015-03-30

fix review issues

386. By Michael Zanetti on 2015-03-17

fix broken created date after conflict merge

385. By Michael Zanetti on 2015-03-15

make conflict resolving work properly in tablet ui

384. By Michael Zanetti on 2015-03-15

implement proper note conflict handling

383. By Michael Zanetti on 2015-03-12

merge prereq

382. By Launchpad Translations on behalf of reminders-app-dev on 2015-03-11

Launchpad automatic translations update.

381. By Launchpad Translations on behalf of reminders-app-dev on 2015-03-10

Launchpad automatic translations update.

380. By Michael Zanetti on 2015-03-09

Further improve the jobqueue by splitting it up into high, medium and low priority queues and optimizing the reply rate.

Approved by Ubuntu Phone Apps Jenkins Bot, Riccardo Padovani.

379. By Michael Zanetti on 2015-03-08

clean up debug prints.

Approved by Riccardo Padovani, Ubuntu Phone Apps Jenkins Bot.