Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 0b088f6790a6b2674f5037b4a529afbcd4d60ddd
https://github.com/phpmyadmin/phpmyadmin/commit/0b088f6790a6b2674f5037b4a52…
Author: Isaac Bennetch <bennetch(a)gmail.com>
Date: 2017-03-08 (Wed, 08 Mar 2017)
Changed paths:
M ChangeLog
M libraries/config.default.php
Log Message:
-----------
Change defaults when exporting to Excel; now we include field/column names as the first row.
This is always configurable via $cfg['Export']['excel_columns']
Fixes #12951
Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com>
Commit: 6d6dc8161754a9ab8946314ff4e92f070dadae18
https://github.com/phpmyadmin/phpmyadmin/commit/6d6dc8161754a9ab8946314ff4e…
Author: Isaac Bennetch <bennetch(a)gmail.com>
Date: 2017-03-08 (Wed, 08 Mar 2017)
Changed paths:
M libraries/di/Container.php
Log Message:
-----------
Fix small typo in function comment
Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com>
Commit: 4011041d4fdcae03d0a12747315557d55746bb47
https://github.com/phpmyadmin/phpmyadmin/commit/4011041d4fdcae03d0a12747315…
Author: Isaac Bennetch <bennetch(a)gmail.com>
Date: 2017-03-08 (Wed, 08 Mar 2017)
Changed paths:
M ChangeLog
M libraries/config.default.php
M libraries/di/Container.php
Log Message:
-----------
Merge branch 'QA_4_7'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2d8b8a8b607b...4011041d4fdc
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: a6a917e2622a7e28a1d63996a305c909d37bc7d7
https://github.com/phpmyadmin/phpmyadmin/commit/a6a917e2622a7e28a1d63996a30…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-03-06 (Mon, 06 Mar 2017)
Changed paths:
M test/classes/UtilTest.php
Log Message:
-----------
Remove github from tests
We no longer access it directly.
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: b89f568e1cfd9acc9c21a8a0a6a8c7c21bdd8b2f
https://github.com/phpmyadmin/phpmyadmin/commit/b89f568e1cfd9acc9c21a8a0a6a…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-03-06 (Mon, 06 Mar 2017)
Changed paths:
M libraries/Util.php
Log Message:
-----------
Check whether setting options did succeed
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 0a5b9de08421667445024d8c9cc0efd12fe5a052
https://github.com/phpmyadmin/phpmyadmin/commit/0a5b9de08421667445024d8c9cc…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-03-06 (Mon, 06 Mar 2017)
Changed paths:
M libraries/Util.php
Log Message:
-----------
Try to debug test failure on Travis
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: b71371a9138adc4a97c5346656cf9a854e1f3d63
https://github.com/phpmyadmin/phpmyadmin/commit/b71371a9138adc4a97c5346656c…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-03-06 (Mon, 06 Mar 2017)
Changed paths:
M libraries/Util.php
A libraries/certs/4042bcee.0
A libraries/certs/6187b673.0
A libraries/certs/isrgrootx1.pem
R libraries/isrgrootx1.pem
Log Message:
-----------
Move certificates to separate directory
- this makes it easier to manage
- overriding capath seems to have priority
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 3d24d08e41a021bcbbc51464ec670ad7c3a4a173
https://github.com/phpmyadmin/phpmyadmin/commit/3d24d08e41a021bcbbc51464ec6…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-03-06 (Mon, 06 Mar 2017)
Changed paths:
M libraries/Util.php
Log Message:
-----------
Show system variables on error
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 214a2b6b341b14efb6405a78dd7102a8725823ae
https://github.com/phpmyadmin/phpmyadmin/commit/214a2b6b341b14efb6405a78dd7…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-03-06 (Mon, 06 Mar 2017)
Changed paths:
M libraries/Util.php
Log Message:
-----------
Rewrite SSL verification code for curl
It seems that the curl extension is quite tricky what can be set. You
can not set both CURLOPT_CAINFO and CURLOPT_CAPATH. Unfortunately some
systems seem to have built in defaults for one of these which can not be
figured out of PHP. So let's just try the three options which make
sense.
Issue #12846
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 4312b16a549666aad464fd77ca0854a77ac6f117
https://github.com/phpmyadmin/phpmyadmin/commit/4312b16a549666aad464fd77ca0…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-03-06 (Mon, 06 Mar 2017)
Changed paths:
A libraries/certs/4042bcee.0
R libraries/certs/4042bcee.0
A libraries/certs/6187b673.0
R libraries/certs/6187b673.0
Log Message:
-----------
Avoid using symlinks in certificate storage
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 2d8b8a8b607b986210a51be040beab189bb31c97
https://github.com/phpmyadmin/phpmyadmin/commit/2d8b8a8b607b986210a51be040b…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-03-06 (Mon, 06 Mar 2017)
Changed paths:
M libraries/Util.php
A libraries/certs/4042bcee.0
A libraries/certs/6187b673.0
A libraries/certs/isrgrootx1.pem
R libraries/isrgrootx1.pem
M test/classes/UtilTest.php
Log Message:
-----------
Merge branch 'QA_4_7'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6ca6685ee0ba...2d8b8a8b607b
Branch: refs/heads/QA_4_7
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 214a2b6b341b14efb6405a78dd7102a8725823ae
https://github.com/phpmyadmin/phpmyadmin/commit/214a2b6b341b14efb6405a78dd7…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-03-06 (Mon, 06 Mar 2017)
Changed paths:
M libraries/Util.php
Log Message:
-----------
Rewrite SSL verification code for curl
It seems that the curl extension is quite tricky what can be set. You
can not set both CURLOPT_CAINFO and CURLOPT_CAPATH. Unfortunately some
systems seem to have built in defaults for one of these which can not be
figured out of PHP. So let's just try the three options which make
sense.
Issue #12846
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 4312b16a549666aad464fd77ca0854a77ac6f117
https://github.com/phpmyadmin/phpmyadmin/commit/4312b16a549666aad464fd77ca0…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-03-06 (Mon, 06 Mar 2017)
Changed paths:
A libraries/certs/4042bcee.0
R libraries/certs/4042bcee.0
A libraries/certs/6187b673.0
R libraries/certs/6187b673.0
Log Message:
-----------
Avoid using symlinks in certificate storage
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3d24d08e41a0...4312b16a5496
Branch: refs/heads/QA_4_7
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: b71371a9138adc4a97c5346656cf9a854e1f3d63
https://github.com/phpmyadmin/phpmyadmin/commit/b71371a9138adc4a97c5346656c…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-03-06 (Mon, 06 Mar 2017)
Changed paths:
M libraries/Util.php
A libraries/certs/4042bcee.0
A libraries/certs/6187b673.0
A libraries/certs/isrgrootx1.pem
R libraries/isrgrootx1.pem
Log Message:
-----------
Move certificates to separate directory
- this makes it easier to manage
- overriding capath seems to have priority
Signed-off-by: Michal Čihař <michal(a)cihar.com>