Skip to main content
AgeCommit message (Collapse)AuthorFilesLines
2011-05-16Initial provisioning of the logical model integration's examplelogical_resourceslgoubet80-0/+16581
2011-05-16Introducing model resolver extension pointlgoubet15-53/+201
2011-05-11Make sure than EMF Compare uses the ModelProvider when called from thelgoubet6-12/+111
synchronize view [345415] needs to be fixed in order to remove a workaround commited with this.
2011-05-11Make sure that the structure viewer delegates to the adapter factorylgoubet1-8/+7
if AbstractDiffExtension#getText returns null.
2011-05-11Draft implementation for the model resolving extension pointlgoubet18-161/+1045
2011-05-09eGit bug, trying to resolve "changed but not changed" fileslgoubet18-7/+8
2011-05-09eGit bug, trying to resolve "changed but not changed" fileslgoubet4-47/+51
2011-05-09eGit bug, trying to resolve "changed but not changed" fileslgoubet1-9/+10
2011-05-09eGit bug, trying to resolve "changed but not changed" fileslgoubet3-2/+1
2011-05-09eGit bug, trying to resolve "changed but not changed" fileslgoubet21-72/+142
2011-05-09eGit bug, trying to resolve "changed but not changed" fileslgoubet9-10/+14
2011-05-09eGit bug, trying to resolve "changed but not changed" fileslgoubet22-64/+70
2011-05-09eGit bug, trying to resolve "changed but not changed" fileslgoubet16-57/+397
2011-05-09Prepare double click action in the synchronize viewlgoubet3-38/+106
2011-04-22Enhancements of the logical resources support. The EMF Compare modellgoubet16-204/+1267
is now displayed in the synchronize view and supports direct comparisons on the model.
2011-04-08Stabilizing the initial implementationlgoubet2-39/+65
2011-04-08Further development of the logical resource implementation for EMFlgoubet11-104/+756
2011-04-07Commiting current WIP on logical resourceslgoubet17-128/+1346
2011-03-24Tries and properly add the logical resources project without removinglgoubet12-0/+309
the core
2011-03-24Revert "Revert "Revert "Adding project for logical resource testing"""lgoubet51-317/+4766
This reverts commit 60f06092d553e93ecb470052416581e8b0786ee8
2011-03-24Revert "Revert "Adding project for logical resource testing""lgoubet51-4766/+317
This reverts commit a0135f09a7210b1c829bd1c90148e3e9a645eccd
2011-03-24Revert "Adding project for logical resource testing"lgoubet51-317/+4766
This reverts commit c58672dd5a72a812d2c31e2adc86253f7928bed9
2011-03-23Adding project for logical resource testinglgoubet51-4766/+317
2011-03-23Revert "Testing logical resource implementation"lgoubet1-8/+7
This reverts commit 115fd07bedf97321ea9c4a50c95b6c783f368c27
2011-03-23Merge branch 'refs/heads/master' of ↵lgoubet2-6/+13
2011-03-23Testing logical resource implementationlgoubet1-7/+8
2011-03-15update promoter ant versionsCedric Brun1-2/+2
2011-03-15changing the orbit repCedric Brun1-1/+1
2011-03-15oops, forgot one ref to orbitCedric Brun1-1/+1
2011-03-15use orbit update site during the buildCedric Brun1-3/+10
2011-03-10[336326] Potential NPEs : the icon is optionallgoubet1-8/+15
2011-03-09[327901] Potential NPEs in the merge processlgoubet2-2/+2
2011-03-09Updating copyrights for 2011lgoubet731-820/+820
Changing copyrights for contribution [199745]
2011-03-09Adding copyright noticelgoubet4-55/+131
2011-03-09various fixes and potential NPEslgoubet21-808/+1180
2011-03-08revert back the compilation issue with the deprecated DefaultScope()Cedric Brun2-3/+15
to keep Eclipse 3.6 compatibility
2011-03-08removing references to the reference doc now that we now more buildCedric Brun4-23/+0
the javadoc for the online help.
2011-03-07Fix compile error with 3.7 and DefaultScope() being deprecatedCedric Brun1-5/+5
2011-03-07Moving to Eclipse 3.7Cedric Brun1-1/+1
2011-03-07enabling a set of JUnit tests for the merge and fix a long standing test ↵Cedric Brun23-260/+461
failure on 3Way compare and merge. Now supporting the diff and merge of non unique multi-valued attributes and the corresponding merge now handle the order and dupplication gracefully.
2011-03-01updating the build script to build on top of indigoCedric Brun1-13/+13
2011-03-01bumping version number from 1.1.2 to 1.2.0Cedric Brun50-50/+50
2011-02-03Merge remote branch 'origin/master'1.1Cedric Brun1-1/+3
2011-02-03adding cs:dependecy for uml2 resourceCedric Brun1-0/+1
2011-02-02Adding missing plugin dependencies for UML and EACHONCE models.Patrick Koenemann1-1/+3
2011-02-02adding UML2 resource mapCedric Brun1-0/+1
2011-02-02adding the uml dependency in the bucky master dep fileCedric Brun1-0/+1
2011-02-02Adding an explicit UML dependency on MPatch tests to make sure theCedric Brun1-0/+1
plugin will be added to the build.
2011-02-01still working on range generationCedric Brun1-4/+6

Back to the top