semantic-release-bot
8075912b1b
chore(release): 5.4.7 [skip ci]
...
## [5.4.7](https://github.com/wickedest/Mergely/compare/v5.4.6...v5.4.7 ) (2026-02-28)
### Bug Fixes
* **#228:** Fixes issue where a single scroll event would cause multiple updates and calculate view placement incorrectly ([9834f099834f0964a
2026-02-28 09:05:39 +00:00
semantic-release-bot
fa30d277e5
chore(release): 5.4.6 [skip ci]
...
## [5.4.6](https://github.com/wickedest/Mergely/compare/v5.4.5...v5.4.6 ) (2026-02-24)
### Bug Fixes
* **#228:** Clicking on edit marker in gutter now accounts for top position of editor. ([cc7df68cc7df68aea#228 ](https://github.com/wickedest/Mergely/issues/228 )
2026-02-24 20:20:30 +00:00
semantic-release-bot
6ed235c4b0
chore(release): 5.4.5 [skip ci]
...
## [5.4.5](https://github.com/wickedest/Mergely/compare/v5.4.4...v5.4.5 ) (2026-02-23)
### Bug Fixes
* **#222:** Fixed issue with poor rendering performance and marker misalignment ([27778f027778f0840#222 ](https://github.com/wickedest/Mergely/issues/222 ) [#227 ](https://github.com/wickedest/Mergely/issues/227 )
2026-02-23 21:52:15 +00:00
semantic-release-bot
3651df9ad6
chore(release): 5.4.4 [skip ci]
...
## [5.4.4](https://github.com/wickedest/Mergely/compare/v5.4.3...v5.4.4 ) (2026-02-23)
### Bug Fixes
* Updated examples README.md ([f1e58f5f1e58f58fe
2026-02-23 19:48:25 +00:00
semantic-release-bot
5cb3946182
chore(release): 5.4.3 [skip ci]
...
## [5.4.3](https://github.com/wickedest/Mergely/compare/v5.4.2...v5.4.3 ) (2026-02-23)
### Bug Fixes
* Removed whitespace from example ([69ecf7669ecf76fe6
2026-02-23 19:38:58 +00:00
semantic-release-bot
93eee752a7
chore(release): 5.4.2 [skip ci]
...
## [5.4.2](https://github.com/wickedest/Mergely/compare/v5.4.1...v5.4.2 ) (2026-02-23)
### Bug Fixes
* Removed whitespace from example ([00a791700a79170a8
2026-02-23 19:22:43 +00:00
semantic-release-bot
c90edb3150
chore(release): 5.4.1 [skip ci]
...
## [5.4.1](https://github.com/wickedest/Mergely/compare/v5.4.0...v5.4.1 ) (2026-02-23)
### Bug Fixes
* **#225:** Fixes rendering issue when there are multiple editors ([1a2ee6a1a2ee6af3d
2026-02-23 18:29:31 +00:00
semantic-release-bot
aa496078fd
chore(release): 5.4.0 [skip ci]
...
# [5.4.0](https://github.com/wickedest/Mergely/compare/v5.3.6...v5.4.0 ) (2025-11-15)
### Features
* **#220:** Exposes Mergely's instance of CodeMirror as Mergely.CodeMirror ([#221 ](https://github.com/wickedest/Mergely/issues/221 )) ([d6d8d06d6d8d06acc#220 ](https://github.com/wickedest/Mergely/issues/220 )
2025-11-15 15:43:30 +00:00
semantic-release-bot
da71745c38
chore(release): 5.3.6 [skip ci]
...
## [5.3.6](https://github.com/wickedest/Mergely/compare/v5.3.5...v5.3.6 ) (2024-10-11)
### Bug Fixes
* **#207:** Updated documentation for search method. ([#214 ](https://github.com/wickedest/Mergely/issues/214 )) ([350e5af350e5af2e8#207 ](https://github.com/wickedest/Mergely/issues/207 )
2024-10-11 20:56:16 +00:00
semantic-release-bot
498746a831
chore(release): 5.3.5 [skip ci]
...
## [5.3.5](https://github.com/wickedest/Mergely/compare/v5.3.4...v5.3.5 ) (2024-10-11)
### Bug Fixes
* bump dependencies ([#213 ](https://github.com/wickedest/Mergely/issues/213 )) ([83df02d83df02d967
2024-10-11 19:58:19 +00:00
semantic-release-bot
51799f7dc1
chore(release): 5.3.4 [skip ci]
...
## [5.3.4](https://github.com/wickedest/Mergely/compare/v5.3.3...v5.3.4 ) (2024-10-11)
### Reverts
* Revert "build(deps-dev): bump webpack from 5.91.0 to 5.94.0 (#203 )" ([c36d2a7c36d2a7ba9#203 ](https://github.com/wickedest/Mergely/issues/203 )
2024-10-11 19:52:13 +00:00
semantic-release-bot
b79ac30d4e
chore(release): 5.3.3 [skip ci]
...
## [5.3.3](https://github.com/wickedest/Mergely/compare/v5.3.2...v5.3.3 ) (2024-10-11)
### Bug Fixes
* **#209:** Fixes issue with options not being preserved when individually set. ([#211 ](https://github.com/wickedest/Mergely/issues/211 )) ([4cd88974cd8897c6b
2024-10-11 19:49:03 +00:00
semantic-release-bot
78f68bf904
chore(release): 5.3.2 [skip ci]
...
## [5.3.2](https://github.com/wickedest/Mergely/compare/v5.3.1...v5.3.2 ) (2024-07-31)
### Bug Fixes
* Removed debug code ([c7b0fd0c7b0fd03b0
2024-07-31 18:45:48 +00:00
semantic-release-bot
0bdbfe1078
chore(release): 5.3.1 [skip ci]
...
## [5.3.1](https://github.com/wickedest/Mergely/compare/v5.3.0...v5.3.1 ) (2024-06-19)
### Bug Fixes
* Fixed a regression rendering inline markup for numbers, punctuation, and symbols ([#199 ](https://github.com/wickedest/Mergely/issues/199 )) ([c40672cc40672c458
2024-06-19 18:19:06 +00:00
semantic-release-bot
64a20ee5b1
chore(release): 5.3.0 [skip ci]
...
# [5.3.0](https://github.com/wickedest/Mergely/compare/v5.2.0...v5.3.0 ) (2024-06-16)
### Features
* Supports unicode diacritical marks when rendering line diff (fixes [#169 ](https://github.com/wickedest/Mergely/issues/169 )) ([#197 ](https://github.com/wickedest/Mergely/issues/197 )) ([a469a65a469a65101
2024-06-16 19:37:09 +00:00
semantic-release-bot
65c71be17e
chore(release): 5.2.0 [skip ci]
...
# [5.2.0](https://github.com/wickedest/Mergely/compare/v5.1.4...v5.2.0 ) (2024-06-09)
### Features
* Allows height to be not explicit height, e.g. 'inherit' or '100%' ([#196 ](https://github.com/wickedest/Mergely/issues/196 )) ([b9e3641b9e3641c85
2024-06-09 21:25:57 +00:00
semantic-release-bot
6ea7450536
chore(release): 5.1.4 [skip ci]
...
## [5.1.4](https://github.com/wickedest/Mergely/compare/v5.1.3...v5.1.4 ) (2024-05-17)
### Bug Fixes
* removed accidental change that enabled code display modes (e.g. javascript, python, html) ([692d01f692d01f165
2024-05-17 19:11:40 +00:00
semantic-release-bot
84c27739ec
chore(release): 5.1.3 [skip ci]
...
## [5.1.3](https://github.com/wickedest/Mergely/compare/v5.1.2...v5.1.3 ) (2024-05-06)
### Bug Fixes
* **chore:** updated deps ([#195 ](https://github.com/wickedest/Mergely/issues/195 )) ([c4c6e8ac4c6e8abd8
2024-05-06 08:39:04 +00:00
Jamie Peabody
c4c6e8abd8
fix(chore): updated deps ( #195 )
...
* fix(chore): updated deps
* fix(chore): updated deps
2024-05-06 09:37:37 +01:00
semantic-release-bot
07f32b9a7d
chore(release): 5.1.2 [skip ci]
...
## [5.1.2](https://github.com/wickedest/Mergely/compare/v5.1.1...v5.1.2 ) (2024-05-06)
### Bug Fixes
* trace only when debug enabled ([#194 ](https://github.com/wickedest/Mergely/issues/194 )) ([60d18f860d18f8d5c
2024-05-06 07:42:38 +00:00
semantic-release-bot
4bd19c6e2e
chore(release): 5.1.1 [skip ci]
...
## [5.1.1](https://github.com/wickedest/Mergely/compare/v5.1.0...v5.1.1 ) (2024-03-11)
### Bug Fixes
* **#183:** fixes undefined 'k' due to scoped 'let' ([02e383d02e383d94d
2024-03-11 19:46:42 +00:00
semantic-release-bot
5e4dfc9e78
chore(release): 5.1.0 [skip ci]
...
# [5.1.0](https://github.com/wickedest/Mergely/compare/v5.0.4...v5.1.0 ) (2023-08-27)
### Features
* support CM modes: go, javascript, htmlmixed, markdown, python ([827487a827487a598
2023-08-27 13:04:50 +00:00
semantic-release-bot
bc46617d5e
chore(release): 5.0.4 [skip ci]
...
## [5.0.4](https://github.com/wickedest/Mergely/compare/v5.0.3...v5.0.4 ) (2023-08-27)
### Bug Fixes
* updated CDN example ([dec1e95dec1e9509d
2023-08-27 12:17:49 +00:00
semantic-release-bot
0733f3a6c6
chore(release): 5.0.3 [skip ci]
...
## [5.0.3](https://github.com/wickedest/Mergely/compare/v5.0.2...v5.0.3 ) (2023-08-27)
### Bug Fixes
* Updated docs with CDN example ([254adf1254adf15ab
2023-08-27 10:55:22 +00:00
semantic-release-bot
cb46821103
chore(release): 5.0.2 [skip ci]
...
## [5.0.2](https://github.com/wickedest/Mergely/compare/v5.0.1...v5.0.2 ) (2023-04-24)
### Bug Fixes
* **scroll:** fixed issue where first rhs scroll was unlinked ([7b2040c7b2040c6ad
2023-04-24 07:51:30 +00:00
semantic-release-bot
a6751b5957
chore(release): 5.0.1 [skip ci]
...
## [5.0.1](https://github.com/wickedest/Mergely/compare/v5.0.0...v5.0.1 ) (2023-04-23)
### Bug Fixes
* update release ([a8b497ba8b497bc9b
2023-04-23 20:44:06 +00:00
Jamie Peabody
a8b497bc9b
fix: update release
2023-04-23 21:42:58 +01:00
Jamie Peabody
166446c945
chore(ci): fixed branch name
2023-04-23 17:01:29 +01:00
Jamie Peabody
caff902c99
chore(ci): fix release ( #175 )
2023-04-23 16:54:56 +01:00
Jamie Peabody
37fedd05c8
v5.0 ( #174 )
...
* feat: v5
BREAKING CHANGE: Mergely is no longer a jQuery plugin.
BREAKING CHANGE: Removed `options.autoresize`
BREAKING CHANGE: Removed `options.editor_width`
BREAKING CHANGE: Removed `options.editor_height`
BREAKING CHANGE: Removed `options.fadein`
BREAKING CHANGE: Removed `options.fgcolor`
BREAKING CHANGE: Removed `options.resize`
BREAKING CHANGE: Removed `options.width`
BREAKING CHANGE: Removed `options.height`
BREAKING CHANGE: Removed `options.loaded` callback
BREAKING CHANGE: Removed `options.resized` callback
BREAKING CHANGE: Removed styles `.mergely-resizer`, `.mergely-full-screen-0`, and `.mergely-full-screen-8`
BREAKING CHANGE: Changed default for `options.change_timeout` changed from `150` to `50`.
BREAKING CHANGE: No longer automatically scrolls to first change.
feat: CodeMirror is now an explicit dependency.
feat: No longer necessary to separately require codemirror/addon/search/searchcursor
feat: No longer necessary to separately require codemirror/addon/selection/mark-selection
feat: `mergely.js` is now unminimized, and added new minimized version `mergely.min.js`
feat: Gutter click now scrolls to any line
feat: Mergely now emits `resize` event on resize
feat: The UI is now non-blocking as diff now runs in background
feat: Added support to provide `options.lhs` and `options.rhs` as strings
feat: #16 added titles to editor.mergely.com
fix : #165 block of changes at end of file are now distinguishable
fix : #140 fixed performance issue with large files
fix: Fixed issue where canvas markup was not rendered when `viewport` enabled
fix: Fixed timing issue where swap sides may not work as expected.
fix: Fixed issue where unmarkup did not emit an updated event.
fix: Fixed documentation issue where `merge` incorrectly stated: from the specified `side` to the opposite side.
fix: Fixed performance issue scrolling
fix: Fixed issue where initial render scrolled to first change, showing it at the bottom (as opposed to middle as expected)
fix: Fixed issue where line-diffs failed to diff non-alphanumeric characters
* chore: tweaked no-start/end styles
* feat: dark mode
* chore: updated examples
* chore(ci): updated webpack
* chore(ci): alpha, beta, next branches
* chore(ci): test
* chore(ci): package-lock.json
* chore(ci): ignore alpha, beta, next on branch
* fix: fixes firefox scroll-linked effect issue
* fix: fixes firefox scroll-linked effect issue
* chore: fix css
* chore: debug
2023-04-23 16:29:59 +01:00
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
