Jamie Peabody
|
4610ed3535
|
feat(#137): added 'summary' method
|
2021-04-29 21:20:53 +01:00 |
|
Jamie Peabody
|
5deac86ebc
|
Merge branch 'master' into fix-146
|
2021-04-29 20:36:10 +01:00 |
|
Jamie Peabody
|
747bcacf2c
|
patch(#147): fixes selected change style issue (#148)
Co-authored-by: Jamie Peabody <jpeabody@axway.com>
|
2021-04-29 20:09:10 +01:00 |
|
ControlBoy38
|
3f78453640
|
Update mergely.js
|
2021-04-28 23:02:36 +02:00 |
|
Jamie Peabody
|
3830cff687
|
fixes initial change issue
|
2020-11-23 20:06:09 +00:00 |
|
Jamie Peabody
|
5a0cd15ddd
|
feat(#132): added option to ignore accented characters (#136)
* feat(#132): added option to ignore accented characters
* fixed lf
Co-authored-by: Jamie Peabody <jpeabody@axway.com>
|
2020-10-15 15:13:41 +01:00 |
|
Jamie Peabody
|
bd659adcfd
|
patch(#95): fixes cursor focus on init (#133)
Co-authored-by: Jamie Peabody <jpeabody@axway.com>
|
2020-10-15 14:28:46 +01:00 |
|
Jamie Peabody
|
ddeb16ef8b
|
added 'updated' event and fixed 'scrollTo'
|
2020-07-01 22:06:42 +01:00 |
|
Jamie Peabody
|
b3f417e9af
|
patch(#104): fixes rendering beyond change constraint
|
2020-06-14 20:31:08 +01:00 |
|
Jamie Peabody
|
827c9ed8ef
|
removed unnecessary addon
|
2020-01-03 23:10:02 +00:00 |
|
Jamie Peabody
|
06189782de
|
patch(#104): fixes text selection for marked-up diff
|
2020-01-03 22:33:30 +00:00 |
|
Yiqiu Huang
|
73c1604981
|
Fix bug during refactor (#127)
|
2019-12-21 10:05:16 +00:00 |
|
Jamie Peabody
|
90ab7f3f5e
|
patch(issue #115): fixes merging deleted line(s) from lhs would munge rhs text (#117)
* patch(issue #115): fixes merging deleted line(s) from lhs would munge rhs text
* updated readme
|
2019-07-14 12:54:01 +01:00 |
|
Jamie Peabody
|
a2eaef8a13
|
patch(issue #106): fixes merge edge-case with add (#107)
* patch(issue #106): fixes merge edge-case with add
* bump
|
2019-01-23 22:39:04 +00:00 |
|
Jamie Peabody
|
d9f2edc1ad
|
chore: webpack upgrade (#98)
* upgraded to webpack 4.x
* updated webpack
|
2018-11-17 09:12:45 +00:00 |
|
Jamie Peabody
|
6716096215
|
patch(issue #89): fixes missing merge buttons (#91)
* patch(fix-89): fixes missing merge buttons
* 4.0.6
|
2018-07-17 13:46:54 -07:00 |
|
Jamie Peabody
|
217674cd07
|
patch(fix #85): better XSS fix (#87)
* patch(fix #85): fixes xss vulnerability
* patch(fix #85): better XSS fix
|
2018-06-23 03:36:38 -07:00 |
|
Jamie Peabody
|
3812dd6026
|
patch(fix #85): fixes xss vulnerability (#86)
|
2018-06-21 14:04:36 -07:00 |
|
Jamie Peabody
|
ead86867c4
|
fix(issue-83): poor rendering performance
|
2018-06-17 13:38:52 +01:00 |
|
Jamie Peabody
|
2d0d7e9ce7
|
fix(issue-79): rewrote merge to use cm.replaceRange (#80)
|
2018-05-26 12:48:54 -07:00 |
|
Jamie Peabody
|
d7a7ddcd55
|
fix(issue-77): hides both sidebars when initializing with 'sidebar: false' (#81)
|
2018-05-26 12:48:15 -07:00 |
|
Jamie Peabody
|
3ee7b77186
|
added test
|
2018-05-09 21:10:04 +01:00 |
|
Jamie Peabody
|
bde295febd
|
Build improvements (#73)
* removed editor and initial cleanup
* cleanup
* updated jquery
* tidy up
* moved src and build to lib
* tidy up and fixed webpack
* updated readme
* removed junk
* tidy up
* works with sample and editor
* removed editor_width and editor_height
* auto width and height
* added license feature
* not doing dist
* fixed typo
* added searchcursor
* fixed typo
* doc updates
* improved comment
* updated init for cm settings
* fixed jquery/cm includes
* documentation updates
* updated changes doc
* fixed cmsettings
* updated examples
|
2017-12-18 21:53:03 +00:00 |
|