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
[494763] - Stereotypes not displayed in SMV
2016-07-25
Alexa
n
dra
B
u
zila
[4
9
4763] - Stereot
y
pe
s
not
d
isplayed in SM
V
commit
|
commitdiff
|
tree
2016-07-12
L
aurent Goubet
Do not cons
i
der a container deletion
t
o conf
l
ic
t
with
.
.
.
commit
|
commitdiff
|
tree
2016-07-11
Laure
n
t Delaigue
[497
4
92] Fix NPE
in
tooltip provide
r
commit
|
commitdiff
|
tree
2016-07-07
L
aurent Goubet
update tp to follow UML designe
r
commit
|
commitdiff
|
tree
2016-06-14
Laur
e
nt
Goubet
[495961]
i
ncompati
b
il
i
ty between l
o
g4j 1
.
x and
2
.
x
commit
|
commitdiff
|
tree
2016-05-24
Lauren
t
Goubet
[47
1
157] StackOverfl
o
w st
i
ll present on Sir
i
us
diagrams
commit
|
commitdiff
|
tree
2016-05-19
Laurent Goube
t
Fix localizati
o
n f
o
r
papyr
u
s sup
p
ort plugin
commit
|
commitdiff
|
tree
2016-02-15
Stefan Dirix
[473985] Enable
c
omparison dia
l
og in
p
u
re e4
commit
|
commitdiff
|
tree
2016-02-08
Laurent
G
oubet
Cope with API changes in P
a
pyrus
commit
|
commitdiff
|
tree
2016-01-21
Laure
n
t Goubet
target platfo
r
m
f
or N
e
on
commit
|
commitdiff
|
tree
2015-10-19
A
x
el Ric
h
ard
[475
5
86] Rej
e
ct sub-diffs of
rejected diffs
w
hen cascading
.
.
.
commit
|
commitdiff
|
tree
2015-08-18
L
a
urent Goubet
B
u
mp version for n
e
on M1
commit
|
commitdiff
|
tree
2015-08-18
Laure
n
t Goubet
C
losing intern
a
l packag
e
f
rom API
commit
|
commitdiff
|
tree
2015-07-31
Laurent Goube
t
Only mark conflicting fi
l
es as conflicting
inst
e
ad
.
.
.
commit
|
commitdiff
|
tree
2015-07-31
Laurent Goubet
F
un
c
tional tests for
t
he remote resolving a
n
d
ass
o
c
iated
.
.
.
commit
|
commitdiff
|
tree
2015-07-15
Axel Richard
N
ew EMF Compare specifications plugin
commit
|
commitdiff
|
tree
2015-06-22
Axel Ri
c
har
d
[453408] Fix SWTException
i
n
E
MFCSM
V
#internal
R
edraw()
commit
|
commitdiff
|
tree
2015-06-22
Axel Richard
[
470396] F
i
x
N
P
E in C
o
mpareToolBar#se
t
Enabled(boolean)
commit
|
commitdiff
|
tree
2015-06-19
Laurent Goubet
revert chang
e
s to the doc p
u
blisher
commit
|
commitdiff
|
tree
2015-06-18
La
u
rent Goube
t
r
e
s
tor
e
p2-plugin,
r
enam
e
we
b
site z
i
p
commit
|
commitdiff
|
tree
2015-06-18
P
hilip Lange
r
Refact
o
rs
t
h
e EMFR
e
source
M
apping
M
erger
commit
|
commitdiff
|
tree
2015-06-18
Laurent Goubet
doc is
s
ue
s
- restore pack
i
ng, remove metada
t
a m
o
dification
commit
|
commitdiff
|
tree
2015-06-18
Laurent
Goube
t
doc issues
- test
-
Remove normalize
commit
|
commitdiff
|
tree
2015-06-18
Laurent
G
o
ube
t
doc issues -
test - Remove signing
and pack
i
ng
commit
|
commitdiff
|
tree
2015-06-18
A
xel
Richa
r
d
[Rel
E
ng] Up
d
a
te t
y
cho from 0
.
21 to 0
.
23
commit
|
commitdiff
|
tree
2015-06-18
Axel Richar
d
[RelEng] Upd
a
te jarsigner version
f
rom
1
.
0
.
5
t
o 1
.
1
.
2
commit
|
commitdiff
|
tree
2015-06-18
Axel Richard
A
d
d
n
ew
U
M
L
Danglin
g
StereotypeA
p
plication concept
commit
|
commitdiff
|
tree
2015-06-17
Axel Richa
r
d
[4
6
9355] Fi
x
conflict
s
label shows wro
n
g number of
.
.
.
commit
|
commitdiff
|
tree
2015-06-08
Axel
Ri
c
hard
[Doc] Up
d
ate genera
t
ed qualifie
d
ve
r
sion for
w
e
bsite
commit
|
commitdiff
|
tree
2015-06-05
Laurent
Goubet
Rest
o
re caching
o
f th
e
logic
a
l
m
odel
commit
|
commitdiff
|
tree
2015-05-18
A
x
el Richard
[Doc] Update
u
ser gui
d
e
commit
|
commitdiff
|
tree
2015-05-06
Laurent Goubet
signin
g
issues
commit
|
commitdiff
|
tree
2015-05-06
Laure
n
t Goubet
signing issue
s
commit
|
commitdiff
|
tree
2015-05-06
Lau
r
ent Goubet
signi
n
g iss
u
es
commit
|
commitdiff
|
tree
2015-05-06
Laurent Go
u
bet
signi
n
g issues
commit
|
commitdiff
|
tree
2015-05-06
La
u
rent
Goubet
signi
n
g failures
commit
|
commitdiff
|
tree
2015-05-05
Laurent Goubet
Fix some of the warni
n
gs
commit
|
commitdiff
|
tree
2015-05-04
Phi
l
ip Lange
r
[465331] Delegate
file a
d
ditio
n
s and deletions if
m
issed
.
.
.
commit
|
commitdiff
|
tree
2015-05-04
Laurent Del
a
igue
Introduce logging with log
4
j
.
commit
|
commitdiff
|
tree
2015-04-30
P
h
i
l
i
p Langer
[465329] Adds
t
es
t
for merging new depend
e
nt but not
.
.
.
commit
|
commitdiff
|
tree
2015-04-30
Phi
l
i
p
L
a
n
ger
Extract commo
n
su
p
er class f
r
om git
tests regarding
.
.
.
commit
|
commitdiff
|
tree
2015-04-30
P
h
ili
p
Langer
[465329] Retur
n
the URI of the r
e
s
o
u
rce to be c
r
eat
e
d
.
.
.
commit
|
commitdiff
|
tree
2015-04-30
L
aurent Delaigue
[
4
60773]
List
e
n to
r
esource
c
reatio
n
d
uring merge
.
commit
|
commitdiff
|
tree
2015-04-14
L
a
uren
t
Goubet
I
ntroduce gi
t
-specific su
p
p
ort to fix unusea
b
le storage
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2015-04-07
Axel R
i
chard
[46
3
445] F
i
x potential NPE in EM
F
CompareStructureMergeViewer
commit
|
commitdiff
|
tree
2015-04-07
Stefan Dirix
U
p
date Matching
C
hapter in
D
e
v
elope
r
Document
a
t
ion
commit
|
commitdiff
|
tree
2015-04-07
Axel Ri
c
h
a
r
d
[
46255
0
] Fix resou
r
ce
S
etHook
e
xt
e
n
sion-pont ID
commit
|
commitdiff
|
tree
2015-03-04
Axel Ric
h
ard
[45896
3
] EMFCo
m
pa
r
e ob
j
e
c
t doesn't us
e
EMFCompar
e
RCP
.
.
.
commit
|
commitdiff
|
tree
2015-02-18
Stefa
n
Dirix
[452147] Fix h
a
ndling
of diffs for interlocked one
.
.
.
commit
|
commitdiff
|
tree
2015-02-10
Laurent
G
o
ubet
Pr
o
v
ide co
h
erent nam
e
s f
o
r the SDK features
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2015-02-09
Laurent Goubet
C
h
ange fe
a
t
u
re
n
ames to more descriptive ones
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2015-02-09
Ax
e
l
Richard
[4
3
6050] Fix
c
opy
a
ll do
e
s nothi
n
g
commit
|
commitdiff
|
tree
2015-02-09
Axe
l
Richard
[456
7
96] Cas
c
ading
filt
e
r s
h
ould
n
'
t
hide
m
ove
differences
commit
|
commitdiff
|
tree
2015-02-09
Axel Richard
[413038] Fix Properties View
:
edit a
value chang
e
s
.
.
.
commit
|
commitdiff
|
tree
2015-02-09
Axel Richa
r
d
[459131] Fix Logical M
o
del
Reso
u
rces Gr
a
ph update
commit
|
commitdiff
|
tree
2015-02-03
Laurent Delaigue
[458502] NPE i
n
E
M
FComp
a
reS
t
r
u
ct
u
r
eMergeVie
w
er
.
commit
|
commitdiff
|
tree
2014-12-18
Axel Ri
c
h
a
rd
Update de
v
e
loper
guide
commit
|
commitdiff
|
tree
2014-12-17
A
x
el
Richard
S
i
mplificati
o
n of De
p
endencyData
commit
|
commitdiff
|
tree
2014-12-17
Axel R
i
cha
r
d
[447231] DifferenceGroup: don't b
u
i
ld a sub tree if
.
.
.
commit
|
commitdiff
|
tree
2014-12-16
Axel Richa
r
d
Notify reso
u
rc
e
s whe
n
running merge a
l
l non conflict
i
ng
.
.
.
commit
|
commitdiff
|
tree
2014-12-16
Axel Richard
[Lo
g
ic
a
l
M
odel Vi
e
w
]
Use our own s
y
nced icon
commit
|
commitdiff
|
tree
2014-12-12
A
x
el Richar
d
[454735] Ex
p
andCollapseListener raises potent
i
al NP
E
commit
|
commitdiff
|
tree
2014-12-12
Axel Richard
Fi
x
Undo for ContentMergeViewers
commit
|
commitdiff
|
tree
2014-12-12
Ax
e
l Richard
Fix rand
o
m or
d
er of ResourcesAttachmen
t
Changes in SMV
commit
|
commitdiff
|
tree
2014-12-11
Ax
e
l Rich
a
rd
Resour
c
esAttachmentChanges must be filtered
in groups
commit
|
commitdiff
|
tree
2014-12-11
Axel Richard
Don't clean eventbus in compar
e
configurat
i
on
commit
|
commitdiff
|
tree
2014-12-11
A
x
el Richard
Fix Mer
g
e
A
l
l Toolbar
Act
i
on
s
commit
|
commitdiff
|
tree
2014-12-10
Lau
r
ent Goubet
Pr
o
perly dispose o
u
r group p
r
oviders
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Laurent Goubet
Dispose of the content viewers
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
L
a
uren
t
G
o
u
b
et
Null o
u
t our undo/redo actions
(r
e
ferenc
e
to d
o
main)
commit
|
commitdiff
|
tree
2014-12-09
Laurent
G
o
u
be
t
Reduce the number of loops fr
o
m difference group creation
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-08
Laurent Goubet
Match performance when using only identi
f
ier
s
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-04
Axe
l
R
i
c
hard
[442897] Ps
e
udo confl
i
cts under
Real Add confl
i
cts
commit
|
commitdiff
|
tree
2014-11-21
Laurent Goubet
Fix ja
v
adoc of the
EM
F
M
od
e
lProvi
d
er to
r
efl
e
c
t
c
u
r
rent
.
.
.
commit
|
commitdiff
|
tree
2014-11-07
Laurent G
o
ub
e
t
[449162] Fix IllegalStateException:
The
resource set
.
.
.
Also-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-07
Axel Rich
a
rd
[449162
]
Fix Ille
g
alStateEx
c
eption: The reso
u
rce set
.
.
.
Also-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-07
La
u
rent Goubet
Add mi
s
s
i
ng copyright
s
commit
|
commitdiff
|
tree
2014-11-07
L
a
urent G
o
ubet
Bump v
e
rsions and fix new plugins
f
or Mars M3
commit
|
commitdiff
|
tree
2014-11-04
Alexandra Buzila
[446252] Issue
wit
h
fe
a
ture
o
rdering w
h
e
n
mer
g
ing
F
e
a
tu
r
eMaps
commit
|
commitdiff
|
tree
2014-10-29
Alexandra Buzila
[4
4
84
6
4] Source list inc
o
rr
e
ctly
d
etermined when undoi
n
g
.
.
.
commit
|
commitdiff
|
tree
2014-10-22
Mikaël Barber
o
Fix the labels
o
f the SMV t
i
tle bar
commit
|
commitdiff
|
tree
2014-10-22
Mik
a
ël Bar
b
ero
Pa
r
ameterize project name and
p
ro
j
e
c
t id to eas
e
reuse
.
.
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur Daussy
Unloads UML re
s
ource
s
thanks
to the resource
s
et hooks
.
.
.
commit
|
commitdiff
|
tree
2014-10-14
Ar
t
h
u
r Dauss
y
Prevent
s
scope to filt
e
r res
o
urces using p
a
thma
p
.
commit
|
commitdiff
|
tree
2014-10-14
Art
h
ur
Dau
s
sy
Adds onDispose method on the resource
s
et hooks
.
commit
|
commitdiff
|
tree
2014-10-14
Philip
La
n
g
er
[
4
46739] Fixes obtaining the
t
arget feature in thre
e
.
.
.
commit
|
commitdiff
|
tree
2014-10-14
Ar
t
h
u
r
Daus
s
y
Corrects
lab
e
ls
a
fter enhanceme
n
t on conflicts label
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur
D
aussy
[
398
3
67] Add
s
Papyrus CSS
customi
z
atio
n
s
upport
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur Daussy
Adds ResourceSetH
o
ok extensio
n
p
o
int
.
commit
|
commitdiff
|
tree
2014-10-14
Arthur Daussy
Prevents load
i
ng twi
c
e the same model
in a
NotLoadingResourc
.
.
.
commit
|
commitdiff
|
tree
2014-10-13
A
rthur Dau
s
s
y
[443
3
37] Prevent large shapes icons for
s
ter
e
oty
p
es
.
commit
|
commitdiff
|
tree
2014-10-13
Arthur Daussy
[446413] St
r
uctur
e
Merg
e
Viewer s
h
o
u
ld rebuild its tree
.
.
.
commit
|
commitdiff
|
tree
2014-10-10
Laurent Goubet
Modify merge to handle
i
mplications p
r
operly
commit
|
commitdiff
|
tree
2014-09-29
Arthur Dauss
y
EGit beha
v
ior change
commit
|
commitdiff
|
tree
2014-09-25
A
x
el R
i
char
d
[443031] Fix N
P
E on
FeatureFilter
.
r
e
fe
r
ence
I
s
Set
commit
|
commitdiff
|
tree
2014-09-25
Axel
R
i
c
hard
[44
3
9
6
8]
Fix NPE in
C
omparisonUtils
.
getSubDiffs
commit
|
commitdiff
|
tree
2014-09-25
A
r
th
u
r Daus
s
y
[443420] Handle not integrated
dynami
c
prof
i
le
.
commit
|
commitdiff
|
tree
2014-09-25
Axel
Richard
[40481
1
] Exp
a
nd group
item on double-click
commit
|
commitdiff
|
tree
2014-09-25
Axel
Richa
r
d
[441754]
T
he
default activat
e
d group is built t
w
ice
commit
|
commitdiff
|
tree
2014-09-25
Axel
R
ichard
[
4
43696]
Add
contextual menu
o
n differences in SMV
commit
|
commitdiff
|
tree
next