Skip to main content
summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
35 hours[522080] [UML] Add-add conflicts in stereotype application not detectedHEADmasterChristian W. Damus23-6/+744
41 hoursFix detection of pseudo conflicts on single-valued attribute changeslgoubet10-10/+131
2 daysRegression on the group/match right-click actions in SMWlgoubet1-2/+2
2 daysProperly describe what the conflict resolving actions will do.lgoubet1-2/+2
3 days[506928] ComparisonScopeEditorInput does not respect configuration3.3.8M2Martin Fleck6-5/+172
3 daysCancel Faster in ProximityEObjectMatcherStefan Dirix1-6/+22
3 daysAdd StructureMergeViewer customization optionslgoubet2-38/+70
3 daysShortcut the UMLPostProcessor's subset implications when possiblelgoubet1-4/+10
3 daysActivation of all Git testsAxel Richard13-1207/+36
3 daysPrevent NPE from overriden Resource implementationslgoubet2-7/+13
3 daysIgnore "originalTargetObjects" from the EMF Compare change recorderlgoubet2-33/+112
9 daysBump versions to 3.3.83.3.8M1lgoubet24-27/+27
2019-07-04Enabled "accept change" action on multiple diff selectionWilliam Piers1-9/+28
2019-07-04Adapt tests to EGit change of behaviorlgoubet1-6/+24
2019-05-29Enable users to merge all conflicts at once through right-click action3.3.7RC13.3.7lgoubet1-2/+17
2019-05-23Merging single-valued containment changes can lead to dangling elements3.3.7M5lgoubet6-3/+206
2019-05-23Typoslgoubet2-3/+3
2019-05-23Prevent LCS computation when we do not need ordering changeslgoubet1-11/+241
2019-05-09[547139] [i18n] Missing externalizations of stringsChristian W. Damus9-45/+99
2019-04-25Prevent duplicate insertion points to be shown in tree viewers3.3.7M4lgoubet1-1/+1
2019-04-22Prevent CMV disposal when user selects multiple elements in the SMWlgoubet1-0/+51
2019-04-18Only add new adapters when neededlgoubet1-8/+14
2019-04-14Iterate over the differences instead of the matcheslgoubet1-32/+4
2019-04-09Prevent OutOfMemoryErrors from the UI when switching CMV3.3.7M3lgoubet1-0/+16
2019-04-08Performance - Computing requirements timeslgoubet5-72/+203
2019-04-08The UML tests shouldn't use a cached instance of EMFComparelgoubet2-9/+6
2019-04-03Restore possibility to remove mergers from the registrylgoubet1-1/+1
2019-04-01Fixed ArrayOutOfBounds in case of empty lists3.3.7M2William Piers1-5/+10
2019-03-22Make sure we hook the UI when users provide a precomputed comparisonlgoubet1-2/+18
2019-03-21Bump EMF Compare to 3.3.7 in preparation for 2019-063.3.7M1lgoubet24-27/+27
2019-03-21Disposing of the comparison shouldn't be done by the SMVlgoubet2-2/+3
2019-03-04Avoid ClassCastException when merging feature map changes3.3.6RC1lgoubet1-2/+2
2019-03-01Allowed customization of content merge viewersWilliam Piers2-4/+4
2019-02-26Bump versions for 3.3.6 for 2019-033.3.6M33.3.6lgoubet24-27/+27
2019-02-26patch ModelGitMergeEditorInput for EGit 5.3.0 compatibilitylgoubet1-31/+32
2019-02-26Suppress guava nested concatenationslgoubet1-10/+6
2019-02-25Opened EMF Compare APIWilliam Piers3-5/+26
2019-02-11Remove accidental use of Guavalgoubet1-2/+1
2019-02-11SWTException when switching comparisons in a compare dialoglgoubet6-17/+52
2019-02-11Allow clients to provide pre-computed comparisons to the compare UIlgoubet2-9/+43
2019-01-09[543292] Make GitTestSupport compatible with EGit 5.2Philip Langer3-4/+8
2018-12-11[527567] Provide support for a general property merge viewer3.3.5Philip Langer21-4/+3040
2018-12-11[514079] Improve mirroring supportPhilip Langer44-1240/+1459
2018-12-04Ignore failing git tests for nowlgoubet3-0/+13
2018-12-03Bump versions to 3.3.5lgoubet24-27/+27
2018-12-03Use a released version of Siriuslgoubet2-2/+2
2018-11-30[541730] Reverts d59c924 due to an UI freezelgoubet1-4/+0
2018-08-16Fix bundle meta-dataPhilip Langer10-18/+38
2018-06-22bump feature versions3.3.4M13.3.4lgoubet26-29/+29
2018-06-22bump versionslgoubet24-24/+24

Back to the top