Skip to main content
summaryrefslogtreecommitdiffstats
path: root/plugins/org.eclipse.emf.compare.rcp.ui
AgeCommit message (Expand)AuthorFilesLines
2015-09-01[469853] Unresponsive merge viewer with reference changes that yieldAndreas Mayer2-76/+228
2015-08-18version bumps for 3.1.13.1.1RC1Laurent Goubet2-2/+2
2015-07-10[471010] Fix log4j config managementLaurent Delaigue3-162/+39
2015-06-09[468740] Fix By Side Group Provider: Left Side Group contains conflictsAxel Richard1-4/+6
2015-05-27Fixes findbugs with test always true.Laurent Delaigue1-4/+3
2015-05-27Fixes Findbugs about 2 identical branches.Laurent Delaigue1-14/+4
2015-05-26[467668] Fix Accept/Reject All buttons behaviour with shared models3.1.0RC2Axel Richard1-7/+11
2015-05-05[463785] ResourceLocationChange: UI changesAxel Richard6-6/+236
2015-05-05Fix some of the warnings3.1.0M7Laurent Goubet1-0/+2
2015-05-04Introduce logging with log4j.Laurent Delaigue5-2/+368
2015-03-24[461986] Fix bug in Intermediate Proxies ResolutionAxel Richard3-133/+92
2015-03-17[461986] Intermediate Proxies ResolutionAxel Richard7-51/+1246
2015-02-27[457839] Introduces model update strategies for content merge viewersPhilip Langer4-2/+240
2015-02-24[458818] NPE when conflict on multi-valued attrib. (move vs delete)Laurent Delaigue1-6/+26
2015-02-09[456796] Cascading filter shouldn't hide move differencesAxel Richard1-14/+18
2015-01-20Revert "DRAFT - Intermediate Proxies Resolution"Axel Richard9-683/+26
2015-01-20DRAFT - Intermediate Proxies ResolutionAxel Richard9-26/+683
2014-12-17[447231] DifferenceGroup: don't build a sub tree if the match is nullAxel Richard1-2/+4
2014-12-12Fix random order of ResourcesAttachmentChanges in SMVAxel Richard1-6/+8
2014-12-11Do not create all TreeItems of the structure viewer eagerlyLaurent Goubet1-0/+2
2014-12-11ResourcesAttachmentChanges must be filtered in groupsAxel Richard1-1/+2
2014-12-11Don't dispose differenceGroupProvider in EMFCCContentMergeViewerAxel Richard1-5/+3
2014-12-09Merge "[442898] Add conflict: content merge viewer displays wrong data"Mikael Barbero1-2/+13
2014-12-09Merge "Reduce the number of loops from difference group creation"Mikael Barbero2-171/+115
2014-12-09Merge "Dispose of the content viewers"Mikael Barbero3-0/+15
2014-12-09Don't keep the empty group provider aroundLaurent Goubet1-7/+13
2014-12-09Remove useless comparison fieldLaurent Goubet1-16/+0
2014-12-09Dispose of the content viewersLaurent Goubet3-0/+15
2014-12-09Reduce the number of loops from difference group creationLaurent Goubet2-171/+115
2014-12-05[442898] Add conflict: content merge viewer displays wrong dataAxel Richard1-2/+13
2014-11-07Various API issuesLaurent Goubet4-59/+73
2014-10-13[446413] StructureMergeViewer should rebuild its tree on every inputChangeArthur Daussy1-1/+1
2014-10-08[439036] FeatureMap filter shouldn't hide diffs with no equivalenceAxel Richard1-1/+3
2014-10-02Bumping minor for all plugins/features changed since Luna SR13.1.0M2Axel Richard2-2/+2
2014-09-30Copy all commands didn't work with UMLLaurent Goubet1-2/+2
2014-09-25[443031] Fix NPE on FeatureFilter.referenceIsSetAxel Richard1-5/+7
2014-09-25[441754] The default activated group is built twiceAxel Richard2-5/+12
2014-08-19UI improvement: Prevents freezing UI during groups building.Arthur Daussy9-232/+229
2014-08-13Do not use assertSame for int comparisonMikaël Barbero1-1/+0
2014-08-05[439530] Export all internal packages as x-internalMikaël Barbero1-5/+10
2014-07-18Adds Item provider preference page.Arthur Daussy3-0/+239
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-17remove unneeded directives in some pom.xmlMikaël Barbero1-9/+0
2014-07-07Add new UI filter: FeatureMap entriesAxel Richard3-1/+61
2014-07-07Add default methods implementation in AbstractDifferenceGroupProvider.Axel Richard6-48/+55
2014-07-07FeatureMaps: Handle FeatureMapChange differencesAxel Richard12-51/+458
2014-07-07Test integration of profiles in EMF Compare.Arthur Daussy1-3/+3
2014-07-01Bump versions to 3.1.0 on masterLaurent Goubet1-1/+1
2014-06-20Unit test for MDT Papyrus differences order.Arthur Daussy1-4/+4

Back to the top