13 Commits

Author	SHA1	Message	Date
Nahakiole	36eb076648	Fixing XSS security issue.	2015-11-07 10:44:44 +01:00
Jamie Peabody	370375d35e	Updated to use friendly URL and fixes updateHistory params	2015-06-28 12:59:43 +01:00
Jamie Peabody	e25acfe3b5	Added query params settings to editor	2015-06-28 12:06:06 +01:00
Jamie Peabody	3615267899	Updated to 3.3.9	2014-12-07 09:31:41 +00:00
Jamie Peabody	9876a3c841	Changed import order.	2014-10-19 21:20:53 +01:00
Jamie Peabody	3494afa89e	Added cm to debug	2014-10-19 14:09:53 +01:00
Jamie Peabody	cd38c10ac9	Use release version.	2014-08-17 15:46:40 +01:00
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	456da5f2c8	Added 'debug' option to editor to make it easier to switch.	2014-08-17 12:11:03 +01:00
Jamie Peabody	bf96bc51a1	Fixes rendering issue.	2014-01-25 12:24:01 +00:00
Jamie Peabody	1cb4b36b40	Fixes settings update.	2013-11-02 15:58:54 +00: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