Compare commits

..

14 Commits

Author SHA1 Message Date
Jamie Peabody
610ae902a0 Merge branch 'master' into alpha 2023-04-23 16:28:04 +01:00
Jamie Peabody
44594a0442 chore: debug 2023-04-23 16:21:16 +01:00
Jamie Peabody
10f477a450 chore: fix css 2023-04-23 16:02:25 +01:00
Jamie Peabody
ce407dac3f fix: fixes firefox scroll-linked effect issue 2023-04-23 11:30:19 +01:00
Jamie Peabody
a01cadbf64 fix: fixes firefox scroll-linked effect issue 2023-04-23 10:29:16 +01:00
Jamie Peabody
fbe670c92a chore(ci): ignore alpha, beta, next on branch 2023-04-23 10:28:48 +01:00
Jamie Peabody
88f21e2bc7 chore(ci): package-lock.json 2023-04-22 16:01:38 +01:00
Jamie Peabody
4160ab4f6e chore(ci): test 2023-04-22 15:59:44 +01:00
Jamie Peabody
16f1d2016d chore(ci): alpha, beta, next branches 2023-04-22 15:57:48 +01:00
Jamie Peabody
347a3f56ff chore(ci): updated webpack 2023-04-22 14:41:21 +01:00
Jamie Peabody
88d4a62a04 chore: updated examples 2023-04-22 14:40:58 +01:00
Jamie Peabody
b3e7b48d11 feat: dark mode 2023-04-22 14:13:30 +01:00
Jamie Peabody
fcea4efe2f chore: tweaked no-start/end styles 2023-04-22 13:44:33 +01:00
Jamie Peabody
080b8fd7b5 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
2023-04-22 12:41:12 +01:00

Diff Content Not Available