Skip to main content
summaryrefslogtreecommitdiffstats
path: root/plugins/org.eclipse.emf.compare.edit
AgeCommit message (Expand)AuthorFilesLines
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
2013-10-11Deprecate CopyCommandMikaël Barbero1-0/+2
2013-10-11Introduce MergeMode and rewrite actions.Mikaël Barbero5-36/+214
2013-10-11Change canExecute to test there is at least one differenceMikaël Barbero1-5/+1
2013-09-30Generate stateful compare item providers.Mikaël Barbero2-169/+40
2013-09-27Use nullOrEmpty test for strings returned AdapterFactoryItemDelegator.Mikaël Barbero4-15/+17
2013-09-27Modify custom AdapterFactory.Mikaël Barbero2-0/+195
2013-09-26[416936] - UML Refined elements filter changes diff orderAxel Richard3-231/+248
2013-09-25Add Javadoc to providers class and clean up some classesMikaël Barbero7-33/+77
2013-09-25Add javadoc to overlay class and simplify its implementation.Mikaël Barbero27-76/+161
2013-09-23Happy checkstyle.Mikaël Barbero3-46/+242
2013-09-23Happy checkstyleMikaël Barbero1-10/+14
2013-09-23[417791] Fix overlay marking the merge state in accept/reject modeMikaël Barbero1-3/+11
2013-09-23Remove deprecated classMikaël Barbero1-84/+0
2013-09-23Remove deprecated methods.Mikaël Barbero2-28/+1
2013-09-23Add Javadoc to compare editing domain related classesMikaël Barbero3-33/+148
2013-09-23Remove deprecated classMikaël Barbero1-69/+0
2013-09-23Add javadoc to compare command stack related classesMikaël Barbero4-31/+244
2013-09-23Make merge overlay for LtR and RtL bolderMikaël Barbero4-0/+0
2013-09-11Update reject diff overall icon.Axel Richard1-0/+0
2013-08-19Prepare for version 2.22.2.0M1Mikaël Barbero2-3/+3
2013-08-14Simplify display of conflict objectsMikaël Barbero2-12/+16
2013-07-29Add diagnostic to comparison object.Cedric Notot2-42/+56
2013-07-29Removed RankedAdapterFactory class.Mikaël Barbero1-36/+0

Back to the top