1
0
mirror of synced 2025-12-09 15:28:12 +08:00
Commit Graph

19 Commits

Author SHA1 Message Date
Jamie Peabody
dec1e9509d fix: updated CDN example 2023-08-27 13:16:11 +01: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
Jamie Peabody
2b561c1856 chore(doc): Update CDN example 2023-08-27 11:38:38 +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
b49c9ce40f Updated README.md
Fixed tgz installation instructions.
2021-09-30 08:05:07 +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 2021-04-29 21:20:53 +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
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
Andrea
7a123a7ed7 Updates to readme file. (#124)
* Update README.md

'providing **rich** API that enables you to...' - it's not clear what a rich API means so this doesn't seem helpful, but I couldn't fix it because don't know what you mean.

* Update README.md

Co-Authored-By: Waldir Pimenta <waldyrious@gmail.com>

* Update README.md

Co-Authored-By: Waldir Pimenta <waldyrious@gmail.com>

* Update README.md

Co-Authored-By: Waldir Pimenta <waldyrious@gmail.com>

* Update README.md

Co-Authored-By: Jamie Peabody <jamie.peabody@gmail.com>

* Update README.md

Co-Authored-By: Jamie Peabody <jamie.peabody@gmail.com>

* Update README.md

Co-Authored-By: Jamie Peabody <jamie.peabody@gmail.com>
2019-10-07 13:14:02 +01:00
Edgar Costa
788c5ad17b Update README.md (#113) 2019-07-14 12:39:13 +01:00
Jamie Peabody
2c8f6cd340 chore: updated docs 2018-08-06 13:01:13 +01:00
Jamie Peabody
bde295febd Build improvements (#73)
* removed editor and initial cleanup

* cleanup

* updated jquery

* tidy up

* moved src and build to lib

* tidy up and fixed webpack

* updated readme

* removed junk

* tidy up

* works with sample and editor

* removed editor_width and editor_height

* auto width and height

* added license feature

* not doing dist

* fixed typo

* added searchcursor

* fixed typo

* doc updates

* improved comment

* updated init for cm settings

* fixed jquery/cm includes

* documentation updates

* updated changes doc

* fixed cmsettings

* updated examples
2017-12-18 21:53:03 +00:00
wickedest
3f0a3b1b4c Undo test 2015-03-23 13:51:36 +00:00
wickedest
5fcf655f7f Test 2015-03-23 13:50:55 +00:00
Alex Butum
d899762787 Beautify README
Fixed typo in "It". Added new line. Uppercased Javascript
2014-03-03 16:43:55 +02:00
Jamie Peabody
ae02695b13 2.4 changes
Added editor ability to download .diff files
Added color settings
2012-04-09 19:23:33 +01:00
Jamie Peabody
7f5e382c51 updated README 2012-03-06 21:29:00 +00:00