Skip to main content
AgeCommit message (Expand)AuthorFilesLines
2016-11-02[506723] Fix merge dependencies for cascading diffs3.3.03.3Mathieu Cartaud1-11/+15
2016-10-24Merge branch 'master' into 3.3Laurent Delaigue76-724/+3526
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-21[501569] The cascading filter does not hide merged cascading diffsAxel Richard10-19/+274
2016-10-17Refactor OverlayImageProvider to use StringBuildersMathieu Cartaud1-11/+11
2016-10-17[505986] Fix decorator on conflicting refined diffsMathieu Cartaud1-8/+15
2016-10-17[505950] Fix filter not hiding directly pseudo-conflicting diffsMathieu Cartaud9-27/+146
2016-10-17[505983] Pseudo-conflicts should be real on ADD/ADDLaurent Delaigue10-241/+184
2016-10-17[505994] Fix cascading filter on refined diffsLaurent Delaigue6-3/+225
2016-10-13Fix Additive Merge testsMathieu Cartaud1-7/+19
2016-10-13[502834] Fix NPE in OpaqueElementBodyChangeAccessorMathieu Cartaud1-0/+7
2016-10-13[502836] Update MatchAccessor : handle diffAxel Richard10-21/+420
2016-10-13[503035] Fix BreadthFirstIterator where some nodes may never be usedMathieu Cartaud2-16/+160
2016-10-13Miscellaneous Findbugs fixesAxel Richard3-33/+54
2016-10-13[501864] Refactoring of group providers & filtersLaurent Delaigue10-192/+506
2016-10-11[501864] Adapts diff filters for conflicting refined diffsTanja Mayerhofer6-46/+603
2016-10-05[501864] Join conflicts with overlapping diffs in SMVTanja Mayerhofer8-22/+481
2016-10-05[501864] Replace refining diffs in SMV conflict nodes with refined diffs Tanja Mayerhofer9-12/+287
2016-09-28[501864] Do not add refined diffs to conflicts of refining diffsPhilip Langer9-313/+327
2016-09-14Bump versions for EMF Compare 3.3.0Laurent Goubet94-102/+213
2016-09-13Fix cascading filter for special casesLaurent Delaigue1-23/+65
2016-09-13Change SMV groups algorithmMathieu Cartaud47-2362/+1813
2016-09-13Activate checkstyle for Git test frameworkMathieu Cartaud20-44/+489
2016-09-13Fix Javadoc of ComparisonUtil.getAssociatedDiffsPhilip Langer1-16/+10
2016-09-12Add support for additive mergeLaurent Delaigue117-346/+6498
2016-09-12[442897] Fix markers issue in SMVMathieu Cartaud6-161/+64
2016-09-12Fix and optimize usage of StorageTraversal.getStorages()Philip Langer8-163/+107
2016-09-12[495753] Fix preference pages inconsistent layoutsSimon Delisle12-254/+262
2016-08-01Bug 499003 - Fix visibleWhen of contribution to compareWithMenuAndreas Mayer2-15/+6
2016-07-28[498583] Fix NPE during automatic profile migrationStefan Dirix3-10/+54
2016-07-25[497066] 'Problems' tab should not be shown automatically for warningsMartin Fleck3-21/+58
2016-07-25[494763] - Stereotypes not displayed in SMVAlexandra Buzila3-29/+70
2016-07-25Split tests to isolate dependencies to papyrusLaurent Delaigue60-19/+266
2016-07-15[497399] tagged values tooltips throw IAEsLaurent Goubet1-1/+2
2016-07-12Do not consider a container deletion to conflict with unsets under itLaurent Goubet12-105/+177
2016-07-11[497492] Fix NPE in tooltip providerLaurent Delaigue2-7/+10
2016-07-11Format with mars formatter files forgotten in previous iterationMathieu Cartaud23-1499/+1020
2016-07-07update tp to follow UML designerLaurent Goubet2-3/+3
2016-07-01[487595] Add specialized PapyrusTreeContentMergeViewerEdgar Mueller23-133/+3085
2016-07-01Add rebase and cherry-pick operations in test frameworkMathieu Cartaud27-509/+775
2016-07-01Fix test broken by new default preference on pre-mergeMathieu Cartaud1-1/+26
2016-07-01[495259] Add support for UML profile migration scenariosMartin Fleck86-137/+4763
2016-06-23Activate checkstyle for test frameworkMathieu Cartaud23-119/+370
2016-06-15Switch to Eclipse mars.2Mathieu Cartaud768-14259/+19554
2016-06-14Bug 495741 - Fix computation of visible and filtered diffsAndreas Mayer2-31/+109
2016-06-14Add a preference for pre-merge on conflictLaurent Delaigue6-2/+67
2016-06-14[495961] incompatibility between log4j 1.x and 2.xLaurent Goubet5-5/+5
2016-06-10[479449] Introduce MultiplicityElementChangesAlexandra Buzila75-127/+2375
2016-06-08[486923,488941] Fix Stack Overflow in ThreeWayComparisonGroupProviderEdgar Mueller7-20/+146

Back to the top