lxm_front/Mergely
1
0
Fork 1
mirror of synced 2025-11-06 04:30:40 +08:00
Code Issues Projects Releases Wiki Activity
184 Commits 16 Branches 56 Tags
f3e90b7588675ab7056d8b0f9ac74d6ab9abb29f
Commit Graph

41 Commits

Author SHA1 Message Date
Jamie Peabody
f3e90b7588 chore(release): 4.3.9 2022-01-19 21:49:12 +00:00
Jamie Peabody
fdfbf8d131 chore(release): 4.3.8 2021-11-21 17:23:18 +00:00
Jamie Peabody
79cb0ddd6a refactor: Split code into individual files and tidier code (#160) 
* refactor: split code into separate files

* chore: removed unused test code

* refactor: no longer depends on jQuery.extend

* docs: merged changes into CHANGELOG.md

Co-authored-by: Jamie Peabody <jpeabody@axway.com>
 2021-11-21 17:22:04 +00:00
Jamie Peabody
b930b8bbd6 chore(release): 4.3.7 2021-11-21 13:19:47 +00:00
Jamie Peabody
4d5c6fa67c chore: removed unused dev-deps 2021-11-21 13:18:16 +00:00
Jamie Peabody
94bee71aea chore(release): 4.3.6 2021-11-21 13:08:27 +00:00
Jamie Peabody
0de9e87df8 ci: added standard-version 2021-11-21 12:22:50 +00:00
Jamie Peabody
a92b408ce5 chore(ci): added git-conventional-commits 2021-11-21 11:00:15 +00:00
Jamie Peabody
623a93b838 fix build 2021-10-03 16:56:35 +01:00
Jamie Peabody
615e1afd97 patch(#139): fixes inline diff rendering issue with whitespace (#158) 
Co-authored-by: Jamie Peabody <jpeabody@axway.com>
 2021-10-03 16:49:44 +01:00
Jamie Peabody
b9bc901dd2 patch(#152): fixes resize issue when using zoom 2021-10-02 14:19:15 +01:00
Jamie Peabody
712cbe8472 patch(#151): resets the current diff when setValue, clear, lhs, or rhs are called 2021-06-23 21:57:38 +01:00
Jamie Peabody
8c541ba51c Updated changes and bumped version 2021-05-19 07:57:54 +01:00
Jamie Peabody
4610ed3535 feat(#137): added 'summary' method 2021-04-29 21:20:53 +01:00
Jamie Peabody
d2c41d1ee1 patch(#142): added examples README.md 2021-04-29 20:24:21 +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
Jamie Peabody
3830cff687 fixes initial change issue 2020-11-23 20:06:09 +00:00
Jamie Peabody
e38cd50037 bump 2020-10-15 20:47:22 +01:00
Jamie Peabody
85b02add89 chore: updated dependencies 2020-10-15 20:46:11 +01: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
577a324d01 release 4.1.2 2020-10-15 14:44:16 +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
fd09b9761d patch(#104): fixes rendering beyond change constraint 2020-06-14 20:32:06 +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
Jamie Peabody
5947f1b313 4.0.13 2019-12-21 10:10:39 +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
43ae12269c bump 4.0.11 2019-02-11 21:01:28 +00:00
Jamie Peabody
2474005eab fixes 4.0.9 artifacts 2019-01-23 22:57:22 +00: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
3d44470103 4.0.7 2018-08-06 13:01:19 +01: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
157d763af6 fixes bad archive 2018-05-09 21:22:25 +01: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