Jamie Peabody
|
e9e0a9d41b
|
Merge branch 'master' of https://github.com/kljh/Mergely
Conflicts:
lib/mergely.js
|
2014-08-17 15:35:16 +01:00 |
|
Jamie Peabody
|
290f7606c7
|
Complete rewrite of the editor. Added search previous. Minor bug fixes include: issues with merging; scroll indicator out of alignment with actual source; inner-markup; resize.
|
2013-06-24 20:20:19 +01:00 |
|
Jamie Peabody
|
ea2263ff29
|
New inner-line diff algorithm. Added method 'unmarkup' to clear markup. Added option: vpcolor. Fixed autoresize and resize.
|
2013-05-12 19:52:47 +01:00 |
|
Jamie Peabody
|
274d85bf05
|
Made use of CodeMirror viewport to greatly improve performance. Added settings to toggle paragraph LCD; line wrapping; white space; and side bars.
Released with CodeMirror 3.1.
|
2013-02-24 21:57:25 +00:00 |
|
Jamie Peabody
|
49f57eb72b
|
Major work to update Mergely to work with the head of codemirror git.
|
2013-02-10 20:19:35 +00:00 |
|