repo.or.cz
/
EMFCompare2.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Improve title message : manage pseudo conflicts diffs
2013-10-20
Axel Richard
Improv
e
title
message : m
a
nage p
s
eudo conflicts diff
s
commit
|
commitdiff
|
tree
2013-10-18
Axel Richard
[4
0
6402]
- Fix
c
o
n
flict
s
are
c
reated after merging
.
.
.
commit
|
commitdiff
|
tree
2013-10-11
Axel Richard
[405273] - Fix
UI does not de
t
ect invalid mo
d
els
commit
|
commitdiff
|
tree
2013-10-09
Axel Richard
[40900
4
]
- Fix
T
he 'merge all' a
c
t
i
on doesn
'
t set t
h
e
.
.
.
commit
|
commitdiff
|
tree
2013-10-04
Axel Richard
[418601] - Fix
invalid
t
hread access when editing text
.
.
.
commit
|
commitdiff
|
tree
2013-10-03
Axel R
i
chard
[418600] Fi
x
Und
o
/Redo
m
enu item
s
no
t
available
commit
|
commitdiff
|
tree
2013-10-03
A
x
el
Rich
a
rd
[
4
12075
]
Restore binary
co
m
patibility with H
e
l
i
os
.
commit
|
commitdiff
|
tree
2013-10-02
Axel Richard
Give up handlers/comma
n
ds - Back to
actions
commit
|
commitdiff
|
tree
2013-09-27
Axel Richard
Updat
e
Accept
A
ll and RejectAll handlers & comman
d
s
commit
|
commitdiff
|
tree
2013-09-27
Axel Richard
Updat
e
UML Specific Accessors
commit
|
commitdiff
|
tree
2013-09-26
Axel Rich
a
rd
[
4
1
69
3
6]
- UML R
e
fined element
s
filter
chang
e
s
diff
.
.
.
commit
|
commitdiff
|
tree
2013-09-25
Axe
l
Rich
a
rd
U
pdate doc
u
mentati
o
n
.
commit
|
commitdiff
|
tree
2013-09-24
Axel Richa
r
d
[416400] - Fix IOWrapped
E
xception by ad
d
ing a C
o
nf
l
ictMer
g
er
commit
|
commitdiff
|
tree
2013-09-23
Axel RIC
H
AR
D
Me
r
ge "Add
u
t
ility methods
t
o MergeViewe
r
S
i
de"
commit
|
commitdiff
|
tree
2013-09-23
Axel RIC
H
A
R
D
Merge "Re
m
oved u
n
used interfaces"
commit
|
commitdiff
|
tree
2013-09-23
Ax
e
l
RICHARD
Merge
"
Ignore
.
DS_Store (mac) files"
commit
|
commitdiff
|
tree
2013-09-23
A
x
el R
i
chard
[41
6
4
33
]
- Filter Identical elem
e
n
t
s display w
r
ong
.
.
.
commit
|
commitdiff
|
tree
2013-09-23
A
xel
R
ichard
[416699] - Fix mark
e
rs not prope
r
ly displayed in t
h
e
.
.
.
commit
|
commitdiff
|
tree
2013-09-23
A
x
el Richard
[41
6
434] -
D
i
s
play resource attachment changes
properly
commit
|
commitdiff
|
tree
2013-09-11
Ax
e
l
R
icha
r
d
Update reject d
i
ff
o
verall icon
.
commit
|
commitdiff
|
tree
2013-09-06
Axel Richa
r
d
[41
6
441] - Enhance
"
Show cons
e
q
u
ences" dro
p
down
menu
commit
|
commitdiff
|
tree
2013-07-26
Axel
R
ichard
[41
3
789]
R
esou
r
c
e
c
ontents not highlighted in
c
o
n
tent
.
.
.
commit
|
commitdiff
|
tree
2013-07-26
Axel Rich
a
rd
[
4
0
9
400]
F
ix C
l
assCastException double
clicking on
.
.
.
commit
|
commitdiff
|
tree
2013-07-26
A
xel Richard
[413707] Remove
m
e
rge buttons
in c
o
nt
e
n
t
merg
e
viewer
commit
|
commitdiff
|
tree
2013-07-25
Axel Richa
r
d
[4
0
0424] Next Differenc
e
b
u
tton doesn't
s
e
l
ect t
h
e
.
.
.
commit
|
commitdiff
|
tree
2013-07-25
A
xel Rich
a
rd
[4116
6
3] Prevent
c
omparison between
a
n object an
d
one
.
.
.
commit
|
commitdiff
|
tree
2013-07-25
Axel
R
ichard
[413606] Move differences ar
e
n
ot display in the
structure
.
.
.
commit
|
commitdiff
|
tree
2013-07-24
Axel Ri
c
hard
[413608] Me
r
ge a diff
already merge
d
raises an
exception
commit
|
commitdiff
|
tree
2013-07-22
Axel Richard
New extensio
n
point to e
x
tend group provide
r
s
commit
|
commitdiff
|
tree
2013-07-22
Axel Richard
[
4132
2
5
]
F
ix Consequen
c
es are n
o
t p
r
op
e
r
ly
h
ighlighte
d
commit
|
commitdiff
|
tree
2013-07-18
Axel Richard
[413232] Di
s
play "Compu
t
e Diff
e
rences" i
n
SM
V
w
hen
.
.
.
commit
|
commitdiff
|
tree
2013-07-16
Axel Richa
r
d
[4130
4
2
]
Fix Sa
v
e editor
alwa
y
s display
t
he default
.
.
.
commit
|
commitdiff
|
tree
2013-07-16
Axel Richard
[413041] Refresh viewer one time when
init fi
l
t
e
rs
commit
|
commitdiff
|
tree
2013-07-16
Axe
l
Ri
c
h
ar
d
Update merge/navigation actions
b
e
h
avior
commit
|
commitdiff
|
tree
2013-07-16
Axel Ri
c
hard
[41
1
4
9
3] Selected filt
e
rs ar
e
not always applie
d
to
.
.
.
commit
|
commitdiff
|
tree
2013-07-16
Axel R
i
chard
[412748]
E
MF Compare Pr
o
perty View
commit
|
commitdiff
|
tree
2013-07-16
Axel
Richard
Add RCP UI te
s
ts
.
commit
|
commitdiff
|
tree
2013-07-16
A
x
e
l
R
ichard
[412827]
Fix Arithm
e
ticExceptio
n
on Tre
e
Ruler annotat
i
on
s
.
commit
|
commitdiff
|
tree
2013-06-27
Axel Richar
d
[3983
6
1] E
n
hanced Model Mer
g
e
U
I
commit
|
commitdiff
|
tree
2013-06-18
A
xel Richard
Enhanced
place
h
olders display
commit
|
commitdiff
|
tree
2013-06-17
Axel Ric
h
ard
M
a
nage selected
f
ilters in Content
M
ergeViewer parts
.
commit
|
commitdiff
|
tree
2013-06-10
Axel Ri
c
hard
[
41003
6
]
Fix bug on
Cascadin
g
F
ilter
commit
|
commitdiff
|
tree
2013-06-10
Axel R
i
chard
[410071
]
ArrayIndexOut
O
fBo
u
nds
s
el
e
cting
a di
f
ference
.
.
.
commit
|
commitdiff
|
tree
2013-06-10
Axel Richar
d
Move
S
ave
C
om
p
arison M
o
del
H
andler
from RC
P
UI to IDE
.
.
.
commit
|
commitdiff
|
tree
2013-05-31
Axel
R
ichard
[396260] The
s
truc
t
ur
e
m
er
g
e v
i
ewer should
n
ot unloa
d
.
.
.
commit
|
commitdiff
|
tree
2013-05-31
Axel
R
ichard
[402421
]
NotSerializabl
e
E
x
c
e
ption
when s
a
v
e
the
c
omparison
.
.
.
commit
|
commitdiff
|
tree
2013-05-31
Axel
Ri
c
h
ard
[409
2
9
3] Fix for Exporting compa
r
iso
n
model fails
after
.
.
.
commit
|
commitdiff
|
tree
2013-05-31
Axel Rich
a
rd
[409289] fix for diff "disa
p
pear
s
"
from the UI
a
fter
.
.
.
commit
|
commitdiff
|
tree
2013-05-31
Axel Richa
r
d
[3984
2
3] Labels mi
s
sing on Types of
C
lasses of external
.
.
.
commit
|
commitdiff
|
tree
2013-05-30
Axel Richard
[
4022
9
0]
f
ix bug on delete s
h
ows an obje
t
o
n
b
oth co
n
tent
.
.
.
commit
|
commitdiff
|
tree
2013-05-24
Axel
R
i
chard
[
4
08233]
F
ix I
n
dex out of bounds E
x
ception
commit
|
commitdiff
|
tree
2013-05-16
A
xel Richard
Renam
e
SubDi
f
fEleme
n
tsF
i
lter as CascadingDi
f
fere
n
cesFilte
r
commit
|
commitdiff
|
tree
2013-04-30
Axel Richard
[406310
]
Item doe
s
n't col
l
aps
e
a
f
ter slecting a n
e
w
.
.
.
commit
|
commitdiff
|
tree
2013-04-30
Axel Richard
[
4
06513]
D
efin
e
a lab
e
l o
f
42 whitespaces to make the
.
.
.
commit
|
commitdiff
|
tree
2013-04-29
A
x
el
R
i
char
d
[406539] - N
P
E
when using groups
commit
|
commitdiff
|
tree
2013-04-25
Axel Richard
[406
5
40] - Dif
f
not s
e
lected i
n
c
ontent
viewers
commit
|
commitdiff
|
tree
2013-04-24
Axe
l
Richard
[4064
0
1] Fix
b
ug in SingleStructur
a
lFea
t
ureAccessorImpl
.
.
.
commit
|
commitdiff
|
tree
2013-04-24
Axel Ri
c
h
a
rd
Improve ResourceA
t
t
a
chmentChangeMergeViewerItem#getC
h
ildren()
commit
|
commitdiff
|
tree
2013-04-24
Axel Richard
Manage case of an
c
estor in ResourceC
o
ntentsAccess
o
rImpl
.
.
.
commit
|
commitdiff
|
tree
2013-04-23
Axel R
i
cha
r
d
[405720
]
Undo
d
oesn't wor
k
after a m
e
rge
commit
|
commitdiff
|
tree
2013-04-22
Axel Richa
r
d
[406201] - Diff not selecte
d
in
TreeViewe
r
commit
|
commitdiff
|
tree
2013-04-22
Axel R
i
chard
M
a
n
age case of ance
s
tor in MatchAccesso
r
#get
I
te
m
s()
.
commit
|
commitdiff
|
tree
2013-04-21
Axel Richard
Fix bug
i
n Resour
c
e
A
ttachmentChang
e
ItemPro
v
i
d
er
S
pec
.
.
.
commit
|
commitdiff
|
tree
2013-04-19
Axel Richard
Fix bug
i
n MergeViewerUti
l
.
g
e
tResource(
)
commit
|
commitdiff
|
tree
2013-04-19
Axel Richa
r
d
D
ispl
a
y
i
ng tree
o
f re
s
ource attach
m
e
n
t changes
.
commit
|
commitdiff
|
tree
2013-04-15
A
x
el
R
ichard
Extensible toolbars
commit
|
commitdiff
|
tree
2013-04-15
Axel R
i
chard
[
4
04
5
4
1] U
p
d
ate Confli
c
ts group arbores
c
ence
.
commit
|
commitdiff
|
tree
2013-04-15
A
x
el Richard
De
l
ete Viewer Comparator
.
commit
|
commitdiff
|
tree
2013-04-12
A
xel Richard
[40
1
854]
Expand and collapse
b
ut
t
ons
on structure an
d
.
.
.
commit
|
commitdiff
|
tree
2013-04-09
Ax
e
l Richard
[405274] -
S
t
a
ckO
v
erF
l
ow
e
rror when
m
e
rging
a diff
commit
|
commitdiff
|
tree
2013-04-08
Axe
l
R
i
chard
[404274] Provide an a
d
apter facto
r
y exte
n
sion mechanism
commit
|
commitdiff
|
tree
2013-04-03
A
x
e
l
Ric
h
ard
[4045
4
1
] Update Conflicts group ar
b
orescence
.
commit
|
commitdiff
|
tree
2013-03-19
Axel Ri
c
hard
F
i
x
bug: resourc
e
s conte
n
ts hidden when sub dif
f
f
i
lter
.
.
.
commit
|
commitdiff
|
tree
2013-03-19
Axel Richard
Fi
x
Bug
:
contr
i
but
e
items into menus
g
r
o
ups and filt
e
r
s
.
.
.
commit
|
commitdiff
|
tree
2013-03-19
A
xel Richard
Fix Bug: Save Comparison Model: Cancel
commit
|
commitdiff
|
tree
2013-03-19
Axel Richard
F
ix Bug: clear
menus g
r
o
ups
and
filters bef
o
re r
e
-contribute
.
.
.
commit
|
commitdiff
|
tree
2013-03-19
Axel R
i
chard
[4030
5
5] Provide a match engine
extension
m
echan
i
sm
.
commit
|
commitdiff
|
tree
2013-03-18
Axel R
i
chard
[40
3
1
8
7] Ordering post processors
commit
|
commitdiff
|
tree
2013-03-11
A
x
el Richard
[402536]
M
erge sub diffs when filter "
S
ub
di
f
fs elements
.
.
.
commit
|
commitdiff
|
tree
2013-03-07
Axel
R
icha
r
d
[401440] Adjust API
t
o be
able to read the description
.
.
.
commit
|
commitdiff
|
tree
2013-03-07
A
xel Richard
[4
0
1873] Display
u
nres
o
lve
d
d
i
f
ferences n
u
mber ne
x
t
.
.
.
commit
|
commitdiff
|
tree
2013-03-07
Axel Richard
[40165
9
] New f
i
lters a
n
d
t
rees
under groups
commit
|
commitdiff
|
tree
2013-03-06
A
x
el Richard
[399270]
D
i
sable save compa
r
ison
m
odel button
commit
|
commitdiff
|
tree
2013-02-12
Axel Richard
[
3
9
9
456] M
a
naged enha
n
ce readability
of Resourc
e
Attachmen
t
.
.
.
commit
|
commitdiff
|
tree
2013-02-01
Axel Richard
[
3
9
9
724] fi
x
bug on it
e
ms ord
e
r
in the structure merge
.
.
.
commit
|
commitdiff
|
tree
2013-01-30
Axel Richard
[
3994
5
6] Managed e
n
ha
n
ce
r
eadability o
f
Resource Attachm
e
nt
.
.
.
commit
|
commitdiff
|
tree
2013-01-29
Axel Richard
[398360
]
Provide c
o
nte
n
t
merge vi
e
wer
f
or
r
e
so
u
rce
.
.
.
commit
|
commitdiff
|
tree
2013-01-29
Ax
e
l Richard
[398358] Extens
i
on point for fi
l
ter
s
and group
s
commit
|
commitdiff
|
tree
2013-01-25
Axel Rich
a
rd
[398099] enhanced labels in st
r
u
ctural viewer
commit
|
commitdiff
|
tree