Commits · 6d3a7457d1d9b6c4165a5b066be6e1da99776e2b · Moritz Aurel Pascal Schubotz / CodeMirror · GitLab

Snippets Groups Projects

Nov 01, 2016
- [merge addon] Fix corner case in alignable-chunk sorting · 6d3a7457
  Marijn Haverbeke authored 8 years ago
  
  Issue #4353
  6d3a7457
- [merge addon] Fix bug in chunk-aligning algorithm · 5105da7f
  Marijn Haverbeke authored 8 years ago
  
  Closes #4353
  5105da7f
Oct 29, 2016
- Fix constructor typo for MergeView. · e2c146e6
  Adrien Bertrand authored 8 years ago
  
  e2c146e6
Oct 23, 2016
- [merge addon] Remove the end class when removing chunk styling · db12d642
  Todd Berman authored 8 years ago
  
  db12d642
Oct 21, 2016
- Add classes to each pane for isolated style changes, handle document swapping · 63bf6594
  Todd Berman authored 8 years ago
  
  63bf6594
Oct 20, 2016
- Update previous patch to change option name and clean up code · 9a316b33
  Marijn Haverbeke authored 8 years ago
  
  Issue #4288
  9a316b33
- Add `mergeMarkerLocation` to options to allow customization · 1502f805
  Todd Berman authored 8 years ago
  
  1502f805
Jul 19, 2016
- Fix accidental 'let' · 5d9808a0
  Marijn Haverbeke authored 8 years ago
  
  5d9808a0
- [merge addon] Adjust for space above editor when drawing connections · f532bda3
  Marijn Haverbeke authored 8 years ago
  
  Issue #4112
  f532bda3
Mar 02, 2016
- [merge addon] Correctly compute chunk start when copying at end of document · 11f3d969
  Marijn Haverbeke authored 9 years ago
  
  Closes #3802
  11f3d969
Feb 02, 2016
- [merge addon] Fix bug when merging a deletion at the bottom of the document · b5f98103
  Marijn Haverbeke authored 9 years ago
  
  Closes #3802
  b5f98103
Oct 20, 2015
- [merge addon] Don't suppress highlight updates when collapsing code · d71a3285
  Marijn Haverbeke authored 9 years ago
  
  Since collapsing might move previously hidden code into the viewport Issue #3599
  d71a3285
Oct 19, 2015
- [merge addon] Stop trying to require diff_match_patch · 00738408
  Marijn Haverbeke authored 9 years ago
  
  Issue #3593
  00738408
Sep 25, 2015
- [merge addon] Use CodeMirror.on to register event handler · 5c4b8de1
  Marijn Haverbeke authored 9 years ago
  
  Closes #3549
  5c4b8de1
Aug 12, 2015
- [merge addon] Assume diff_match_patch to be global · 723c9f1a
  Marijn Haverbeke authored 9 years ago
  
  Since the library is completely oblivious to module loaders Issue #3447
  723c9f1a
Feb 24, 2015
- [merge addon] Define goNextDiff and goPrevDiff commands · fb78920c
  Marijn Haverbeke authored 10 years ago
  
  Closes #2858
  fb78920c
Feb 19, 2015
- [merge addon] Update display faster on changes that add/remove lines · de684860
  Marijn Haverbeke authored 10 years ago
  
  de684860
- [merge addon] When aligning, align whole document at once · 725ef666
  Marijn Haverbeke authored 10 years ago
  
  To prevent scrolling artifacts
  725ef666
Feb 16, 2015
- [merge addon] Add an onCollapse callback · 444b0f10
  Marijn Haverbeke authored 10 years ago
  
  ... for getting information about collapsed spans
  444b0f10
- [merge addon] Support collapsing unchanged ranges in three-way merge · 19d0d1d1
  Marijn Haverbeke authored 10 years ago
  
  19d0d1d1
- [merge addon] Rewrite aligning algorithm to work with three views · 850a6f5c
  Marijn Haverbeke authored 10 years ago
  
  850a6f5c
- [merge addon] Keep chunks in an array rather than using an iterator · b67c0d43
  Marijn Haverbeke authored 10 years ago
  
  b67c0d43
Feb 15, 2015
- [merge addon] Give space elements a CSS class · 4ed39b19
  Marijn Haverbeke authored 10 years ago
  
  4ed39b19
Jan 02, 2015
- [merge addon] Keep stable scroll position when removing/adding alignment padding · 1bfa6661
  Marijn Haverbeke authored 10 years ago
  
  See http://discuss.codemirror.net/t/jittering-mousewheel-scrolling-with-merge-addon-align-mode/125
  1bfa6661
Dec 01, 2014
- [merge addon] Allow collapsing of identical stretches of text · 5d74cb02
  Marijn Haverbeke authored 10 years ago
  
  Using the collapseIdentical option.
  5d74cb02
- [merge addon] Support aligning both panels by adding empty space · b6be5c27
  Marijn Haverbeke authored 10 years ago
  
  b6be5c27
Sep 01, 2014
- [merge addon] Add diff_match_patch as explicit dependency · 9b87ca9c
  Marijn Haverbeke authored 10 years ago
  
  Closes #2783
  9b87ca9c
Aug 14, 2014
- [merge] new allowEditingOriginals option to edit all compared files · a46ad916
  amuntean authored 10 years ago
  
  a46ad916
- [merge addon] Add a revertButtons option to turn off revert buttons · 2f2fcf92
  Marijn Haverbeke authored 10 years ago
  
  Closes #2754
  2f2fcf92
May 19, 2014
- Remove version numbers from script headers again · fc41788d
  Marijn Haverbeke authored 10 years ago
  
  Bumping them for every release just adds too much git noise and history blowup.
  fc41788d
May 09, 2014
- Add license and version comment to all scripts · 01e844f0
  Marijn Haverbeke authored 10 years ago
  
  01e844f0
May 03, 2014
- Remove diff_match_patch file from distribution, link cdnjs instead · 44efdb49
  Marijn Haverbeke authored 10 years ago
  
  Issue #2529
  44efdb49
Apr 08, 2014
- [merge addon] Don't try to remove line class on lines that aren't in doc anymore · d77a0440
  Marijn Haverbeke authored 11 years ago
  
  Issue #2438
  d77a0440
Apr 07, 2014
- [merge addon] Verify that diff is up to date in left/rightChunks · 4d748d78
  Marijn Haverbeke authored 11 years ago
  
  Issue #2438
  4d748d78
Mar 09, 2014
- [merge addon] Add leftChunks and rightChunks methods · a21c491b
  Marijn Haverbeke authored 11 years ago
  
  Issue #2334
  a21c491b
Feb 28, 2014
- [merge addon] React more quickly to marker changes · 4c782baa
  Marijn Haverbeke authored 11 years ago
  
  4c782baa
- Add markerCleared, markerAdded events · 9f0622eb
  Marijn Haverbeke authored 11 years ago
  
  And listen for them in the merge addon.
  9f0622eb
Jan 28, 2014
- [merge addon] Add trailing semicolon too diff_match_patch.js · eab9b5ea
  domagoj412 authored 11 years ago
  
  (otherwise there is an error if all is minified in one file)
  eab9b5ea
Jan 23, 2014
- Wrap all modules in AMD and CommonJS-supporting shims · 38073cd5
  Marijn Haverbeke authored 11 years ago
  
  38073cd5
Dec 05, 2013
- [merge addon] Support passing in document objects as content · 6b53fa29
  Marijn Haverbeke authored 11 years ago
  
  6b53fa29