lxm_front/Mergely
1
0
Fork 1
mirror of https://github.com/wickedest/Mergely.git synced 2026-04-17 11:28:35 +08:00
Code Issues Projects Releases Wiki Activity
203 Commits 18 Branches 64 Tags
a7274a9d8277343631b15fa08d196fea0da800c5
Commit Graph

46 Commits

Author SHA1 Message Date
Jamie Peabody
a7274a9d82 chore: removed option fadein 2021-12-31 16:06:54 +00:00
Jamie Peabody
0c646b275d chore: fixed alignment issue 2021-12-31 15:55:26 +00:00
Jamie Peabody
bfc6bdfae3 chore: change resize 2021-12-31 15:30:37 +00:00
Jamie Peabody
a0c8dad3e2 chore: tweak style for merge button 2021-12-30 20:58:43 +00:00
Jamie Peabody
60d5aabd14 chore: tidy styles 2021-12-30 20:47:05 +00:00
Jamie Peabody
ddd02343b6 chore: tidy styles 2021-12-30 19:58:57 +00:00
Jamie Peabody
ff467a6413 chore: fixed margin marker ratio 2021-12-30 16:45:58 +00:00
Jamie Peabody
cd32046d6e chore: fixed margin change indicators 2021-12-30 15:31:51 +00:00
Jamie Peabody
b6e0f2b481 chore: fixed issues with diff rendering 2021-12-30 14:17:13 +00:00
Jamie Peabody
1874ae0e6c chore: fixed scroll performance 2021-12-30 08:53:16 +00:00
Jamie Peabody
f8e07526f6 chore: modernize 2021-12-30 08:48:22 +00:00
Jamie Peabody
f05e06232a refactor: BREAKING: 5.0.0-rc0 2021-12-18 15:56:17 +00:00
Jamie Peabody
82f32ceb10 refactor(es6): most of jquery removed 2021-11-28 22:12:18 +00:00
Jamie Peabody
c9d11e415e refactor(es6): scroll no longer depends on jquery 2021-11-28 19:17:00 +00:00
Jamie Peabody
3d6193a235 refactor(es6): scroll no longer depends on jquery 2021-11-28 18:57:21 +00:00
Jamie Peabody
daad73a1cc refactor(es6): editor access is simpler lhs/rhs without id 2021-11-28 15:08:25 +00:00
Jamie Peabody
209d634a28 refactor(es6): editor access is simpler lhs/rhs without id 2021-11-28 15:06:56 +00:00
Jamie Peabody
a4dea56879 refactor(es6): resize no longer depends on jQuery 2021-11-28 14:51:11 +00:00
Jamie Peabody
56e490745d refactor(es6): Refactoring for es6 
mostly var => const/let changes
 2021-11-28 14:14:09 +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
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
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