Skip to main content
summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
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
2016-06-07[495586] Disable XML handler cache to prevent erroneous error reportsLaurent Goubet1-1/+1
2016-06-07[493527] Correct conflict when concurrently unapplying UML stereotypesMartin Fleck7-8/+119
2016-06-03Add Papyrus context utilityPhilip Langer14-16/+462
2016-06-03Store all file URIs that have initially been in scopePhilip Langer11-16/+215
2016-06-03[493921] User can totally deactivate filtersLaurent Delaigue12-78/+347
2016-06-03[495334] [Testing Framework] Ancestor not loaded correctlyMartin Fleck1-3/+4
2016-06-02Migrate IgnoreDiFileChangesInGitMergeTest to new test frameworkPhilip Langer12-1535/+48
2016-06-02Support more flexible parameters of test methods in test frameworkPhilip Langer5-27/+95
2016-05-31Add EMFCompare specific runner for runtime testsMathieu Cartaud123-1030/+4384
2016-05-31[493650] Fix order of merged childrenLaurent Delaigue14-310/+508
2016-05-30Fix wrong conflict detectionsLaurent Delaigue2-4/+6
2016-05-30[494723] Use safeEGet instead of eGetLaurent Goubet5-11/+12
2016-05-30Remove jdt.annotations from Target PlatformsLaurent Delaigue4-6/+2
2016-05-27Remove unused msg in mergetext.propertiesLaurent Delaigue1-1/+0
2016-05-24[493563] Support ElementTypeSetConfigurationRegistry in Mars and NeonPhilip Langer1-14/+25
2016-05-24[471157] StackOverflow still present on Sirius diagramsLaurent Goubet1-2/+1
2016-05-20[471045] Fix ArrayIndexOutOfBoundsException in model resolutionAndreas Mayer4-3/+87
2016-05-19Fix localization for papyrus support pluginLaurent Goubet2-1/+3
2016-05-18[492190] Stereotypes not displayed in SMV for SYSML elementsAlexandra Buzila8-14/+168
2016-05-12Happy checkstyle3.2.0RC1Philip Langer3-12/+37
2016-05-12Fix checkstyle on RACConflictSearchLaurent Delaigue1-0/+6
2016-05-10[488551] Add hook for initializing the ElementTypeSetConfigurationReg.Philip Langer9-96/+189
2016-05-10[492261] Merge ResourceAttChange in the right resourceMathieu Cartaud9-1/+303
2016-05-09[493255] Fix scalable conflict detectorLaurent Delaigue8-67/+173
2016-05-09[488089] Fix random position of diagrams after mergeSimon Delisle24-2/+529
2016-04-27[492341] Res Att Change correctly implies diffs3.2.0M7Mathieu Cartaud15-21/+276
2016-04-21[488700] Change label to Conflict [X out of Y differences unresolved]Philip Langer11-86/+71
2016-04-19[RCPTT Tests] simplify create AUT shell scriptAxel Richard1-73/+76
2016-04-18Update RCPTT TestsAxel Richard2-9/+19
2016-04-01Update RCPTT testsAxel Richard3-12/+24
2016-04-01Update Neon target fileAxel Richard1-56/+57
2016-04-01Update ModelExtensionUtilAxel Richard5-10/+107
2016-03-25[490430] Fix StackOverflowErrorLaurent Delaigue1-1/+12
2016-03-21Update RCPTT testsAxel Richard34-222/+238
2016-02-29Fix git related tests3.2.0M6Mathieu Cartaud1-1/+1
2016-02-29Fix target platform for marsLaurent Delaigue2-54/+55
2016-02-26[488549] Fix disposed widget in ProblemIndicationCompositeLaurent Delaigue1-1/+1
2016-02-26[467547] Fix IllegalArgumentException in CompareToolBarLaurent Delaigue1-6/+10
2016-02-26Fix NPEs because comp.getMatch can return nullLaurent Delaigue2-17/+35
2016-02-26[487561] Fix issue on resource attachment move conflict detectionMathieu Cartaud33-23/+273
2016-02-25Fix error in Git tests setupMathieu Cartaud2-14/+22
2016-02-24[487119] Improve diagnostics handling in comparison viewerAlexandra Buzila8-38/+642
2016-02-23[487306] Use only relevant diagnostic to compute traversalsMathieu Cartaud1-8/+0
2016-02-19[487561] Fix missing conflict on resource uncontrolMathieu Cartaud19-0/+437
2016-02-19Fix error in the setup of EGit related testsMathieu Cartaud3-4/+9

Back to the top