Skip to main content
summaryrefslogtreecommitdiffstats
path: root/plugins/org.eclipse.emf.compare.ide.ui
AgeCommit message (Expand)AuthorFilesLines
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-24[487119] Improve diagnostics handling in comparison viewerAlexandra Buzila1-36/+148
2016-02-23[487306] Use only relevant diagnostic to compute traversalsMathieu Cartaud1-8/+0
2016-02-19[487306] SyncModel error diagnostics not displayedAlexandra Buzila1-1/+2
2016-02-15[473985] Enable comparison dialog in pure e4Stefan Dirix11-51/+285
2016-02-11[486940] Mark also truncated resources as mergedPhilip Langer1-22/+19
2016-02-01Improve progress monitor to allow cancelling3.2.0M5Mathieu Cartaud1-0/+4
2016-01-27[474723] Introduce IEMFComparisonSource to support custom comparisonsStefan Dirix8-35/+434
2016-01-20[485512] Fix NPE in ResourceDependencyProviderLaurent Delaigue1-1/+1
2016-01-13[485538] Fix ClassCastException in MergeResolutionManagerMathieu Cartaud1-0/+4
2016-01-11[483892] Take match engine registry into accountLaurent Delaigue1-2/+2
2016-01-08Add debug logging for merge actionsMathieu Cartaud1-1/+18
2015-12-17[484543] NPE in EMFCompareContentMergeViewerLaurent Delaigue1-1/+3
2015-12-03[480388] Avoid recursion when loading packages or profiles.Laurent Goubet1-14/+22
2015-10-28Revert "[462863] Staging Prompt after Resolving Conflicts"3.2.0M3Axel Richard1-7/+5
2015-10-27[462863] Staging Prompt after Resolving ConflictsMichael Borkowski1-5/+7
2015-10-22Revert [462863] Staging Prompt after Resolving ConflictsAxel Richard1-1/+1
2015-10-21[475586] Reject sub-diffs of rejected diffs when cascading filter is onAxel Richard1-0/+9
2015-10-19[475586] Reject sub-diffs of rejected diffs when cascading filter is onAxel Richard4-78/+5
2015-10-16[462863] Staging Prompt after Resolving ConflictsMichael Borkowski1-1/+1
2015-10-15Extract EMFCompareConfiguration from EMFCompareRCPUIPluginMathieu Cartaud15-92/+92
2015-10-05[474030] Fix SWTException when CompareDialog is canceledStefan Dirix1-27/+30
2015-10-05[478620] Cherry pick operation hangsAlexandra Buzila1-2/+2
2015-10-01Happy checkstyle in public packages of emf.compare.ide.uiPhilip Langer3-16/+29
2015-10-01Implementation of contextual tooltipsMathieu Cartaud3-7/+80
2015-10-01[478032] Fix accept/reject dropdown iconMathieu Cartaud1-0/+7
2015-09-25[462863] Extension Point for detecting complete merge resolutionsMichael Borkowski11-2/+494
2015-09-24Revert "[475473] Prevent IdenticalResourceMinimizer to cut away movedAxel Richard1-137/+18
2015-09-24Merge with new remote projectsAxel Richard1-14/+50
2015-09-23Fix potential NPE in NavigatableAxel Richard1-1/+2
2015-09-18Fix NPE in EMFResourceMappingMergerLaurent Delaigue1-14/+16
2015-09-15Fix label issues when using the MergeTool on merge conflictsMathieu Cartaud2-16/+27
2015-09-11[477181] Init MergeAction cascading enablement when the UI gets createdcbrun2-0/+12
2015-09-07Revert "Implementation of contextual tooltips"Laurent Delaigue9-1584/+7
2015-09-03[476363] Remove non-existing resources from storage before mergePhilip Langer1-1/+22
2015-09-03[475473] Prevent IdenticalResourceMinimizer to cut away moved resourcesPhilip Langer1-18/+137
2015-09-03Implementation of contextual tooltipsMathieu Cartaud9-7/+1584
2015-09-03[473190] Fix NPE in the CompareStructureMergeViewerMathieu Cartaud1-2/+5
2015-09-02Improve error reporting for sync model computation issuesLaurent Delaigue2-5/+25
2015-09-02[476417] Collects the conflicting resources from all conflicting diffsPhilip Langer1-15/+22
2015-09-02[464386] Add commit short id to make label more distinguishibleMathieu Cartaud2-17/+93
2015-08-31[411485] Fix the CMV display for move between two containersMathieu Cartaud1-38/+52
2015-08-18Bump version for neon M1Laurent Goubet2-2/+2
2015-07-31Only mark conflicting files as conflicting instead of the whole modelLaurent Goubet1-17/+126
2015-07-31Functional tests for the remote resolving and associated round-tripLaurent Goubet2-33/+63
2015-07-30[470332] Resolving a conflict causes loss of previous changesAlexandra Buzila1-1/+3
2015-07-30[470268] Consider potential renames in model resolutionPhilip Langer8-27/+883
2015-07-09[470398] Fix NPE in EMFCStructureMergeViewerContentProvider#getChildrenAxel Richard1-1/+5
2015-07-07[470503] Some cascading diffs not merged with menu/merge actionsAxel Richard2-1/+41

Back to the top