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
Corrects labels after enhancement on conflicts label.
2014-10-14
Art
h
ur Daussy
Corre
c
ts la
b
e
ls
after enhan
c
em
e
nt
o
n conflicts label
.
commit
|
commitdiff
|
tree
2014-10-14
A
r
thur
D
aussy
[398367]
A
d
ds Papyrus CSS custo
m
ization suppo
r
t
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur Daussy
Adds Resourc
e
SetHook ex
t
e
nsion
p
o
i
nt
.
commit
|
commitdiff
|
tree
2014-10-14
Ar
t
hu
r
Da
u
ss
y
Prevents loading twi
c
e
the same model in a NotLoadingResou
r
c
.
.
.
commit
|
commitdiff
|
tree
2014-10-13
A
r
thur Dau
s
sy
[443337
]
Preven
t
large s
h
apes i
c
ons fo
r
stereotypes
.
commit
|
commitdiff
|
tree
2014-10-13
Arthur Daussy
[446413] Structu
r
eMerg
e
Vi
e
w
e
r should rebuild its tree
.
.
.
commit
|
commitdiff
|
tree
2014-10-10
La
u
rent
Goubet
Modify merge to handle implicatio
n
s pr
o
perly
commit
|
commitdiff
|
tree
2014-09-29
Arthur Daussy
EG
i
t
behavior change
commit
|
commitdiff
|
tree
2014-09-25
A
x
el Richard
[443031]
F
ix NPE on FeatureFilte
r
.
refer
e
nce
I
s
S
e
t
commit
|
commitdiff
|
tree
2014-09-25
A
xel Rich
a
rd
[443
9
68
]
Fix NPE in Co
m
parisonUtils
.
get
S
ubDiffs
commit
|
commitdiff
|
tree
2014-09-25
Arthur
Daussy
[
443420] Handle not i
n
tegrated dynamic p
r
o
f
ile
.
commit
|
commitdiff
|
tree
2014-09-25
Axe
l
Ric
h
ard
[4
0
4811] Expand group i
t
e
m
on d
o
uble-click
commit
|
commitdiff
|
tree
2014-09-25
Axel Rich
a
rd
[441754]
T
he
d
e
f
a
ult acti
v
a
ted gr
o
up is built twice
commit
|
commitdiff
|
tree
2014-09-25
Axel Richard
[
443696] Add co
n
te
x
tual
m
enu o
n
differ
e
n
ces i
n
SMV
commit
|
commitdiff
|
tree
2014-08-22
Laurent Goubet
F
i
x
merge-relat
e
d UI feed
b
ack
o
f the St
r
ucture viewer
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-08-20
Laurent Gou
b
et
Only me
r
ge the 'many' si
d
e of an equiv
a
le
n
ce in c
a
se
.
.
.
commit
|
commitdiff
|
tree
2014-08-19
Arth
u
r Daus
s
y
[43
4
621] Correction on RootIDMa
t
ch
i
ng
strategy
.
commit
|
commitdiff
|
tree
2014-08-05
Philip Lange
r
[41352
0
]
Fixes In
d
exOutOfBound
s
Exception o
n
m
e
r
g
ing
.
.
.
commit
|
commitdiff
|
tree
2014-08-01
Arthur
Da
u
ssy
Corrects possible
N
PE on r
e
sou
r
ce
resolv
i
ng
.
commit
|
commitdiff
|
tree
2014-07-08
Laurent Goubet
T
h
e
logical model
s
hould find incomi
n
g cross-ref
e
rences
commit
|
commitdiff
|
tree
2014-07-01
L
aurent Goubet
B
um
p
vers
i
ons to 3
.
1
.
0 on
m
as
t
er
commit
|
commitdiff
|
tree
2014-07-01
Laur
e
n
t Goubet
d
e
lete
leg
a
c
y plugin
commit
|
commitdiff
|
tree
2014-07-01
Laurent Goubet
rem
o
ve leg
a
cy (
a
nd u
n
buil
d
able)
s
ysml s
u
pp
o
r
t
commit
|
commitdiff
|
tree
2014-06-23
Ar
t
hur Dauss
y
Add Ster
e
otyped
e
l
e
ment cha
n
ge to the
UML
Comp
a
r
e meta
.
.
.
commit
|
commitdiff
|
tree
2014-06-20
A
rth
u
r
Daussy
G
e
n
erate
s
UMLCo
m
pa
r
e s
o
u
r
ce c
o
de with EMF 2
.
10
commit
|
commitdiff
|
tree
2014-06-20
Arthur Daus
s
y
Un
i
t test for MDT Pap
y
r
u
s differences order
.
commit
|
commitdiff
|
tree
2014-06-16
Arthur Dau
s
sy
Avoid unnecessary
dial
o
g wh
e
n c
o
mmiting non fragmented
.
.
.
commit
|
commitdiff
|
tree
2014-06-11
Laurent Goubet
avoid infinite looping from git whe
n
resolving fails
commit
|
commitdiff
|
tree
2014-06-03
L
a
urent
G
oub
e
t
various son
a
r
v
iolation
s
fix
e
s
commit
|
commitdiff
|
tree
2014-06-02
M
i
kaël Barbero
Add transacti
o
nal
compare comma
n
d stack
commit
|
commitdiff
|
tree
2014-06-02
Mikaël Barbero
Remove
dead code
commit
|
commitdiff
|
tree
2014-06-02
Mikaël Barbero
Add model resourc
e
text c
o
n
tent merge viewe
r
to diagram
commit
|
commitdiff
|
tree
2014-06-02
Mikaël
Barbero
up
d
at
e
problem indi
c
at
i
on fr
o
m a single loc
a
tion
commit
|
commitdiff
|
tree
2014-06-02
M
ikaël
Barbero
Let the user
s
w
i
tc
h
to text comp
a
re from no difference
.
.
.
commit
|
commitdiff
|
tree
2014-06-02
La
u
rent Goubet
Ad
d
G
u
ava 15 to the a
c
cepted range
commit
|
commitdiff
|
tree
2014-05-28
M
i
kaël Barbe
r
o
Use compare configuration labels
f
o
r
side groups
title
.
commit
|
commitdiff
|
tree
2014-05-28
Mi
k
aël Bar
b
ero
Exce
p
tion can't be add
e
d
to problem view, we have to
.
.
.
commit
|
commitdiff
|
tree
2014-05-28
Mikaël Barbero
Avo
i
d to dispatch
noti
f
icatio
n
to
fix deadlock with
.
.
.
commit
|
commitdiff
|
tree
2014-05-28
M
i
kaël Barbero
Properly s
h
utdown dela
y
ed ex
e
cu
t
or
s
ervice
commit
|
commitdiff
|
tree
2014-05-28
Mika
ë
l Barbero
Add suppo
r
t for a ne
w
con
t
ent v
i
e
wer to fallback to
.
.
.
commit
|
commitdiff
|
tree
2014-05-23
Laurent Goubet
Lim
i
t scope of resource del
t
a reacti
o
ns in the r
e
s
o
l
v
er
commit
|
commitdiff
|
tree
2014-05-22
M
ikaël Barbero
[435483]
Che
c
k f
o
r disp
o
sal of widgets befor
e
reporting
.
.
.
commit
|
commitdiff
|
tree
2014-05-20
Laure
n
t Goubet
tr
y
and
h
a
ndle git l
o
cal
revisions
during
compar
i
son
commit
|
commitdiff
|
tree
2014-05-20
Lau
r
ent Go
u
be
t
"OK" stat
u
s should sti
l
l display the
compa
r
iso
n
commit
|
commitdiff
|
tree
2014-05-20
Mikaël B
a
rb
e
r
o
Add
f
allback
to text when somet
h
ing
g
oes wrong during
.
.
.
commit
|
commitdiff
|
tree
2014-05-19
L
a
urent
G
oubet
temporary im
p
lement equa
l
s f
o
r t
h
e EMFResou
r
ceMap
p
i
n
g
commit
|
commitdiff
|
tree
2014-05-19
Mikaël Barbero
A
v
oi
d
NPE in d
i
ag
n
o
stic viewer
commit
|
commitdiff
|
tree
2014-05-19
Mikaël Barber
o
More graceful
shutdown of
t
hrea
d
s
p
ool
.
commit
|
commitdiff
|
tree
2014-05-16
Mikaël Bar
b
ero
Do
n
ot rethrow exception when loadin
g
a
resource in
.
.
.
commit
|
commitdiff
|
tree
2014-05-16
Mikaël
Barbero
I
mprove
p
rogre
s
s reporting
commit
|
commitdiff
|
tree
2014-05-14
Laure
n
t Goubet
enable p
a
ck
2
00 and include pac
k
ed a
r
tefacts
commit
|
commitdiff
|
tree
2014-05-13
Arthu
r
Da
u
ssy
[434714]
A
dd EMF Content
t
ype
t
o model provi
d
e
r
commit
|
commitdiff
|
tree
2014-05-06
L
a
u
r
e
nt G
o
ubet
[43421
0
]
I
ndexOOB when
o
peni
n
g resolver
prfer
e
nce
s
commit
|
commitdiff
|
tree
2014-05-06
L
a
ure
n
t Goubet
U
s
e the s
h
ared licen
s
e
feature
.
commit
|
commitdiff
|
tree
2014-05-06
L
au
r
ent Gou
b
et
adding CBI to all targets
commit
|
commitdiff
|
tree
2014-05-05
Laur
e
nt Go
u
bet
re
d
uce sync
h
r
o
nization ove
r
head
of model re
s
o
lving
commit
|
commitdiff
|
tree
2014-04-17
Laurent
G
oubet
sma
l
l
perf
o
rmance tweak : avoid mult
i
ple e
R
e
source
.
.
.
commit
|
commitdiff
|
tree
2014-04-09
Axel Richard
[432002]
Undo doesn't
u
pdat
e
content viewers &
m
erge
.
.
.
commit
|
commitdiff
|
tree
2014-04-09
Axel
R
ichard
[
4321
4
1] Conflicts diffs order cha
n
ge between comparisons
commit
|
commitdiff
|
tree
2014-04-03
Laurent Goubet
fix english
commit
|
commitdiff
|
tree
2014-04-02
Arthur Daussy
[430682]
Correction on Mo
d
elResoluti
o
nPref
e
r
e
ncePag
e
commit
|
commitdiff
|
tree
2014-04-02
Arth
u
r Dau
s
sy
[4
3
0372]
A
dd sync
h
r
o
nization b
e
havior
.
commit
|
commitdiff
|
tree
2014-04-01
Art
h
ur Daussy
Improvements and corrections
o
n
ItemRe
g
i
s
try
commit
|
commitdiff
|
tree
2014-03-28
Axel Ri
c
hard
[430697] Toolbar
a
ppears twice when
Replace Wit
h
act
i
on
.
.
.
commit
|
commitdiff
|
tree
2014-03-13
L
aurent
G
o
u
bet
no
r
malize E
O
L
s
in the core (second pass)
commit
|
commitdiff
|
tree
2014-03-13
Laurent Goub
e
t
normaliz
e
EO
L
s in
t
he co
r
e (first pass)
commit
|
commitdiff
|
tree
2014-03-13
Arth
u
r Daussy
[42
9
4
41] Extend UML Post process ui
.
commit
|
commitdiff
|
tree
2014-03-13
La
u
rent
Goubet
no
r
mali
z
e E
O
Ls throughout
E
MF Compare
commit
|
commitdiff
|
tree
2014-03-03
Laurent Goubet
b
u
llet l
i
st syntax
commit
|
commitdiff
|
tree
2014-03-03
Laurent Goubet
f
i
x
ing
t
able syntax
commit
|
commitdiff
|
tree
2014-03-03
Laurent Goubet
Add
a
co
m
plete readme to
t
he rep
o
sitory root
commit
|
commitdiff
|
tree
2014-02-04
L
aurent Goubet
fix
t
arget platform
s
up to Helios
commit
|
commitdiff
|
tree
2014-02-04
Laurent Goube
t
use p
r
oper EGit
a
nd split EGit
tests
in separate project
commit
|
commitdiff
|
tree
2014-02-03
Laurent
G
oubet
Revert br
e
akages from
t
he
t
arget editor
.
.
.
commit
|
commitdiff
|
tree
2014-02-03
Laur
e
nt Goubet
Use the prop
e
r EGit versions
in Indigo
and Juno
commit
|
commitdiff
|
tree
2014-02-03
Laurent Go
u
bet
fix indigo t
a
r
g
et platform
commit
|
commitdiff
|
tree
2014-02-03
Laurent Gou
b
et
Hu
d
son w
o
uldn
'
t allow u
s
t
o
properly
define t
h
e
set
.
.
.
commit
|
commitdiff
|
tree
2014-02-03
Laurent Go
u
bet
Make sure
we r
e
main compa
t
ible w
i
th Helios
commit
|
commitdiff
|
tree
2014-02-03
Laurent Goubet
modularize build
commit
|
commitdiff
|
tree
2014-01-31
La
u
rent Goubet
rever
t
ing BREEs to
J
a
va
5, and ver
s
ions along with
.
.
.
commit
|
commitdiff
|
tree
2014-01-31
L
a
urent Goubet
fixing
g
it
t
ests
failures
commit
|
commitdiff
|
tree
2014-01-30
Laurent Goubet
e
x
trac
t
fuzzy in a
t
est fra
g
ment
commit
|
commitdiff
|
tree
2014-01-30
Lau
r
ent
Goubet
C
l
e
a
n
up fo
r
version bumping
commit
|
commitdiff
|
tree
2014-01-29
Lau
r
ent Gou
b
e
t
Change BREEs to Java 1
.
6
and
a
ctivate
API error for
.
.
.
commit
|
commitdiff
|
tree
2014-01-28
L
a
urent
G
oubet
Comment, remove usel
e
ss
w
arn
i
ngs,
a
void API break
commit
|
commitdiff
|
tree
2013-10-01
Laur
e
n
t
Goubet
S
h
ari
n
g Luna t
a
r
g
e
t
p
latform (
M
1
) and target defin
i
tion
.
.
.
commit
|
commitdiff
|
tree
2013-07-15
Laurent G
o
u
bet
Missing bits from I32b7c703d8069973ab8
d
6d9
0
c0eb6a14ccee35a3
commit
|
commitdiff
|
tree
2013-07-12
lgoubet
[41073
7
] preserve ordering
e
ven
f
o
r
e
q
ui
v
a
l
ent diff
e
r
e
nces
.
commit
|
commitdiff
|
tree
2013-07-12
Laur
e
n
t
Goubet
M
i
s
sin
g
imple
m
entations of
Conflict deriv
e
d methods
commit
|
commitdiff
|
tree
2013-07-12
Lau
r
e
n
t G
o
ube
t
M
inor t
y
po
commit
|
commitdiff
|
tree
2013-07-12
Laurent Goubet
Inc
l
ud
e
s
c
hemas in source buil
d
.
commit
|
commitdiff
|
tree
2013-07-08
L
aurent Goube
t
Always use latest EG
i
t
.
commit
|
commitdiff
|
tree
2013-06-24
Lauren
t
Gou
b
et
Invalid p
a
th
f
or local file revisi
o
n,
regression introd
u
ced
.
.
.
commit
|
commitdiff
|
tree
2013-06-24
Laurent Go
u
bet
[411464]
Dot not use a view for the traversal's set
s
.
commit
|
commitdiff
|
tree
2013-06-21
Cedr
i
c Notot
Fillin
g
of
th
e
i
m
p
l
i
cation link wi
t
h UML s
u
bsets
.
commit
|
commitdiff
|
tree
2013-06-20
Laurent Goubet
Mi
s
sing
c
opyrig
h
ts, typo
commit
|
commitdiff
|
tree
2013-06-19
L
a
urent
G
oubet
Depre
c
ate u
s
e of EMFCompare#creat
e
D
e
faultScope(
.
.
.
)
commit
|
commitdiff
|
tree
2013-06-19
L
aurent Goubet
Cache the dependency g
r
aph
a
s
T
eam calls it
_
a lot_
commit
|
commitdiff
|
tree
2013-06-18
Laure
n
t Goubet
Useles
s
c
o
d
e, resou
r
ces, and warnings
commit
|
commitdiff
|
tree
2013-06-18
Laurent G
o
u
b
et
Introduce exte
n
sion point for th
e
mod
e
l res
o
l
vers
.
commit
|
commitdiff
|
tree
next