Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 9290c6857e742d9f15e73c2d22454555afe9c297
https://github.com/phpmyadmin/phpmyadmin/commit/9290c6857e742d9f15e73c2d224…
Author: Hugues Peccatte <hugues.peccatte(a)gmail.com>
Date: 2014-03-14 (Fri, 14 Mar 2014)
Changed paths:
M test/libraries/common/PMA_cache_test.php
M test/libraries/common/PMA_contains_nonprintable_ascii_test.php
M test/libraries/common/PMA_escapeMySqlWildcards_test.php
M test/libraries/common/PMA_extractColumnSpec_test.php
M test/libraries/common/PMA_foreignKeySupported_test.php
M test/libraries/core/PMA_getLinks_test.php
M test/libraries/core/PMA_isValid_test.php
M test/libraries/rte/PMA_TRI_getEditorForm_test.php
M test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php
Log Message:
-----------
PHPCS updates.
Signed-off-by: Hugues Peccatte <hugues.peccatte(a)gmail.com>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 8b2d5c4cec96cfd0ffd8595609cc552fe97cc1be
https://github.com/phpmyadmin/phpmyadmin/commit/8b2d5c4cec96cfd0ffd8595609c…
Author: Erik Hepsø <hepso(a)hoved.org>
Date: 2014-03-13 (Thu, 13 Mar 2014)
Changed paths:
M po/nb.po
Log Message:
-----------
Translated using Weblate (Norwegian Bokmål)
Currently translated at 66.4% (1828 of 2749)
Commit: 199d560e8e5a74555939d2083322fe3435ca6a5e
https://github.com/phpmyadmin/phpmyadmin/commit/199d560e8e5a74555939d208332…
Author: Nicholas Arnesen <baretester(a)live.no>
Date: 2014-03-13 (Thu, 13 Mar 2014)
Changed paths:
M po/nb.po
Log Message:
-----------
Translated using Weblate (Norwegian Bokmål)
Currently translated at 66.5% (1829 of 2749)
Commit: 3e83565cf22332f5968cf77ac6861e8d3bd354ed
https://github.com/phpmyadmin/phpmyadmin/commit/3e83565cf22332f5968cf77ac68…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2014-03-14 (Fri, 14 Mar 2014)
Changed paths:
M test/classes/PMA_Advisor_test.php
Log Message:
-----------
Fix order of params to assertEquals
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 3d0f2370318702b27f3a36b42ab3cb38adb727c7
https://github.com/phpmyadmin/phpmyadmin/commit/3d0f2370318702b27f3a36b42ab…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2014-03-14 (Fri, 14 Mar 2014)
Changed paths:
M test/classes/PMA_Advisor_test.php
Log Message:
-----------
Fix expected message to match code
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 53cc186591f574299fe1951873fa9458b291b6e2
https://github.com/phpmyadmin/phpmyadmin/commit/53cc186591f574299fe1951873f…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2014-03-14 (Fri, 14 Mar 2014)
Changed paths:
M libraries/Advisor.class.php
Log Message:
-----------
Fixed ob_start/eval problems in phpunit
When running in phpunit, the eval can raise exception, so treat it same
as it would be output returned by the eval. Without catching it, output
buffering gets one more level of nesting leading to occassional
timeouts in Travis-CI.
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 7b3de5b5662560d91e778ddb1cb2bb3f99a8dfc3
https://github.com/phpmyadmin/phpmyadmin/commit/7b3de5b5662560d91e778ddb1cb…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2014-03-14 (Fri, 14 Mar 2014)
Log Message:
-----------
Merge commit '199d560e8e5a74555939d2083322fe3435ca6a5e'
Commit: 0de05db1134955f79fb02096c197e464379c7f2c
https://github.com/phpmyadmin/phpmyadmin/commit/0de05db1134955f79fb02096c19…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2014-03-14 (Fri, 14 Mar 2014)
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_1'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9dfe58cb3d34...0de05db11349