lxm_front/Mergely
1
0
Fork 1
mirror of https://github.com/wickedest/Mergely.git synced 2026-03-24 09:48:39 +08:00
Code Issues Projects Releases Wiki Activity
114 Commits 18 Branches 64 Tags
cd407f9e55408cade7ba4fb1f4d7018d79b330e4
Commit Graph

35 Commits

Author SHA1 Message Date
Jamie Peabody
eb74874266 Update for 3.4.5 2017-11-04 10:57:31 +00:00
Jamie Peabody
da41c28fdb Added ignorecase to editor 2017-02-28 22:32:46 +00:00
Jamie Peabody
1279be2745 Fixed no-conflict jQuery 2016-09-07 19:06:47 +01:00
Jamie Peabody
627b113802 Rewrote update editor options 2016-08-13 22:58:22 +01:00
Jamie Peabody
018391421b Updated to fix wonky query string 2016-08-13 16:49:02 +01:00
Jamie Peabody
14b9cb8b2e Made Mergely icon clicable 2016-08-13 16:41:25 +01:00
Jamie Peabody
154c6360e0 Fixes wonky query string 2016-08-13 16:40:15 +01:00
Jamie Peabody
266e0c7818 Updated 3.4.1 2016-05-25 22:34:26 +01:00
Jamie Peabody
c4776b1359 Improved UX for reading; added gutter-click; Updated CM 5.11.0 2016-02-07 14:43:43 +00:00
Nahakiole
36eb076648 Fixing XSS security issue. 2015-11-07 10:44:44 +01:00
Jamie Peabody
8883235daa Updated to 3.3.10 2015-06-28 13:54:46 +01:00
Jamie Peabody
370375d35e Updated to use friendly URL and fixes updateHistory params 2015-06-28 12:59:43 +01:00
Jamie Peabody
d525f8d05d Updated to 3.3.10 2015-06-28 12:13:12 +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
64988c1341 Mergely 3.3.7 2014-08-17 16:13:57 +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
b436e6d5ff Fixes two download .diff problems - it did not contain text, and the /diff url did not work. downloading directly from browser now. 2013-11-24 19:32:31 +00:00
Jamie Peabody
1cb4b36b40 Fixes settings update. 2013-11-02 15:58:54 +00:00
Jamie Peabody
bdd060556b Tidy-up 2013-06-30 20:11: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
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