Skip to main content
AgeCommit message (Expand)AuthorFilesLines
2013-03-01Bug fixes:cno/decoratorsCedric Notot1-65/+122
2013-03-01Refactoring of the graphical viewers to integrate better EMF CompareCedric Notot19-1200/+821
2013-03-01[401526] Enhance markers of graphical comparisonCedric Notot12-1790/+847
2013-03-01[400816] Phantom display of removed graphical itemsCedric Notot5-674/+1030
2013-02-25Ignore the "time out" tests : the build machine is much too slow.Laurent Goubet1-3/+13
2013-02-22[394668] MatchByContent v1 versus v2cbrun20-538/+1596
2013-02-13Fixing/suppressing warnings.Laurent Goubet4-6/+12
2013-02-13Remove unused field, externalize what should be.Laurent Goubet2-10/+10
2013-02-13remove dependency to junitMikaël Barbero1-1/+0
2013-02-12fix wrong reference to PLUGIN_IDMikaël Barbero1-2/+2
2013-02-12[399456] Managed enhance readability of Resource Attachment ChangeAxel Richard19-5009/+5170
2013-02-11[400221] More extensible mergers... and use extensions for requirementsLaurent Goubet44-2440/+2910
2013-02-04Raise the timeout to 60sec for Eclipse Hudson afterMikaël Barbero1-1/+2
2013-02-04fix regression in UML 2 tests.Mikaël Barbero1-2/+4
2013-02-01Change ComparisonSpec#getDifferences() to return differences with valueMikaël Barbero1-5/+20
2013-02-01add image for MatchedResource objects that use the provider of the firstMikaël Barbero1-7/+46
2013-02-01[399724] fix bug on items order in the structure merge viewerAxel Richard1-0/+84
2013-01-31[399652] Resolve fragments when resolving using the sync model.Laurent Goubet2-31/+32
2013-01-31Raising timeout so that hudson can get this done within the limits.Laurent Goubet1-7/+10
2013-01-30[399361] Adding performance tests for the LCSLaurent Goubet2-4/+138
2013-01-30[399361] Performance of the LCS.Laurent Goubet1-90/+174
2013-01-30[399361] Don't use a predicateLaurent Goubet1-45/+9
2013-01-30[399361] Use original collectionLaurent Goubet1-7/+4
2013-01-30[399456] Managed enhance readability of Resource Attachment Change forAxel Richard3-214/+423
2013-01-29[398360] Provide content merge viewer for resource attachment changesAxel Richard15-1838/+2483
2013-01-29Merge "[398358] Extension point for filters and groups"Mikael Barbero46-2007/+4347
2013-01-29[398358] Extension point for filters and groupsAxel Richard46-2007/+4347
2013-01-29remove unused classMikaël Barbero1-169/+0
2013-01-28[398863] Provide a merge extension mechanismCedric Notot1-1/+1
2013-01-28Fix build tychoCedric Notot1-1/+1
2013-01-28happy checkstyleCedric Notot26-130/+701
2013-01-28ignore failing testMikaël Barbero1-0/+5
2013-01-28Use EcoreUtil#convertToString to convert attribute value to string andMikaël Barbero1-24/+32
2013-01-28remove unnecessary method overriding (duplicate code)Mikaël Barbero1-23/+0
2013-01-28[399229] NPE when switching from TextMergeViewer to another merge viewerMikaël Barbero1-4/+8
2013-01-25fix wrong case in the filename of the schema in the declaration of theMikaël Barbero1-1/+1
2013-01-25handle null styled string from IItemStyledLabelProviderMikaël Barbero1-1/+6
2013-01-25remove unneeded “left is local"Mikaël Barbero1-2/+0
2013-01-25Simplify handling of adaptation of Comparison EObject to Node forMikaël Barbero47-447/+547
2013-01-25remove the dependency from to JFaceMikaël Barbero16-164/+553
2013-01-25[398099] enhanced labels in structural viewerAxel Richard19-179/+440
2013-01-25Fix compilation issue on DiagramCompareContentMergeViewerCedric Notot1-1/+2
2013-01-24Fix association merge tests on UML2.Cedric Notot1-13/+13
2013-01-24[398863] Provide a merge extension mechanismCedric Notot8-4/+253
2013-01-24[398863] Provide a merge extension mechanismCedric Notot19-158/+815
2013-01-22[366553] let edit models in conflict with Egit merge toolMikaël Barbero3-32/+52
2013-01-22[398083 #c5] change the state of difference in conflict (not doneMikaël Barbero1-4/+21
2013-01-22Add the difference to the list of notifier to watch duringMikaël Barbero1-1/+4
2013-01-22add javadocMikaël Barbero2-10/+60
2013-01-21[381143] Conflict detection issueLaurent Goubet4-10/+167

Back to the top