?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
[492190] Stereotypes not displayed in SMV for SYSML elements
2016-05-10 Mathieu Cartaud[492261] Merge ResourceAttChange in the right resource
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2016-04-27 Mathieu Cartaud[492341] Res Att Change correctly implies diffs
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2016-02-29 Mathieu CartaudFix git related tests
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2016-02-26 Mathieu Cartaud[487561] Fix issue on resource attachment move conflict...
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2016-02-25 Mathieu CartaudFix error in Git tests setup
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2016-02-23 Mathieu Cartaud[487306] Use only relevant diagnostic to compute traversals
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2016-02-19 Mathieu Cartaud[487561] Fix missing conflict on resource uncontrol
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2016-02-19 Mathieu CartaudFix error in the setup of EGit related tests
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2016-02-19 Mathieu CartaudAdd Google GSON in target platform (required by JGit)
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2016-02-09 Mathieu CartaudRemove useless method in ResourceAttachmentChangeConflictSearch
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2016-02-09 Mathieu CartaudReactivate org.eclipse.emf.compare.tests test suite
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2016-02-03 Mathieu Cartaud[487011] Fix wrong conflict detection
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2016-02-01 Mathieu CartaudImprove progress monitor to allow cancelling
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2016-02-01 Mathieu CartaudScalable conflict detector
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2016-01-27 Mathieu CartaudAdd missing test suite for Neon build
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2016-01-26 Mathieu Cartaud[485266] Fix merge consequences for delete/move conflicts
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2016-01-22 Mathieu CartaudUse JGit provided progress monitor
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2016-01-20 Mathieu Cartaud[486093] Don't create log file if logs are off
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2016-01-13 Mathieu Cartaud[485538] Fix ClassCastException in MergeResolutionManager
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2016-01-08 Mathieu Cartaud[484579] Fix merge consequences algorithm
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2016-01-08 Mathieu CartaudAdd debug logging for merge actions
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2016-01-06 Mathieu CartaudFix RCPTT bugs
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2015-11-04 Mathieu Cartaud[475935] Fix potential IllegalStateException in MergeViewerItem
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2015-10-27 Mathieu Cartaud[473190] Fix NPE in the CompareStructureMergeViewer...
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2015-10-20 Mathieu Cartaud[UI tests] Fix papyrus RCPTT tests
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2015-10-20 Mathieu Cartaud[UI tests] Fix papyrus RCPTT tests
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2015-10-19 Mathieu Cartaud[UI tests] Add tests involving Papyrus & Egit
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2015-10-15 Mathieu CartaudExtract EMFCompareConfiguration from EMFCompareRCPUIPlugin
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2015-10-13 Mathieu Cartaud[477769] Papyrus linked ResourceAttachmentChanges
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2015-10-12 Mathieu CartaudFix bugs caused by an EGit update
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2015-10-01 Mathieu CartaudImplementation of contextual tooltips
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2015-10-01 Mathieu Cartaud[478032] Fix accept/reject dropdown icon
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2015-09-30 Mathieu Cartaud[464386] Add commit short id to make label more distinguishi...
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2015-09-23 Mathieu CartaudModel Merge Tool + classes to do model merges with...
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2015-09-15 Mathieu CartaudFix label issues when using the MergeTool on merge...
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2015-09-03 Mathieu CartaudImplementation of contextual tooltips
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2015-09-03 Mathieu Cartaud[473190] Fix NPE in the CompareStructureMergeViewer
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2015-09-02 Mathieu CartaudAdd a proposal for the modification of Compare UI tooltips.
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2015-09-02 Mathieu Cartaud[411485] Fix the CMV display for moves beteen two containers
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2015-09-02 Mathieu Cartaud[464386] Add commit short id to make label more distinguishible
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
2015-08-31 Mathieu Cartaud[411485] Fix the CMV display for move between two containers
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
 commit | commitdiff | tree
Eclipse foundation framework to comapre EMF models