Code

Add note history (back/forward)#2819

Code

Merged

laurent22 merged 45 commits intolaurent22:masterlaurent22/joplin:masterfrom naviji:history-testCopy head branch name to clipboardMay 15, 2020

+907-60

Commits

Commits on Mar 23, 2020

• Add test for search in feature_NoteHistory

  naviji

  committed
  0d10505

  Copy full SHA for 0d10505

• Rename historyAction

  naviji

  committed
  5ea0f9d

  Copy full SHA for 5ea0f9d

• Add history limit of 200

  naviji

  committed
  1c5bc1f

  Copy full SHA for 1c5bc1f

• Save history on keydown

  naviji

  committed
  ad16d13

  Copy full SHA for ad16d13

• Remove duplicates in history due to deletion

  naviji

  committed
  7dcd255

  Copy full SHA for 7dcd255

• Add test for adjacent duplicate deletion

  naviji

  committed
  eceaebc

  Copy full SHA for eceaebc

• Fix showAllNotes tests

  naviji

  committed
  1856638

  Copy full SHA for 1856638

• Add package-lock.json files

  naviji

  committed
  b77e762

  Copy full SHA for b77e762

Commits on Mar 25, 2020

• Clean up

  naviji

  committed
  9191be6

  Copy full SHA for 9191be6

• Rename lastSeenNote to currentNote

  naviji

  committed
  4504358

  Copy full SHA for 4504358

• Update goBackWard, goForward functions

  naviji

  committed
  626d966

  Copy full SHA for 626d966

Commits on Mar 30, 2020

• Change expect of tests

  naviji

  committed
  fbce314

  Copy full SHA for fbce314

• Merge branch 'master' of https://github.com/laurent22/joplin into history-test

  naviji

  committed
  b4f5c3d

  Copy full SHA for b4f5c3d

• Fix history corruption

  naviji

  committed
  90b7bf9

  Copy full SHA for 90b7bf9

• Fix problems when moving

  naviji

  committed
  57a1494

  Copy full SHA for 57a1494

• Put everything in one place

  naviji

  committed
  0ca975b

  Copy full SHA for 0ca975b

Commits on Apr 1, 2020

• New actions HISTORY_BACKWARD and HISTORY_FORWARD

  naviji

  committed
  22e02c1

  Copy full SHA for 22e02c1

• Preserve context

  naviji

  committed
  a145df5

  Copy full SHA for a145df5

• Fix note move bug

  naviji

  committed
  55710cd

  Copy full SHA for 55710cd

• Remove redundant historyAction

  naviji

  committed
  27cfa06

  Copy full SHA for 27cfa06

• Clean up

  naviji

  committed
  87c0de8

  Copy full SHA for 87c0de8

Commits on Apr 11, 2020

• Fix bug in adjacent deletion

  naviji

  committed
  8e5d5cf

  Copy full SHA for 8e5d5cf

• Add tests for moving over create, deleted and allnotes

  naviji

  committed
  dd7ee13

  Copy full SHA for dd7ee13

• Clean up

  naviji

  committed
  e3cb65a

  Copy full SHA for e3cb65a

• Merge from upstream master

  naviji

  committed
  2f4655a

  Copy full SHA for 2f4655a

• Fix bug in goto

  naviji

  committed
  ed7fc8b

  Copy full SHA for ed7fc8b

Commits on Apr 12, 2020

• Conflict partial

  naviji

  committed
  08f30f0

  Copy full SHA for 08f30f0

Commits on Apr 14, 2020

• Fix bug when moving selected note

  naviji

  committed
  9b4fcaa

  Copy full SHA for 9b4fcaa

• Failing conflict note test

  naviji

  committed
  a6a5a8f

  Copy full SHA for a6a5a8f

Commits on Apr 15, 2020

• Merge branch 'master' of https://github.com/laurent22/joplin into history-test

  naviji

  committed
  1db2c2b

  Copy full SHA for 1db2c2b

Commits on Apr 17, 2020

• Merge branch 'master' of https://github.com/laurent22/joplin into history-test

  naviji

  committed
  ccefd77

  Copy full SHA for ccefd77

• Comment out test

  naviji

  committed
  51f4e2e

  Copy full SHA for 51f4e2e

• Comment out test

  naviji

  committed
  c8bd10e

  Copy full SHA for c8bd10e

Commits on Apr 19, 2020

• Fix conflict notes test bug

  naviji

  committed
  281c536

  Copy full SHA for 281c536

• Merge from upstream master

  naviji

  committed
  5894078

  Copy full SHA for 5894078

• Clean up

  naviji

  committed
  c48a61e

  Copy full SHA for c48a61e

• Clean up

  naviji

  committed
  7210a1e

  Copy full SHA for 7210a1e

Commits on Apr 21, 2020

• Merge branch 'master' of https://github.com/laurent22/joplin into history-test

  naviji

  committed
  566bea6

  Copy full SHA for 566bea6

• Remove package-lock.json

  naviji

  committed
  f625666

  Copy full SHA for f625666

• Remove old history test file

  naviji

  committed
  baed477

  Copy full SHA for baed477

• Clean up

  naviji

  committed
  bab891b

  Copy full SHA for bab891b

Commits on Apr 22, 2020

• Fix search bug

  naviji

  committed
  49a4a30

  Copy full SHA for 49a4a30

Commits on May 6, 2020

• Merge from upstream master

  naviji

  committed
  4e00206

  Copy full SHA for 4e00206

Commits on May 7, 2020

• Add arrows to WYSIWYG editor

  naviji

  committed
  9972588

  Copy full SHA for 9972588

Commits on May 8, 2020

• Simplify

  naviji

  committed
  ffc01e7

  Copy full SHA for ffc01e7