lxm_front/Mergely
1
0
Fork 1
mirror of https://github.com/wickedest/Mergely.git synced 2026-10-24 22:56:14 +08:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: lxm_front:v5.0.0-alpha.3
Branches Tags
lxm_front:master lxm_front:fix-222 lxm_front:issue-220 lxm_front:fix-207 lxm_front:bumps lxm_front:fix-209 lxm_front:fix-non-letter-markup lxm_front:feat-diacriticals lxm_front:feat-permissive-height lxm_front:chore-deps lxm_front:fix-trace lxm_front:fix-183 lxm_front:encoder-wip lxm_front:fix-release lxm_front:v5.0 lxm_front:modernize lxm_front:new-myers-diff lxm_front:webpack-upgrade
lxm_front:v5.4.7 lxm_front:v5.4.6 lxm_front:v5.4.5 lxm_front:v5.4.4 lxm_front:v5.4.3 lxm_front:v5.4.2 lxm_front:v5.4.1 lxm_front:v5.4.0 lxm_front:v5.3.6 lxm_front:v5.3.5 lxm_front:v5.3.4 lxm_front:v5.3.3 lxm_front:v5.3.2 lxm_front:v5.3.1 lxm_front:v5.3.0 lxm_front:v5.2.0 lxm_front:v5.1.4 lxm_front:v5.1.3 lxm_front:v5.1.2 lxm_front:v5.1.1 lxm_front:v5.1.0 lxm_front:v5.0.4 lxm_front:v5.0.3 lxm_front:v5.0.2 lxm_front:v5.0.1 lxm_front:v5.0.0 lxm_front:v5.0.0-alpha.3 lxm_front:v5.0.0-alpha.2 lxm_front:v5.0.0-alpha.1 lxm_front:v4.3.9 lxm_front:v4.3.8 lxm_front:v4.3.7 lxm_front:v4.3.6 lxm_front:4.3.5 lxm_front:4.3.4 lxm_front:4.3.3 lxm_front:4.3.2 lxm_front:4.3.1 lxm_front:4.3.0 lxm_front:4.2.4 lxm_front:4.2.3 lxm_front:4.2.2 lxm_front:4.2.1 lxm_front:4.2.0 lxm_front:4.1.2 lxm_front:4.1.1 lxm_front:4.0.16 lxm_front:4.0.14 lxm_front:v4.0.13 lxm_front:4.0.13 lxm_front:4.0.8 lxm_front:v4.0.7 lxm_front:4.0.6 lxm_front:4.0.5 lxm_front:4.0.4 lxm_front:4.0.3 lxm_front:4.0.2 lxm_front:4.0.1 lxm_front:3.4.5 lxm_front:3.4.2 lxm_front:3.4.1 lxm_front:3.4.0 lxm_front:3.3.10 lxm_front:3.3.9
..
compare: lxm_front:v5.0.0
Branches Tags
lxm_front:master lxm_front:fix-222 lxm_front:issue-220 lxm_front:fix-207 lxm_front:bumps lxm_front:fix-209 lxm_front:fix-non-letter-markup lxm_front:feat-diacriticals lxm_front:feat-permissive-height lxm_front:chore-deps lxm_front:fix-trace lxm_front:fix-183 lxm_front:encoder-wip lxm_front:fix-release lxm_front:v5.0 lxm_front:modernize lxm_front:new-myers-diff lxm_front:webpack-upgrade
lxm_front:v5.4.7 lxm_front:v5.4.6 lxm_front:v5.4.5 lxm_front:v5.4.4 lxm_front:v5.4.3 lxm_front:v5.4.2 lxm_front:v5.4.1 lxm_front:v5.4.0 lxm_front:v5.3.6 lxm_front:v5.3.5 lxm_front:v5.3.4 lxm_front:v5.3.3 lxm_front:v5.3.2 lxm_front:v5.3.1 lxm_front:v5.3.0 lxm_front:v5.2.0 lxm_front:v5.1.4 lxm_front:v5.1.3 lxm_front:v5.1.2 lxm_front:v5.1.1 lxm_front:v5.1.0 lxm_front:v5.0.4 lxm_front:v5.0.3 lxm_front:v5.0.2 lxm_front:v5.0.1 lxm_front:v5.0.0 lxm_front:v5.0.0-alpha.3 lxm_front:v5.0.0-alpha.2 lxm_front:v5.0.0-alpha.1 lxm_front:v4.3.9 lxm_front:v4.3.8 lxm_front:v4.3.7 lxm_front:v4.3.6 lxm_front:4.3.5 lxm_front:4.3.4 lxm_front:4.3.3 lxm_front:4.3.2 lxm_front:4.3.1 lxm_front:4.3.0 lxm_front:4.2.4 lxm_front:4.2.3 lxm_front:4.2.2 lxm_front:4.2.1 lxm_front:4.2.0 lxm_front:4.1.2 lxm_front:4.1.1 lxm_front:4.0.16 lxm_front:4.0.14 lxm_front:v4.0.13 lxm_front:4.0.13 lxm_front:4.0.8 lxm_front:v4.0.7 lxm_front:4.0.6 lxm_front:4.0.5 lxm_front:4.0.4 lxm_front:4.0.3 lxm_front:4.0.2 lxm_front:4.0.1 lxm_front:3.4.5 lxm_front:3.4.2 lxm_front:3.4.1 lxm_front:3.4.0 lxm_front:3.3.10 lxm_front:3.3.9

1 Commits
v5.0.0-alp ... v5.0.0

Author SHA1 Message Date
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
Expand all files Collapse all files

Diff Content Not Available