Skip to main content
summaryrefslogtreecommitdiffstats
path: root/plugins/org.eclipse.emf.compare.rcp
AgeCommit message (Expand)AuthorFilesLines
2022-03-22Remove log4j 1 dependencylgoubet4-151/+83
2021-02-23Open ranges to accept Guava 30.1lgoubet1-2/+2
2019-11-05Switch EMF Compare to Guava 27lgoubet1-2/+2
2018-06-22bump versionslgoubet2-2/+2
2018-06-22Extension point to provide specific matching rules for equality helperStéphane Thibaudeau6-1/+405
2017-05-11Compatibility with guava 21Laurent Goubet1-2/+2
2017-04-10[508855] Support starting comparisons from containersPhilip Langer3-1/+60
2017-04-07Bump versions for EMF Compare 3.3.1Laurent Goubet2-2/+2
2017-02-13[496582] Consider preferences scope hierarchyLaurent Delaigue9-217/+87
2017-02-10Fix java-doc of deprecated methodPhilip Langer1-3/+4
2017-01-24Depend on JDK-7Laurent Delaigue3-8/+9
2017-01-13[483798] Introduce and use context in adapter factoriesMartin Fleck5-10/+86
2016-09-14Bump versions for EMF Compare 3.3.0Laurent Goubet2-2/+2
2016-09-12Add support for additive mergeLaurent Delaigue1-0/+12
2016-06-15Switch to Eclipse mars.2Mathieu Cartaud20-84/+96
2016-06-14[495961] incompatibility between log4j 1.x and 2.xLaurent Goubet1-1/+1
2016-02-01Scalable conflict detectorMathieu Cartaud1-0/+7
2016-01-20[486093] Don't create log file if logs are offMathieu Cartaud1-36/+63
2016-01-11[483892] Take match engine registry into accountLaurent Delaigue1-2/+2
2015-10-15Extract EMFCompareConfiguration from EMFCompareRCPUIPluginMathieu Cartaud4-2/+93
2015-09-24[464739] ResourceLocationChanges become ResourceattachmentChanges.MOVEAxel Richard1-4/+0
2015-07-07[471010] Fix log4j config managementLaurent Delaigue5-6/+177
2015-05-11[466552] Increase priorities of conflict mergersStefan Dirix1-3/+4
2015-05-05[463785] ResourceLocationChange: core changes.Axel Richard1-1/+5
2015-03-04[458963] EMFCompare object doesn't use EMFCompareRCP registriesAxel Richard1-10/+21
2014-12-19Make sure the factories are not kept around as singleton instancesLaurent Goubet1-7/+1
2014-12-19Listen to the correct extension point for the adapter factories.Laurent Goubet1-1/+2
2014-11-17The ConflictMerger ranking should be above that of most othersLaurent Goubet1-1/+1
2014-11-07Various API issuesLaurent Goubet1-1/+1
2014-11-07Bump versions and fix new plugins for Mars M3Laurent Goubet2-2/+2
2014-07-18Adds Item provider preference page.Arthur Daussy3-8/+67
2014-07-18created parent module for bundles and features to factorize pom definitionsMikaël Barbero1-12/+3
2014-07-17Reworked Maven buildMikaël Barbero1-0/+9
2014-07-17Filters EMF compare adapter factories using preferences.Arthur Daussy4-15/+84
2014-07-17remove unneeded directives in some pom.xmlMikaël Barbero1-9/+0
2014-07-07FeatureMaps: Handle FeatureMapChange differencesAxel Richard1-0/+4
2014-07-01Bump versions to 3.1.0 on masterLaurent Goubet1-1/+1
2014-06-11Correct the order of processing post processors.Arthur Daussy1-1/+5
2014-06-02Add Guava 15 to the accepted rangeLaurent Goubet1-2/+2
2014-04-09normalize EOLs in the core (third pass)Axel Richard1-45/+45
2014-04-02Improvements and corrections on MatchEngineRegistryWrapper.Arthur Daussy2-14/+20
2014-04-01Improvements and corrections on ItemRegistryArthur Daussy2-3/+9
2014-03-31[429636] Create preference page for groupsArthur Daussy2-68/+0
2014-03-24Correct order on post processors.Arthur Daussy2-2/+18
2014-03-13normalize EOLs in the core (second pass)Laurent Goubet19-1783/+1783
2014-03-13[429636] Refactoring of IDifferenceGroupProviderArthur Daussy3-2/+76
2014-03-13[429441] Enable/Disable post processors.Arthur Daussy11-39/+279
2014-03-10Correct typo error on IMPL_CLASS_DESCRIPTOR_ATTR in3.0.0M6Arthur Daussy2-4/+4
2014-03-10Add WeightProvider RegistryAxel Richard6-6/+433
2014-03-07Fix @ sinceArthur Daussy1-5/+8

Back to the top