Skip to main content
summaryrefslogtreecommitdiffstats
path: root/plugins/org.eclipse.emf.compare.edit
AgeCommit message (Expand)AuthorFilesLines
2021-02-23Open ranges to accept Guava 30.1lgoubet1-3/+3
2020-05-11[562321] Improved Undo/Redo actionsGlenn Plouhinec1-5/+64
2019-11-05Switch EMF Compare to Guava 27lgoubet1-3/+3
2019-07-16Ignore "originalTargetObjects" from the EMF Compare change recorderlgoubet2-33/+112
2019-02-25Opened EMF Compare APIWilliam Piers1-3/+15
2018-12-11[514079] Improve mirroring supportPhilip Langer8-360/+710
2018-05-01Improve performance of AbstractCopyCommand.getChangedDiffsPhilip Langer1-6/+6
2018-04-19[521948] Support changing the state of diffs already in terminal statePhilip Langer3-51/+321
2018-03-16Allow proxy resolution from the EMF Compare structure merge viewerLaurent Goubet1-2/+54
2018-03-13[521886] Avoid validation in EMFCompareEditingDomainPhilip Langer1-5/+49
2017-05-11Compatibility with guava 21Laurent Goubet1-3/+3
2017-04-07Bump versions for EMF Compare 3.3.1Laurent Goubet2-2/+2
2017-03-14Improve final state and MergeData when mergingLaurent Delaigue1-63/+82
2017-01-24Add @Override and depend on emf.edit 2.10.0+Laurent Delaigue10-13/+6
2017-01-24Depend on JDK-7Laurent Delaigue3-9/+19
2017-01-13[483798] Introduce and use context in adapter factoriesMartin Fleck7-15/+221
2017-01-11[488618] Ignore missing image resourcesPhilip Langer8-14/+88
2016-10-24[506344] Multiple TooltipProvider instantiated for each difference3.3.0M3Axel Richard6-16/+25
2016-10-24[506299] Match Node displays "Match" after mergeAxel Richard2-2/+47
2016-10-17Refactor OverlayImageProvider to use StringBuildersMathieu Cartaud1-11/+11
2016-10-17[505986] Fix decorator on conflicting refined diffsMathieu Cartaud1-8/+15
2016-09-14Bump versions for EMF Compare 3.3.0Laurent Goubet2-2/+2
2016-07-15[497399] tagged values tooltips throw IAEsLaurent Goubet1-1/+2
2016-07-11[497492] Fix NPE in tooltip providerLaurent Delaigue1-0/+3
2016-07-11Format with mars formatter files forgotten in previous iterationMathieu Cartaud1-6/+3
2016-06-15Switch to Eclipse mars.2Mathieu Cartaud13-62/+79
2016-04-21[488700] Change label to Conflict [X out of Y differences unresolved]Philip Langer1-2/+3
2016-01-05NPE in ResourceAttachmentChangeTooltipProviderLaurent Delaigue1-16/+28
2015-12-17[484542] NPE in ReferenceChangeTooltipProviderLaurent Delaigue2-3/+6
2015-10-01Implementation of contextual tooltipsMathieu Cartaud19-37/+2119
2015-09-24[476207] Handle Move kind for ResourceAttachmentChangesAxel Richard2-0/+6
2015-09-07Revert "Implementation of contextual tooltips"Laurent Delaigue10-189/+35
2015-09-03[474696] Include adapterFactory schema in the buildStefan Dirix1-2/+4
2015-09-03Implementation of contextual tooltipsMathieu Cartaud10-35/+189
2015-08-18Bump version for neon M1Laurent Goubet2-2/+2
2015-06-22ComparisonUtil.getComparison(diff) where neededLaurent Delaigue1-1/+1
2015-06-17[469355] Fix conflicts label shows wrong number of diffsAxel Richard1-0/+1
2015-05-26[467668] Fix Accept/Reject All buttons behaviour with shared models3.1.0RC2Axel Richard1-42/+6
2015-05-05[463785] ResourceLocationChange: core changes.Axel Richard2-5/+6
2015-05-05Fix some of the warnings3.1.0M7Laurent Goubet4-0/+6
2015-04-27[463785] Add new concept in EMF Compare: ResourceLocationChangeAxel Richard11-7/+386
2015-03-17[461986] Intermediate Proxies ResolutionAxel Richard1-2/+15
2015-03-12[461504] Removes line-breaks in UI from attribute change valuesPhilip Langer2-2/+16
2015-02-09[436050] Fix copy all does nothingAxel Richard1-2/+8
2015-01-20Revert "DRAFT - Intermediate Proxies Resolution"Axel Richard1-8/+2
2015-01-20DRAFT - Intermediate Proxies ResolutionAxel Richard1-2/+8
2014-12-16Notify resources when running merge all non conflicting diffs commandAxel Richard1-1/+3
2014-12-11Fix MergeAll Toolbar ActionsAxel Richard1-19/+7
2014-12-09[437574] Properly dispose of the editing domains we createLaurent Goubet1-15/+56
2014-11-07Various API issuesLaurent Goubet8-2/+13

Back to the top