Commit Graph

10 Commits

Author SHA1 Message Date
Jamie Peabody
1b21779bcf Added url parameters, removed crap social code. 2013-06-24 22:27:06 +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
f77a66c398 Added 'viewport' option to enable/disable the viewport. Updated documentation and editor options. 2013-06-13 20:22:46 +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
Jamie Peabody
eaf41856fa Fixed rendering issue where changes were skipped. Upgraded to work with jquery 1.9.0. 2013-02-03 21:00:30 +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
6d40b165eb Normalize line endings 2012-11-15 19:26:33 +00:00
Jamie Peabody
5b390c6737 Mergely 3.0 that works with CodeMirror 3.0 beta. 2012-11-03 18:17:49 +00:00