repo.or.cz
/
phpmyadmin.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Fix merge conflict
2013-05-14
Marc Del
i
sle
Fix merge conf
l
i
c
t
commit
|
commitdiff
|
tree
2013-05-14
M
arc Delisle
Move C
h
angeLog
en
t
ry
commit
|
commitdiff
|
tree
2013-05-14
Marc Delisl
e
Merg
e
pul
l
request
#376
f
rom ayus
u
n/bug3910
commit
|
commitdiff
|
tree
2013-05-14
Marc Del
i
sle
F
ix typo
commit
|
commitdiff
|
tree
2013-05-14
Marc Delisle
Merge
pull req
u
est #375 from Cha
n
aka/QA
_
4
_
0
commit
|
commitdiff
|
tree
2013-05-13
M
a
r
c
De
l
isle
Fi
x
merge co
n
f
l
i
c
ts
commit
|
commitdiff
|
tree
2013-05-13
Marc Delisle
Ch
a
n
geLog
e
ntry f
o
r bug #3
8
98
Str
u
cture not
r
efres
h
e
d
.
.
.
commit
|
commitdiff
|
tree
2013-05-13
Marc Del
i
sle
Merge p
u
ll r
e
quest #374 from ay
u
sun/bug3898_att2
commit
|
commitdiff
|
tree
2013-05-12
Marc Deli
s
le
bug #3915 Import of
C
S
V fil
e
(
R
eplace
t
a
ble data with
.
.
.
commit
|
commitdiff
|
tree
2013-05-11
Ma
r
c Delisle
M
e
rge branch '
M
AINT_4_0
_
1' i
n
to
QA_
4
_0
commit
|
commitdiff
|
tree
2013-05-11
M
arc Del
i
sle
Change
L
og entr
y
f
or bug
#3918
commit
|
commitdiff
|
tree
2013-05-10
Marc Delisle
4
.
0
.
2-de
v
commit
|
commitdiff
|
tree
2013-05-10
Marc Delisle
Merg
e
b
r
a
n
c
h 'MAINT_4_0_1' int
o
QA
_
4
_0
commit
|
commitdiff
|
tree
2013-05-10
M
arc Delisle
4
.
0
.
1-rc
1
commit
|
commitdiff
|
tree
2013-05-09
M
a
rc Delisl
e
C
hangeLog entry fo
r
"fix compat with tcpdf >= 6
.
0
.
.
.
commit
|
commitdiff
|
tree
2013-05-09
Marc Delisle
Chan
g
eLog entry for "add tcpdf
p
ath to vendor_config
.
.
.
commit
|
commitdiff
|
tree
2013-05-08
Marc D
e
lisl
e
Chan
g
eLog entry f
o
r
bug #3
9
08
commit
|
commitdiff
|
tree
2013-05-08
Marc
Del
i
sle
Code cleanup
commit
|
commitdiff
|
tree
2013-05-08
M
ar
c
D
elisle
Fix merge confli
c
ts
commit
|
commitdiff
|
tree
2013-05-03
Ma
r
c D
e
lisle
F
i
x merge con
f
lict
commit
|
commitdiff
|
tree
2013-05-03
M
a
r
c Delisle
Merge
b
ranch 'MAINT_4_0_0' into
QA
_
4_
0
commit
|
commitdiff
|
tree
2013-05-03
Marc D
e
lisle
4
.
0
.
0 release
commit
|
commitdiff
|
tree
2013-04-27
Marc Delisle
Translated u
s
ing Weblate (French)
commit
|
commitdiff
|
tree
2013-04-27
Marc Delisl
e
Merge bra
n
ch 'MAINT_
4
_0_
0
' into QA_4_0
commit
|
commitdiff
|
tree
2013-04-27
M
a
r
c
Delisle
4
.
0
.
0-rc4
commit
|
commitdiff
|
tree
2013-04-27
Marc De
l
isle
Me
r
ge br
a
nch 'MA
I
NT_4_0_0' in
t
o Q
A
_
4_
0
commit
|
commitdiff
|
tree
2013-04-26
Marc D
e
lisle
Merge branch 'QA_
4
_0' of github
.
com:phpmyadmin/
p
hpmyadmin
.
.
.
commit
|
commitdiff
|
tree
2013-04-26
Marc Delisle
C
h
angeLog entry for "Hide l
o
gin data
in backtra
c
e
"
commit
|
commitdiff
|
tree
2013-04-26
Marc Delisle
Transla
t
ed us
i
ng Weblat
e
(French)
commit
|
commitdiff
|
tree
2013-04-26
M
a
rc Delisle
M
erge pull req
u
est
#
284 fr
o
m mynetx/bac
k
trace-hide
.
.
.
commit
|
commitdiff
|
tree
2013-04-25
Marc
D
e
l
is
l
e
4
.
0
.
1-dev
commit
|
commitdiff
|
tree
2013-04-24
Mar
c
Delisle
Typo in input
f
ield name
commit
|
commitdiff
|
tree
2013-04-24
Marc
D
e
lisle
4
.
0
.
0-
r
c3 release
commit
|
commitdiff
|
tree
2013-04-24
M
arc Delisle
Ch
a
ngeLog entries f
o
r securi
t
y fixes
commit
|
commitdiff
|
tree
2013-04-24
M
a
r
c
Delisle
Merge remot
e
b
r
anch 'se
c
urity/QA_4_0-sec
u
rity' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2013-04-24
Marc
D
elisle
Fi
x
mer
g
e
co
n
flicts
commit
|
commitdiff
|
tree
2013-04-24
Marc
D
e
lisle
M
er
g
e branch 'Q
A
_3_5
'
into QA_4
_
0
commit
|
commitdiff
|
tree
2013-04-24
Marc
D
elisle
Fix merge conflic
t
s
commit
|
commitdiff
|
tree
2013-04-24
M
a
rc
D
elis
l
e
3
.
5
.
8
.
1
release
commit
|
commitdiff
|
tree
2013-04-24
Marc Delis
l
e
ChangeLog
e
nt
r
i
es for s
e
curity fixes
commit
|
commitdiff
|
tree
2013-04-24
M
a
r
c
Delisle
S
e
curit
y
:
block another case of remote exe
c
ution vulnerability
commit
|
commitdiff
|
tree
2013-04-24
Marc
D
e
lisle
S
e
curity:
r
emove dots in
template to av
o
i
d a r
e
mo
t
e
.
.
.
commit
|
commitdiff
|
tree
2013-04-24
Marc Delisle
Preve
n
t n
u
ll-by
t
e inje
c
t
i
on in p
r
eg_repl
a
ce(
)
commit
|
commitdiff
|
tree
2013-04-23
Mar
c
Del
i
sl
e
Security: bloc
k
another case
o
f remote
e
xecu
t
i
on v
u
lnerability
commit
|
commitdiff
|
tree
2013-04-23
Marc Deli
s
le
Preve
n
t
nu
l
l-byte injection
in preg_replace()
commit
|
commitdiff
|
tree
2013-04-23
Marc Delisle
- port security commit
(
unsaf
e
u
sage of preg_
r
e
p
lace
.
.
.
commit
|
commitdiff
|
tree
2013-04-23
Mar
c
Delisle
Merge bran
c
h
'
Q
A
_
4
_
0
' i
n
to
QA_4_0-security
commit
|
commitdiff
|
tree
2013-04-20
Marc Delisle
Mer
g
e
p
ull re
q
uest #272
from scnakandala/B
u
g
_
3884
commit
|
commitdiff
|
tree
2013-04-19
Marc Del
i
sle
Fix t
y
po in va
r
iable
name
commit
|
commitdiff
|
tree
2013-04-18
M
arc Del
i
sle
Se
c
urity: sanitize parameter to fi
x
a local file
inclusion
.
.
.
commit
|
commitdiff
|
tree
2013-04-18
Marc D
e
lisle
Security:
a
v
o
id $GLOBALS o
v
erwrite
commit
|
commitdiff
|
tree
2013-04-15
Marc Delisle
Merge branch
'QA_4_0' of gi
t
h
u
b
.
co
m
:
p
hpmyadmin/p
h
pmyadmin
.
.
.
commit
|
commitdiff
|
tree
2013-04-15
Marc Deli
s
le
4
.
0
.
0
-
rc2
commit
|
commitdiff
|
tree
2013-04-14
Mar
c
D
e
lisle
Fix
m
erge conflict
commit
|
commitdiff
|
tree
2013-04-12
M
a
r
c
D
elisle
F
i
x b
r
oken
test
commit
|
commitdiff
|
tree
2013-04-11
M
a
rc Delisle
bug #3871 Ch
e
ck
refer
e
ntial integrity broken
a
cross
.
.
.
commit
|
commitdiff
|
tree
2013-04-08
Marc Delisle
Fix
m
erg
e
c
onflicts
commit
|
commitdiff
|
tree
2013-04-08
Ma
r
c Delisle
Merge branch '
Q
A_3_
5
'
into QA_4_0
commit
|
commitdiff
|
tree
2013-04-08
Marc Delisl
e
Fi
x
merge confl
i
cts
commit
|
commitdiff
|
tree
2013-04-08
M
arc Deli
s
le
Merg
e
bran
c
h 'MAIN
T
_3_5_8' into QA_3_5
commit
|
commitdiff
|
tree
2013-04-08
Marc
D
elisle
3
.
5
.
8
rel
e
ase
commit
|
commitdiff
|
tree
2013-04-03
M
a
rc Delisle
Fix merge conflicts
commit
|
commitdiff
|
tree
2013-04-03
Marc
De
l
isle
M
e
r
ge bra
n
ch 'Q
A
_3_5' into
Q
A_4_
0
commit
|
commitdiff
|
tree
2013-04-03
M
a
rc Delisle
3
.
5
.
9-dev
commit
|
commitdiff
|
tree
2013-04-03
Marc Delisle
Merge branch
'MAINT_3_
5
_8' into Q
A
_3_5
commit
|
commitdiff
|
tree
2013-04-03
Marc Delisle
3
.
5
.
8-rc1
commit
|
commitdiff
|
tree
2013-04-02
Marc Delisl
e
4
.
0
.
0-rc1
commit
|
commitdiff
|
tree
2013-04-02
Ma
r
c Delisle
Fi
x
merge confl
i
cts
commit
|
commitdiff
|
tree
2013-04-02
M
a
rc D
e
l
i
s
l
e
Merge
b
ranch 'QA_3_5'
commit
|
commitdiff
|
tree
2013-04-02
Ma
r
c
D
e
li
s
le
Me
r
g
e
p
u
l
l
re
q
uest #225 from kasun
c
hathu
r
anga/Bug3800
commit
|
commitdiff
|
tree
2013-04-01
Marc Delis
l
e
Comment about the
b
est place to
i
nclude CodeMirr
o
r
commit
|
commitdiff
|
tree
2013-04-01
Marc Delisle
Merge pull r
e
quest #223 from kas
u
nchathuranga/Bug3835
commit
|
commitdiff
|
tree
2013-04-01
Marc
D
e
l
isle
Fix b
u
g "#3853 Blow
f
ish impl
e
men
t
ation migh
t
be broken
.
.
.
commit
|
commitdiff
|
tree
2013-04-01
Marc
D
elisle
Clarify
the logic
commit
|
commitdiff
|
tree
2013-03-30
Ma
r
c
Delisle
Unnecessary l
o
op
commit
|
commitdiff
|
tree
2013-03-29
Marc Delisle
Engl
i
sh improve
m
ent
commit
|
commitdiff
|
tree
2013-03-29
Marc Delisle
E
n
glish imp
r
ovement
commit
|
commitdiff
|
tree
2013-03-29
Marc Delisle
Engl
i
sh impro
v
e
m
e
nt
commit
|
commitdiff
|
tree
2013-03-29
Mar
c
Delisle
En
g
lish improve
m
ent
commit
|
commitdiff
|
tree
2013-03-29
Marc Delisle
Engl
i
sh imp
r
o
v
ement
commit
|
commitdiff
|
tree
2013-03-29
Marc De
l
isle
Eng
l
i
s
h improvement
commit
|
commitdiff
|
tree
2013-03-29
Marc
D
eli
s
le
F
i
x m
e
rge conflict
commit
|
commitdiff
|
tree
2013-03-29
Marc Delisle
Merg
e
branch
'
QA_3_5'
commit
|
commitdiff
|
tree
2013-03-29
Marc Delisle
Use
H
TML5 DOCTYPE
commit
|
commitdiff
|
tree
2013-03-29
M
a
rc Delisle
Fix merge conflicts
commit
|
commitdiff
|
tree
2013-03-29
Marc
D
elisle
Merge branch 'Q
A
_
3
_
5'
commit
|
commitdiff
|
tree
2013-03-29
M
a
rc Delis
l
e
ChangeLog e
n
try f
o
r b
u
g
#3705 Attempt to
o
pen trig
g
er
.
.
.
commit
|
commitdiff
|
tree
2013-03-29
M
arc De
l
isle
Me
r
ge pull request #222 from his
a
mith/missing_error
_
m
e
ssage_
.
.
.
commit
|
commitdiff
|
tree
2013-03-28
Marc D
e
lisle
Inco
r
rect
c
o
mmen
t
commit
|
commitdiff
|
tree
2013-03-27
M
arc Deli
s
le
Merge branch 'master'
of githu
b
.
com:p
h
pmyadmin/phpmyadmin
commit
|
commitdiff
|
tree
2013-03-27
Marc Delisle
M
e
rge
b
r
a
nch 'm
a
ster' of g
i
th
u
b
.
com
:
p
h
p
myadm
i
n/phpmyadmin
commit
|
commitdiff
|
tree
2013-03-27
M
a
rc Delisl
e
Bug #38
6
3 The
column
name '
n
a
m
e'
i
s a MySQL reserved
.
.
.
commit
|
commitdiff
|
tree
2013-03-27
Marc Delisle
4
.
0
.
0-bet
a
3
commit
|
commitdiff
|
tree
2013-03-26
M
arc Delis
l
e
Fix merge c
o
nflicts
commit
|
commitdiff
|
tree
2013-03-26
Marc Delisl
e
Merge bra
n
ch 'QA_3_
5
'
commit
|
commitdiff
|
tree
2013-03-26
Marc
D
elisle
Corre
c
tly detect older a
n
d
n
ewer Safari
commit
|
commitdiff
|
tree
2013-03-26
Mar
c
Delisle
Adjust t
e
s
t
s fo
r
new Saf
a
ri
d
et
e
ction
commit
|
commitdiff
|
tree
2013-03-25
Marc Delisle
Fix
merge con
f
licts
commit
|
commitdiff
|
tree
2013-03-25
M
arc Delisle
Merge branch 'Q
A
_3_5'
commit
|
commitdiff
|
tree
2013-03-25
M
arc Del
i
sle
Bug #
3
854
I
ncorrec
t
hea
d
er for S
a
fari 6
.
0
commit
|
commitdiff
|
tree
next