Commit Graph

Select branches

Hide Pull Requests

master

modernize

new-myers-diff

webpack-upgrade

3.3.10

3.3.9

3.4.0

3.4.1

3.4.2

3.4.5

4.0.1

4.0.13

4.0.14

4.0.16

4.0.2

4.0.3

4.0.4

4.0.5

4.0.6

4.0.8

4.1.1

4.1.2

4.2.0

4.2.1

4.2.2

4.2.3

4.2.4

4.3.0

4.3.1

4.3.2

4.3.3

4.3.4

4.3.5

v4.0.13

v4.0.7

v4.3.6

v4.3.7

v4.3.8

v4.3.9

Mono Color

• 4128796bfa Played with ajax.html. It's probably no longer simple enough as an example. On the other hand it has a nice drag and drop feature. I couldn't make the "ignorews" checkbos work. Kljh 2014-08-17 00:17:39 +01:00
• 6308a6926a Added auto scrolling. Current difference is now always in viewport. Kljh 2014-08-16 20:39:03 +01:00
• 885fcd4e05 Added keyboard shortcuts à la WinMerge. Alt + Up or Down arrow : go to previous or next difference Alt + Left or Right arrow : merge difference using right or left content Kljh 2014-08-16 17:31:15 +01:00
• e4c36f35ef Revert previous commit. Too many whitespace modification makes it painful to see the actual changes. Kljh 2014-08-16 16:38:32 +01:00
• f1782d1933 Added keyboard shortcuts à la WinMerge: Alt + Up or Down arrow : go to previous or next difference Alt + Left or Right arrow : merge difference using right or left content Kljh 2014-08-16 15:55:47 +01:00
• 8b3859de40 Merge branch 'master' of https://github.com/wickedest/Mergely Jamie Peabody 2014-03-10 20:30:37 +00:00
• ad10800fa3 Fixes parsing diffs that contains text that looks like a valid diff, but clearly is not. Jamie Peabody 2014-03-10 20:28:15 +00:00
• b73bbcffc5 Merge pull request #15 from alexbutum/master wickedest 2014-03-03 20:41:04 +00:00
• d899762787 Beautify README Alex Butum 2014-03-03 16:43:55 +02:00
• bf96bc51a1 Fixes rendering issue. Jamie Peabody 2014-01-25 12:24:01 +00:00
• b436e6d5ff Fixes two download .diff problems - it did not contain text, and the /diff url did not work. downloading directly from browser now. Jamie Peabody 2013-11-24 19:32:31 +00:00
• 1cb4b36b40 Fixes settings update. Jamie Peabody 2013-11-02 15:58:54 +00:00
• ddaf53b1af Merge branch 'master' of https://github.com/wickedest/Mergely Jamie Peabody 2013-11-02 15:08:08 +00:00
• 900fea3edb Fixes problem where changes to options.ignorews did not cause update. Jamie Peabody 2013-11-02 15:05:55 +00:00
• 068cf26c71 Merge pull request #12 from dbluestein/readjust-top-offset wickedest 2013-10-22 00:06:54 -07:00
• cc2ca149be Fix issue with misaligned canvas when editors move relative to top of window. Dan Bluestein 2013-10-20 23:15:28 -07:00
• 938acf5f36 A bit of refactoring. Jamie Peabody 2013-06-30 20:11:57 +01:00
• bdd060556b Tidy-up Jamie Peabody 2013-06-30 20:11:45 +01:00
• 02b5df3d87 Fixes sidebar click. Jamie Peabody 2013-06-24 22:34:45 +01:00
• 1b21779bcf Added url parameters, removed crap social code. Jamie Peabody 2013-06-24 22:27:06 +01:00
• 290f7606c7 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. Jamie Peabody 2013-06-24 20:20:19 +01:00
• a2e06706cf Merge pull request #10 from eminence/fixclick wickedest 2013-06-21 14:49:58 -07:00
• cbd61e600d Fix clicking on the clhs and crhs elements Andrew Chin 2013-06-21 17:17:31 -04:00
• 91f1a2158d Fixes autoupdate issue to ensure there is no update if scrolled or resized. Jamie Peabody 2013-06-20 22:36:01 +01:00
• f77a66c398 Added 'viewport' option to enable/disable the viewport. Updated documentation and editor options. Jamie Peabody 2013-06-13 20:22:46 +01:00
• 09c9e31a0d Fixes issue where merge left, from added lines, were not being correctly inserted into the lhs. Jamie Peabody 2013-06-13 19:35:26 +01:00
• 0cd70a833f Added 'rhs_margin' option that accepts 'left' or 'right' to indicate the side to render the margin. Defaults to 'right'. Jamie Peabody 2013-06-06 18:11:29 +01:00
• 18bc465d90 Removed window height (was unused). Jamie Peabody 2013-05-12 20:03:46 +01:00
• eb3b45ff92 Removed debug code. Jamie Peabody 2013-05-12 19:56:41 +01:00
• ea2263ff29 New inner-line diff algorithm. Added method 'unmarkup' to clear markup. Added option: vpcolor. Fixed autoresize and resize. Jamie Peabody 2013-05-12 19:52:47 +01:00
• a3e50f8d8e Initial fix for auto-height and multiple editors. Jamie Peabody 2013-03-09 13:48:46 +00:00
• c382afa2a5 Fixed setting lhs/rhs using CodeMirror's setValue. Jamie Peabody 2013-03-03 22:45:56 +00:00
• 274d85bf05 Made use of CodeMirror viewport to greatly improve performance. Added settings to toggle paragraph LCD; line wrapping; white space; and side bars. Released with CodeMirror 3.1. Jamie Peabody 2013-02-24 21:57:25 +00:00
• 49f57eb72b Major work to update Mergely to work with the head of codemirror git. Jamie Peabody 2013-02-10 20:19:35 +00:00
• eaf41856fa Fixed rendering issue where changes were skipped. Upgraded to work with jquery 1.9.0. Jamie Peabody 2013-02-03 21:00:30 +00:00
• 2d0faa2b74 Tidy-up. Jamie Peabody 2013-01-05 20:06:33 +00:00
• 5ddd7a5f3c Updated reference document. Jamie Peabody 2013-01-05 15:07:58 +00:00
• 7a65625cb2 Added ignore white space Fixed editor bug re-applying settings Added options method (with no arguments) Jamie Peabody 2013-01-05 14:45:18 +00:00
• 81be394a58 Fixed missing .length on change_funcs. Jamie Peabody 2012-11-17 14:35:15 +00:00
• e13685e190 Normalize line endings Jamie Peabody 2012-11-15 20:04:55 +00:00
• 4e50e186c5 Merge branch 'master' of https://github.com/wickedest/Mergely Jamie Peabody 2012-11-15 20:03:46 +00:00
• 2d33a9ecd0 Added .gitattributes Jamie Peabody 2012-11-15 20:02:56 +00:00
• 6d40b165eb Normalize line endings Jamie Peabody 2012-11-15 19:26:33 +00:00
• 604552aeee Added .gitattributes Jamie Peabody 2012-11-15 19:24:58 +00:00
• c1ff6a2d44 Using jQuery instead of $ for compatability with other libraries. Jamie Peabody 2012-11-14 22:00:29 +00:00
• ff1292a40b Replaced 'for x in arr' with proper loops, or used hasOwnProperty to avoid conflict with modified prototypes. Jamie Peabody 2012-11-14 21:53:40 +00:00
• 5b390c6737 Mergely 3.0 that works with CodeMirror 3.0 beta. Jamie Peabody 2012-11-03 18:17:49 +00:00
• b5e669d330 Fixed canvas width issue Jamie Peabody 2012-07-31 20:32:47 +01:00
• ae02695b13 2.4 changes Jamie Peabody 2012-04-09 19:23:33 +01:00
• b9b550852b initial check-in Jamie Peabody 2012-03-06 21:56:00 +00:00
• 170fa4c6ad updated README Jamie Peabody 2012-03-06 21:34:07 +00:00
• 7f5e382c51 updated README Jamie Peabody 2012-03-06 21:29:00 +00:00
• e1a5c8f8f3 initial check-in Jamie Peabody 2012-03-06 18:46:25 +00:00
• 8484335f92 first commit Jamie Peabody 2012-03-06 18:36:11 +00:00