Commit Graph

9 Commits

Author SHA1 Message Date
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
Jamie Peabody
2d0faa2b74 Tidy-up. 2013-01-05 20:06:33 +00:00
Jamie Peabody
7a65625cb2 Added ignore white space
Fixed editor bug re-applying settings
Added options method (with no arguments)
2013-01-05 14:45:18 +00:00
Jamie Peabody
5b390c6737 Mergely 3.0 that works with CodeMirror 3.0 beta. 2012-11-03 18:17:49 +00:00
Jamie Peabody
b5e669d330 Fixed canvas width issue 2012-07-31 20:32:47 +01:00
Jamie Peabody
ae02695b13 2.4 changes
Added editor ability to download .diff files
Added color settings
2012-04-09 19:23:33 +01:00
Jamie Peabody
e1a5c8f8f3 initial check-in 2012-03-06 18:46:25 +00:00