mirror of https://github.com/wickedest/Mergely.git synced 2026-03-24 09:48:39 +08:00

Go to file

Removed useless function get_changes. Moved current_diff out of this.settings (and along this.changes)
Handle the case where comparing identical files (e.g. changes.length==0).

ajax.html uses https for jquery so that it can be hosted on a https server.
ajax.html uses full available screen width, auto height is trickier (note that call to _auto_height is commented out in mergely.js).

2014-08-17 08:11:13 +01:00

doc

Complete rewrite of the editor. Added search previous. Minor bug fixes include: issues with merging; scroll indicator out of alignment with actual source; inner-markup; resize.

2013-06-24 20:20:19 +01:00

editor

Fixes rendering issue.

2014-01-25 12:24:01 +00:00

examples

Morning clean up.

2014-08-17 08:11:13 +01:00

lib

Morning clean up.