Jamie Peabody
|
bdd060556b
|
Tidy-up
|
2013-06-30 20:11:45 +01:00 |
|
Jamie Peabody
|
02b5df3d87
|
Fixes sidebar click.
|
2013-06-24 22:34:45 +01:00 |
|
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 |
|
wickedest
|
a2e06706cf
|
Merge pull request #10 from eminence/fixclick
Fix clicking on the clhs and crhs elements
|
2013-06-21 14:49:58 -07:00 |
|
Andrew Chin
|
cbd61e600d
|
Fix clicking on the clhs and crhs elements
|
2013-06-21 17:17:31 -04:00 |
|
Jamie Peabody
|
91f1a2158d
|
Fixes autoupdate issue to ensure there is no update if scrolled or resized.
|
2013-06-20 22:36:01 +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
|
09c9e31a0d
|
Fixes issue where merge left, from added lines, were not being correctly inserted into the lhs.
|
2013-06-13 19:35:26 +01:00 |
|
Jamie Peabody
|
0cd70a833f
|
Added 'rhs_margin' option that accepts 'left' or 'right' to indicate the side to render the margin. Defaults to 'right'.
|
2013-06-06 18:11:29 +01:00 |
|
Jamie Peabody
|
18bc465d90
|
Removed window height (was unused).
|
2013-05-12 20:03:46 +01:00 |
|
Jamie Peabody
|
eb3b45ff92
|
Removed debug code.
|
2013-05-12 19:56:41 +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
|
a3e50f8d8e
|
Initial fix for auto-height and multiple editors.
|
2013-03-09 13:48:46 +00:00 |
|
Jamie Peabody
|
c382afa2a5
|
Fixed setting lhs/rhs using CodeMirror's setValue.
|
2013-03-03 22:45:56 +00: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
|
2d0faa2b74
|
Tidy-up.
|
2013-01-05 20:06:33 +00:00 |
|
Jamie Peabody
|
5ddd7a5f3c
|
Updated reference document.
|
2013-01-05 15:07:58 +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
|
81be394a58
|
Fixed missing .length on change_funcs.
|
2012-11-17 14:35:15 +00:00 |
|
Jamie Peabody
|
e13685e190
|
Normalize line endings
|
2012-11-15 20:04:55 +00:00 |
|
Jamie Peabody
|
4e50e186c5
|
Merge branch 'master' of https://github.com/wickedest/Mergely
|
2012-11-15 20:03:46 +00:00 |
|
Jamie Peabody
|
2d33a9ecd0
|
Added .gitattributes
|
2012-11-15 20:02:56 +00:00 |
|
Jamie Peabody
|
6d40b165eb
|
Normalize line endings
|
2012-11-15 19:26:33 +00:00 |
|
Jamie Peabody
|
604552aeee
|
Added .gitattributes
|
2012-11-15 19:24:58 +00:00 |
|
Jamie Peabody
|
c1ff6a2d44
|
Using jQuery instead of $ for compatability with other libraries.
|
2012-11-14 22:00:29 +00:00 |
|
Jamie Peabody
|
ff1292a40b
|
Replaced 'for x in arr' with proper loops, or used hasOwnProperty to avoid conflict with modified prototypes.
|
2012-11-14 21:53:40 +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
|
b9b550852b
|
initial check-in
|
2012-03-06 21:56:00 +00:00 |
|
Jamie Peabody
|
170fa4c6ad
|
updated README
|
2012-03-06 21:34:07 +00:00 |
|
Jamie Peabody
|
7f5e382c51
|
updated README
|
2012-03-06 21:29:00 +00:00 |
|
Jamie Peabody
|
e1a5c8f8f3
|
initial check-in
|
2012-03-06 18:46:25 +00:00 |
|
Jamie Peabody
|
8484335f92
|
first commit
|
2012-03-06 18:36:11 +00:00 |
|