lxm_front/Mergely
1
0
Fork 1
mirror of synced 2025-12-16 03:18:14 +08:00
Code Issues Projects Releases Wiki Activity
232 Commits 17 Branches 57 Tags
498746a831defb7a3f292a7c1fa2a7c4518398b3
Commit Graph

232 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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)) ([83df02d](83df02d967))
v5.3.5 		2024-10-11 19:58:19 +00:00
Jamie Peabody
83df02d967 fix: bump dependencies (#213) 2024-10-11 20:57:24 +01: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)" ([c36d2a7](c36d2a7ba9)), closes [#203](https://github.com/wickedest/Mergely/issues/203)
v5.3.4 		2024-10-11 19:52:13 +00:00
Jamie Peabody
c36d2a7ba9 Revert "build(deps-dev): bump webpack from 5.91.0 to 5.94.0 (#203)" 
This reverts commit 86593de7d0.
 2024-10-11 20:51:13 +01: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)) ([4cd8897](4cd8897c6b))
v5.3.3 		2024-10-11 19:49:03 +00:00
Jamie Peabody
4cd8897c6b fix(#209): Fixes issue with options not being preserved when individually set. (#211) 2024-10-11 20:47:58 +01:00
dependabot[bot]
86593de7d0 build(deps-dev): bump webpack from 5.91.0 to 5.94.0 (#203) 
Bumps [webpack](https://github.com/webpack/webpack) from 5.91.0 to 5.94.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.91.0...v5.94.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-10-11 20:42:06 +01: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 ([c7b0fd0](c7b0fd03b0))
v5.3.2 		2024-07-31 18:45:48 +00:00
Jamie Peabody
c7b0fd03b0 fix: Removed debug code 2024-07-31 19:44:47 +01:00
dependabot[bot]
8d56792b37 build(deps-dev): bump braces from 3.0.2 to 3.0.3 (#198) 
Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3)

---
updated-dependencies:
- dependency-name: braces
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-06-19 19:24:23 +01:00
dependabot[bot]
8c1c95284e build(deps): bump ws, engine.io and socket.io-adapter (#200) 
Bumps [ws](https://github.com/websockets/ws), [engine.io](https://github.com/socketio/engine.io) and [socket.io-adapter](https://github.com/socketio/socket.io-adapter). These dependencies needed to be updated together.

Updates `ws` from 8.17.0 to 8.17.1
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/8.17.0...8.17.1)

Updates `engine.io` from 6.5.4 to 6.5.5
- [Release notes](https://github.com/socketio/engine.io/releases)
- [Changelog](https://github.com/socketio/engine.io/blob/main/CHANGELOG.md)
- [Commits](https://github.com/socketio/engine.io/compare/6.5.4...6.5.5)

Updates `socket.io-adapter` from 2.5.4 to 2.5.5
- [Release notes](https://github.com/socketio/socket.io-adapter/releases)
- [Changelog](https://github.com/socketio/socket.io-adapter/blob/main/CHANGELOG.md)
- [Commits](https://github.com/socketio/socket.io-adapter/compare/2.5.4...2.5.5)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
- dependency-name: engine.io
  dependency-type: indirect
- dependency-name: socket.io-adapter
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-06-19 19:21:48 +01: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)) ([c40672c](c40672c458))
v5.3.1 		2024-06-19 18:19:06 +00:00
Jamie Peabody
c40672c458 fix: Fixed a regression rendering inline markup for numbers, punctuation, and symbols (#199) 2024-06-19 19:18:05 +01: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)) ([a469a65](a469a65101))
v5.3.0 		2024-06-16 19:37:09 +00:00
Jamie Peabody
a469a65101 feat: Supports unicode diacritical marks when rendering line diff (fixes #169) (#197) 2024-06-16 20:36:17 +01: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)) ([b9e3641](b9e3641c85))
v5.2.0 		2024-06-09 21:25:57 +00:00
Jamie Peabody
b9e3641c85 feat: Allows height to be not explicit height, e.g. 'inherit' or '100%' (#196) 2024-06-09 22:25:04 +01: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) ([692d01f](692d01f165))
v5.1.4 		2024-05-17 19:11:40 +00:00
Jamie Peabody
692d01f165 fix: removed accidental change that enabled code display modes (e.g. javascript, python, html) 2024-05-17 20:10:40 +01: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)) ([c4c6e8a](c4c6e8abd8))
v5.1.3 		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
dependabot[bot]
e7357e4ff1 build(deps-dev): bump express from 4.18.2 to 4.19.2 (#192) 
Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.18.2...4.19.2)

---
updated-dependencies:
- dependency-name: express
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-05-06 08:46:36 +01:00
dependabot[bot]
a673d33e89 build(deps-dev): bump webpack-dev-middleware from 5.3.3 to 5.3.4 (#191) 
Bumps [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware) from 5.3.3 to 5.3.4.
- [Release notes](https://github.com/webpack/webpack-dev-middleware/releases)
- [Changelog](https://github.com/webpack/webpack-dev-middleware/blob/v5.3.4/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-middleware/compare/v5.3.3...v5.3.4)

---
updated-dependencies:
- dependency-name: webpack-dev-middleware
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-05-06 08:45:26 +01:00
dependabot[bot]
4818e05d2d build(deps-dev): bump follow-redirects from 1.15.2 to 1.15.6 (#190) 
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.2 to 1.15.6.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.2...v1.15.6)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-05-06 08:43:52 +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)) ([60d18f8](60d18f8d5c))
v5.1.2 		2024-05-06 07:42:38 +00:00
Jamie Peabody
60d18f8d5c fix: trace only when debug enabled (#194) 2024-05-06 08:41:30 +01: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' ([02e383d](02e383d94d))
v5.1.1 		2024-03-11 19:46:42 +00:00
Jamie Peabody
02e383d94d fix(#183): fixes undefined 'k' due to scoped 'let' 2024-03-11 19:45:47 +00:00
dependabot[bot]
b09671febe build(deps-dev): bump @babel/traverse from 7.21.4 to 7.23.2 (#181) 
Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.21.4 to 7.23.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-03-11 19:40:31 +00:00
dependabot[bot]
1702bd6e0a build(deps-dev): bump postcss from 8.4.21 to 8.4.31 (#180) 
Bumps [postcss](https://github.com/postcss/postcss) from 8.4.21 to 8.4.31.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.21...8.4.31)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-03-11 19:40:09 +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 ([827487a](827487a598))
v5.1.0 		2023-08-27 13:04:50 +00:00
Jamie Peabody
827487a598 feat: support CM modes: go, javascript, htmlmixed, markdown, python 2023-08-27 14:03:41 +01: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 ([dec1e95](dec1e9509d))
v5.0.4 		2023-08-27 12:17:49 +00:00
Jamie Peabody
dec1e9509d fix: updated CDN example 2023-08-27 13:16:11 +01: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 ([254adf1](254adf15ab))
v5.0.3 		2023-08-27 10:55:22 +00:00
Jamie Peabody
254adf15ab fix: Updated docs with CDN example 2023-08-27 11:53:55 +01:00
Jamie Peabody
a07073a13c docs: Updated docs with CDN example 2023-08-27 11:50:00 +01:00
dependabot[bot]
3facfec6b7 build(deps): bump socket.io-parser from 4.2.2 to 4.2.3 (#177) 
Bumps [socket.io-parser](https://github.com/socketio/socket.io-parser) from 4.2.2 to 4.2.3.
- [Release notes](https://github.com/socketio/socket.io-parser/releases)
- [Changelog](https://github.com/socketio/socket.io-parser/blob/main/CHANGELOG.md)
- [Commits](https://github.com/socketio/socket.io-parser/compare/4.2.2...4.2.3)

---
updated-dependencies:
- dependency-name: socket.io-parser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-08-27 11:41:03 +01:00
Jamie Peabody
2b561c1856 chore(doc): Update CDN example 2023-08-27 11:38:38 +01:00
dependabot[bot]
cd09815b7d build(deps): bump engine.io from 6.4.1 to 6.4.2 (#176) 
Bumps [engine.io](https://github.com/socketio/engine.io) from 6.4.1 to 6.4.2.
- [Release notes](https://github.com/socketio/engine.io/releases)
- [Changelog](https://github.com/socketio/engine.io/blob/main/CHANGELOG.md)
- [Commits](https://github.com/socketio/engine.io/compare/6.4.1...6.4.2)

---
updated-dependencies:
- dependency-name: engine.io
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-04 22:42:42 +01: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 ([7b2040c](7b2040c6ad))
v5.0.2 		2023-04-24 07:51:30 +00:00
Jamie Peabody
7b2040c6ad fix(scroll): fixed issue where first rhs scroll was unlinked 2023-04-24 08:50:14 +01:00
Jamie Peabody
df7d23244b chore: fix changelog 2023-04-23 21:50:20 +01: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 ([a8b497b](a8b497bc9b))
v5.0.1 		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
v5.0.0 		2023-04-23 16:29:59 +01:00
Jamie Peabody
f3e90b7588 chore(release): 4.3.9 v4.3.9 2022-01-19 21:49:12 +00:00
Jamie Peabody
650daaff63 fix(#161): Fixed issue with options.ignorews (#162) 2022-01-19 21:46:43 +00:00