245 Commits

Author SHA1 Message Date
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
Jamie Peabody
fdfbf8d131 chore(release): 4.3.8 v4.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
dfdba3c020 ci: allow merge type 2021-11-21 13:56:30 +00:00
Jamie Peabody
b930b8bbd6 chore(release): 4.3.7 v4.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 v4.3.6 2021-11-21 13:08:27 +00:00
Jamie Peabody
08e7b9735a ci: update tag latest 2021-11-21 13:06:51 +00:00
Jamie Peabody
26cb3f7220 ci: update tag latest 2021-11-21 13:01:09 +00:00
Jamie Peabody
97dc439cd4 ci: use token 2021-11-21 12:56:32 +00:00
Jamie Peabody
51189f2155 ci: use token 2021-11-21 12:52:50 +00:00
Jamie Peabody
c8e0b8e88a ci: use token 2021-11-21 12:43:01 +00:00
Jamie Peabody
7732f9fab5 ci: update publish CI 2021-11-21 12:29:39 +00:00
Jamie Peabody
e1763b3b9d ci: update publish CI 2021-11-21 12:27:48 +00:00
Jamie Peabody
0de9e87df8 ci: added standard-version 2021-11-21 12:22:50 +00:00
Jamie Peabody
aa4d934cdd chore: removed bower.json 2021-11-21 12:21:11 +00:00
Jamie Peabody
a92b408ce5 chore(ci): added git-conventional-commits 2021-11-21 11:00:15 +00:00
Jamie Peabody
ca1df3e4d4 chore(docs): added contributing.md 2021-11-21 10:59:43 +00:00
Jamie Peabody
addc610457 chore(ci): added workflows 2021-11-21 10:59:22 +00:00
Jamie Peabody
623a93b838 fix build 4.3.5 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>
4.3.4
2021-10-03 16:49:44 +01:00
Jamie Peabody
b9bc901dd2 patch(#152): fixes resize issue when using zoom 4.3.3 2021-10-02 14:19:15 +01:00
Jamie Peabody
b49c9ce40f Updated README.md
Fixed tgz installation instructions.
2021-09-30 08:05:07 +01:00
Jamie Peabody
712cbe8472 patch(#151): resets the current diff when setValue, clear, lhs, or rhs are called 4.3.2 2021-06-23 21:57:38 +01:00
Jamie Peabody
8c541ba51c Updated changes and bumped version 4.3.1 2021-05-19 07:57:54 +01:00
david weil
aa36977685 Updated README options : s/ignorews/ignoreaccents/ (#149)
Fixed option name in documentation
2021-05-19 07:53:47 +01:00
Jamie Peabody
4610ed3535 feat(#137): added 'summary' method 4.3.0 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
d2c41d1ee1 patch(#142): added examples README.md 4.2.4 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>
4.2.3
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 4.2.2 2020-11-23 20:06:09 +00:00
Jamie Peabody
e38cd50037 bump 4.2.1 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>
4.2.0
2020-10-15 15:13:41 +01:00
Jamie Peabody
577a324d01 release 4.1.2 4.1.2 2020-10-15 14:44:16 +01:00
Jamie Peabody
e38468b2c2 patch(#134): fixes links in readme (#135)
Co-authored-by: Jamie Peabody <jpeabody@axway.com>
2020-10-15 14:39:25 +01:00
Jamie Peabody
bd659adcfd patch(#95): fixes cursor focus on init (#133)
Co-authored-by: Jamie Peabody <jpeabody@axway.com>
4.1.1
2020-10-15 14:28:46 +01:00