Skip to main content
summaryrefslogtreecommitdiffstats
path: root/plugins/org.eclipse.emf.compare.edit
AgeCommit message (Expand)AuthorFilesLines
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
2014-11-07Fix the "copy all non-conflicting" actionsLaurent Goubet4-1/+186
2014-11-07Bump versions and fix new plugins for Mars M3Laurent Goubet2-2/+2
2014-10-09[443695] Update Conflict Icon & LabelAxel Richard4-5/+32
2014-07-18Adds Item provider preference page.Arthur Daussy4-1/+65
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 Daussy2-40/+54
2014-07-17remove unneeded directives in some pom.xmlMikaël Barbero1-9/+0
2014-07-03FeatureMaps: Add new Diff: FeatureMapChangeAxel Richard11-99/+518
2014-07-01Bump versions to 3.1.0 on masterLaurent Goubet1-1/+1
2014-06-04Fix regression: wrapped command stack events should be forwared tooMikaël Barbero5-22/+102
2014-06-03various sonar violations fixes3.0.0RC3Laurent Goubet1-4/+2
2014-06-02Use sublist.clear instead of a remove loop.Mikaël Barbero1-6/+1
2014-06-02Add transactional compare command stackMikaël Barbero5-71/+654
2014-06-02Add Guava 15 to the accepted rangeLaurent Goubet1-2/+2
2014-05-28[434822] Conflict between move and deleteArthur Daussy1-1/+1
2014-03-13[429122] Wrong label used in StructureMergeViewerAxel Richard1-4/+4
2014-03-13normalize EOLs in the core (first pass)Laurent Goubet27-4361/+4361
2014-01-31reverting BREEs to Java 5, and versions along with themLaurent Goubet3-5/+5
2014-01-30Cleanup for version bumpingLaurent Goubet21-230/+282
2014-01-29Change BREEs to Java 1.6 and activate API error for missing descriptionsLaurent Goubet4-480/+480
2014-01-28[426726] A "toString()" is returned for the label of macroscopic changesAxel Richard1-1/+1
2013-10-14Add overlay support for any object.Mikaël Barbero1-1/+15
2013-10-11The '>' marker should be added at tree node level, not match levelMikaël Barbero1-9/+1
2013-10-11Make two IComposedStyledStrings appendable.Mikaël Barbero2-2/+23
2013-10-11Deprecate getter for change recorder and create copy command.Mikaël Barbero1-0/+4

Back to the top