Mergely

Author	SHA1	Message	Date
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

20 Commits