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
[434828] Test Merge Conflict Diff With Conflicting Diff With RequiredBy
2014-05-28
A
rth
u
r
Da
u
ssy
[434828] Test Merge Conflict
Diff With
C
onf
l
icting
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-28
Arthur Daussy
[434822] Con
f
lict between m
o
ve and de
l
ete
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-27
Arthur Da
u
ssy
U
s
e wi
d
th hi
n
t in p
r
eference pa
g
es
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-27
Art
h
ur Daussy
[
432033] Do not
reset Group a
n
d f
i
l
t
e
r
a
fter s
a
ving
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-23
Arthur Dau
s
sy
[435365] Cas
c
adingFilt
e
r shouldn'
t
f
i
lter out change
s
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-20
Arthur
Daussy
[43
4
827]
Wrong ov
e
r
lay
i
con a
f
t
e
r merge
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-05-13
A
rthur
Dauss
y
[434
7
14] Add EMF Content type to m
o
del provid
e
r
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-10
Arthur
D
aussy
A
dd description for "UM
L
refi
n
ed element" f
i
lter
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-10
Ar
t
h
u
r Daussy
Add a desc
r
iption to
"Di
a
gram Re
f
ined e
l
ement
s
"
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-10
Arthur
D
au
s
sy
A
dd description and label t
o
"
D
iagr
a
m post processor"
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-10
Arthur D
a
ussy
Engines pre
f
e
rence
p
age: Correct mes
s
age
d
ialo
g
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-10
Arthur D
a
ussy
Groups an
d
Filters preference page: Lines
u
p la
b
el
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-09
A
rthur Daussy
[4296
3
6
] Documentation
upda
t
e
:
Groups
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-09
A
rthur Dauss
y
[430372] Documenta
t
ion update
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-09
Arthur Daussy
Improves E
M
F Compare
gl
o
b
al pre
f
e
ren
c
e
page
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-08
Arthur
D
aussy
[4306
8
2
] New test: Test M
o
d
e
l
Resolve
r
Manag
e
r
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-08
A
r
t
h
u
r
Daus
s
y
[4
3
0682] User Doc: Model re
s
olution
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-07
A
rthur Dau
s
s
y
I
m
proves preference page UI
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-07
Arth
u
r
Daussy
[430682
]
Im
p
ro
v
es Mode
l
ResolverManag
e
r
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-03
Art
h
ur D
a
ussy
Co
r
rect
Helios compatibilty break
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-03
Art
h
ur Daussy
[429441] Use
r
doc
upda
t
e: Post processors configuration
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-03
Arthur D
a
u
s
s
y
[431785] Correct s
y
nchronization mech
a
nism
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-03
Arthur Daussy
[427126] User doc update: Engine configuration
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-02
Ar
t
hur Daussy
N
e
w tests: T
e
st MatchEngineFactoryR
e
gi
s
t
ryWr
a
pper
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-02
A
r
thur Daus
s
y
I
mprovements
a
n
d
corre
c
tion
s
o
n Mat
c
h
E
n
gineRegistryWrapper
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-02
Ar
t
hur
Dau
s
sy
Ne
w
tests: T
e
s
t Ite
m
Registry
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-02
Arthur Daussy
[
42
9
636] Ad
d
G
r
oup Sync
h
r
onization behavior mech
a
nis
m
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-02
Arthur Daussy
[430682] Correction on ModelR
e
solutionPreferenc
e
Page
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-02
Arthur Daussy
[430372] A
d
d
synchronizat
i
on behavio
r
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-04-01
Arthur Daussy
Improv
e
ments and c
o
r
r
ections on ItemRe
g
i
stry
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-03-31
Arthur Daussy
[429636] Create pre
f
erence page for groups
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-03-31
Arthur Daussy
[430682] Prefere
n
ce page for Model Resolving mechanis
m
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-03-31
Arthur Daussy
[430682]
R
efactoring of IModelRe
s
olver
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-03-26
A
rthur Daussy
[430
3
7
2
] Prefere
n
c
e page
f
or fi
l
ter
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-03-26
Ar
t
hur Daussy
[430372] Refactor fi
l
ters
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-03-24
Arthur Daussy
T
y
p
o err
o
r in de
v
e
l
oper d
o
cume
n
tation
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-03-24
Art
h
ur Daussy
Correct o
r
der on post p
r
ocessors
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-03-24
A
rthur Daussy
R
e
move useless preference ta
b
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-03-19
Arthur Dau
s
sy
[
4
2
7126] Layout
corr
e
ctio
n
for Windows O
S
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-03-17
Arthur Daussy
T
y
po error in
e
m
f
c
ompar
e
rcpuim
e
ssag
e
s
.
properties
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-03-13
Arthur
D
aus
s
y
[
429636]
Refactoring of ID
i
f
f
erenceGroup
P
rovi
d
er
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-03-13
Ar
t
hu
r
Daussy
[429441] Ext
e
n
d UM
L
P
o
st pro
c
ess ui
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-03-13
Arth
u
r Daussy
[
4
29441] Enab
l
e/
D
i
s
able p
o
st pro
c
essor
s
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-03-13
Ar
t
hur Daussy
Preven
t
changing gr
o
up twice for
o
n
ly one selectio
n
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-03-10
Arthur
D
aussy
Correct
typ
o
error on IMPL_CLASS_DESCRIPTOR_ATTR in
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-03-07
Arthur Dauss
y
Remove Google API
l
e
ak
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-03-07
Arthur Daussy
Fix @
since
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-02-24
Arthur
D
aussy
Name refa
c
toring
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-02-24
Arthur Dau
s
sy
[4271
2
6] A
d
d ma
t
ch engne UI configura
t
ion
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-02-19
Arthur Daussy
[427126] UI re
f
actoring
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-02-19
Arthur
D
auss
y
[427126] Bu
i
l
d correction
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-02-18
A
rthur
Dau
s
sy
[427126] Add Mat
c
h engine extension poin
t
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-02-18
Arth
u
r Dauss
y
[
427126] New
extension
p
oi
n
ts
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-02-14
A
r
t
h
u
r Daussy
[4
2
6
97
5
] Add color preference for EMF
Compare viewer
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-02-13
A
r
thur Daussy
Add
@noimplem
e
nt an
d
@noextend
to IM
a
tchEngi
n
e
.
Fa
c
tory
.
.
.
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree
2014-02-13
A
r
thur Daussy
[427126] Add
d
ef
a
ult
c
onstructor t
o
DefaultDiffEngine
Signed-off-by:
Arthur Daussy
<arthur.daussy@obeo.fr>
commit
|
commitdiff
|
tree