[phpMyAdmin Git] [phpmyadmin/phpmyadmin] c2c85c: Fix class names
Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c2c85cd15ca71e99d640a4027616f8df5e03f25a https://github.com/phpmyadmin/phpmyadmin/commit/c2c85cd15ca71e99d640a4027616f8df5e03f25a Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M libraries/DatabaseInterface.php Log Message: --- Fix class names Signed-off-by: Michal Čihař ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] b69fa1: Bring back file inclustion, just remove version ch...
Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b69fa1499f9b0d3c39ddfb0e524c64f4ae2ae7f6 https://github.com/phpmyadmin/phpmyadmin/commit/b69fa1499f9b0d3c39ddfb0e524c64f4ae2ae7f6 Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M libraries/plugins/auth/AuthenticationCookie.php Log Message: --- Bring back file inclustion, just remove version check from it Signed-off-by: Michal Čihař ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 072ff0: Remove checks for PHP versions we no longer suppor...
Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 072ff0b38a8e132ae7d6364fb02f8b821168b8b1 https://github.com/phpmyadmin/phpmyadmin/commit/072ff0b38a8e132ae7d6364fb02f8b821168b8b1 Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M libraries/display_import_ajax.lib.php M libraries/plugins/auth/AuthenticationCookie.php M libraries/session.lib.php Log Message: --- Remove checks for PHP versions we no longer support Signed-off-by: Michal Čihař ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin]
Branch: refs/heads/MAINT_4_5_3 Home: https://github.com/phpmyadmin/phpmyadmin ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/website] c8e2db: Remove Marc and mark Isaac as release manager
Branch: refs/heads/master Home: https://github.com/phpmyadmin/website Commit: c8e2db68b41c7226996b7795630a58f7fa5aaabd https://github.com/phpmyadmin/website/commit/c8e2db68b41c7226996b7795630a58f7fa5aaabd Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: R pmaweb/static/images/heads/marc.jpg M pmaweb/templates/team.html Log Message: --- Remove Marc and mark Isaac as release manager Signed-off-by: Michal Čihař ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 42a9a8: 4.5.4-dev
Branch: refs/heads/STABLE Home: https://github.com/phpmyadmin/phpmyadmin Commit: 42a9a81cc05990c087e518c0f07e823dfb100634 https://github.com/phpmyadmin/phpmyadmin/commit/42a9a81cc05990c087e518c0f07e823dfb100634 Author: Marc Delisle Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php Log Message: --- 4.5.4-dev Signed-off-by: Marc Delisle Commit: 0b64ff7f72121b226a47acac5df303ad12e2ae49 https://github.com/phpmyadmin/phpmyadmin/commit/0b64ff7f72121b226a47acac5df303ad12e2ae49 Author: Deven Bansod Date: 2015-12-21 (Mon, 21 Dec 2015) Changed paths: M js/makegrid.js M libraries/sql.lib.php Log Message: --- Fix #11724 : live data edit of big sets is not working Signed-off-by: Deven Bansod Commit: ad769bd0b92708f7c41862c5eb151d0cbbd299af https://github.com/phpmyadmin/phpmyadmin/commit/ad769bd0b92708f7c41862c5eb151d0cbbd299af Author: Michal Čihař Date: 2015-12-21 (Mon, 21 Dec 2015) Changed paths: M js/makegrid.js M libraries/sql.lib.php Log Message: --- Merge pull request #11766 from devenbansod/fix_11724 Fix #11724 : live data edit of big sets is not working Commit: b485166d08e5d355eb25cb2d1a3efd49b07b4d91 https://github.com/phpmyadmin/phpmyadmin/commit/b485166d08e5d355eb25cb2d1a3efd49b07b4d91 Author: Michal Čihař Date: 2015-12-21 (Mon, 21 Dec 2015) Changed paths: M libraries/operations.lib.php M tbl_operations.php Log Message: --- Avoid not needed mb_strtoupper The libraries/tbl_info.inc.php already does this. Issue #11749 Signed-off-by: Michal Čihař Commit: 6cbfe121224be25b84dbf918e655064a09380e84 https://github.com/phpmyadmin/phpmyadmin/commit/6cbfe121224be25b84dbf918e655064a09380e84 Author: Michal Čihař Date: 2015-12-21 (Mon, 21 Dec 2015) Changed paths: M tbl_operations.php Log Message: --- Remove unused code These variables are set on next row anyway. Issue #11749 Signed-off-by: Michal Čihař Commit: 9121ebf525f5f141ba21d2d343b1a7fc915e0aa7 https://github.com/phpmyadmin/phpmyadmin/commit/9121ebf525f5f141ba21d2d343b1a7fc915e0aa7 Author: Deven Bansod Date: 2015-12-21 (Mon, 21 Dec 2015) Changed paths: M ChangeLog Log Message: --- ChangeLog entry for issue #11724 Signed-off-by: Deven Bansod Commit: fe5f69c401347bc402dbfb2cb6e97fa3810b9989 https://github.com/phpmyadmin/phpmyadmin/commit/fe5f69c401347bc402dbfb2cb6e97fa3810b9989 Author: Deven Bansod Date: 2015-12-21 (Mon, 21 Dec 2015) Changed paths: M js/functions.js M js/makegrid.js Log Message: --- Prevent unnecessary update when nothing is changed Signed-off-by: Deven Bansod Commit: d0c79e0294571e8a2f60b6abea454dbc43b06dcc https://github.com/phpmyadmin/phpmyadmin/commit/d0c79e0294571e8a2f60b6abea454dbc43b06dcc Author: Michal Čihař Date: 2015-12-23 (Wed, 23 Dec 2015) Log Message: --- Merge remote-tracking branch 'origin/MAINT_4_5_2' into QA_4_5 Commit: 777a431e3d43c9cc6bb7bb7c80b1f2a04ef3115f https://github.com/phpmyadmin/phpmyadmin/commit/777a431e3d43c9cc6bb7bb7c80b1f2a04ef3115f Author: Michal Čihař Date: 2015-12-23 (Wed, 23 Dec 2015) Changed paths: M ChangeLog M libraries/tbl_info.inc.php Log Message: --- Merge branch 'MAINT_4_5_3' into QA_4_5 Commit: 983c36fd42e38db7a8863e0a09141f57773621f6 https://github.com/phpmyadmin/phpmyadmin/commit/983c36fd42e38db7a8863e0a09141f57773621f6 Author: Martin Lacina Date: 2015-12-23 (Wed, 23 Dec 2015) Changed paths: M po/sk.po Log Message: --- Translated using Weblate (Slovak) Currently translated at 83.8% (2690 of 3210 strings) [CI skip] Commit: 2004c90aebb8e20432f3ba719fc1cbf2e0159b0f https://github.com/phpmyadmin/phpmyadmin/commit/2004c90aebb8e20432f3ba719fc1cbf2e0159b0f Author: Weblate Date: 2015-12-23 (Wed, 23 Dec 2015) Changed paths: M ChangeLog M libraries/tbl_info.inc.php Log Message: --- Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 Commit: bd77d385daa6491524f0fdae6851151c8f2c3216 https://github.com/phpmyadmin/phpmyadmin/commit/bd77d385daa6491524f0fdae6851151c8f2c3216 Author: Marc Delisle Date: 2015-12-23 (Wed, 23 Dec 2015) Changed paths: M ChangeLog Log Message: --- 4.5.3 release date Signed-off-by: Marc Delisle Commit: c9b35f480f3ace0b87f98538a197b23e1d0aeb28 https://github.com/phpmyadmin/phpmyadmin/commit/c9b35f480f3ace0b87f98538a197b23e1d0aeb28 Author: Robin van der Vliet Date: 2015-12-24 (Thu, 24 Dec 2015) Changed paths: M po/eo.po Log Message: --- Translated using Weblate (Esperanto) Currently translated at 2.5% (81 of 3210 strings) [CI skip] Commit: 09c3375ec29d9677515a60c
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 04a20d: Fix syntax error in disabled test
Branch: refs/heads/MAINT_4_0_10 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 04a20d543556d0c1f44bd4857d605107783a207b https://github.com/phpmyadmin/phpmyadmin/commit/04a20d543556d0c1f44bd4857d605107783a207b Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M test/libraries/common/PMA_showMessage_test_disabled.php Log Message: --- Fix syntax error in disabled test Signed-off-by: Michal Čihař ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 460532: Fix #11892 Error with PMA 4.4.15.3
Branch: refs/heads/MAINT_4_4_15 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 46053202720f45f5fbada72cdae6b6bf0c3b5e9b https://github.com/phpmyadmin/phpmyadmin/commit/46053202720f45f5fbada72cdae6b6bf0c3b5e9b Author: Madhura Jayaratne Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationCookie.class.php M libraries/session.inc.php Log Message: --- Fix #11892 Error with PMA 4.4.15.3 Signed-off-by: Madhura Jayaratne Commit: 876298074051dc70d401c4bfc872ea0c7fbb73b0 https://github.com/phpmyadmin/phpmyadmin/commit/876298074051dc70d401c4bfc872ea0c7fbb73b0 Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationCookie.class.php M libraries/session.inc.php Log Message: --- Merge pull request #11894 from madhuracj/bug11892 Fix #11892 Error with PMA 4.4.15.3 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2ea1beb90ea2...876298074051___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 555e73: Fix #11891 Error with PMA 4.0.10.13 with PHP 5.2
Branch: refs/heads/MAINT_4_0_10 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 555e73f177982ad23d0b07d87d018fa77229ff63 https://github.com/phpmyadmin/phpmyadmin/commit/555e73f177982ad23d0b07d87d018fa77229ff63 Author: Madhura Jayaratne Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M ChangeLog M libraries/phpseclib/Crypt/Random.php M libraries/session.inc.php Log Message: --- Fix #11891 Error with PMA 4.0.10.13 with PHP 5.2 Signed-off-by: Madhura Jayaratne Commit: bf2fde282e4d399bcc66befb79f989f67610d89a https://github.com/phpmyadmin/phpmyadmin/commit/bf2fde282e4d399bcc66befb79f989f67610d89a Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M ChangeLog M libraries/phpseclib/Crypt/Random.php M libraries/session.inc.php Log Message: --- Merge pull request #11893 from madhuracj/bug11891 Fix #11891 Error with PMA 4.0.10.13 with PHP 5.2 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3f9c1680c0ed...bf2fde282e4d___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 3f9c16: Skip PDO test on PHP 5.2
Branch: refs/heads/MAINT_4_0_10 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3f9c1680c0edc54d43d6b98fffb5cffa4d7103ed https://github.com/phpmyadmin/phpmyadmin/commit/3f9c1680c0edc54d43d6b98fffb5cffa4d7103ed Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M test/Environment_test.php Log Message: --- Skip PDO test on PHP 5.2 Signed-off-by: Michal Čihař ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] f9b36a: Use syntax compatible with older PHP versions
Branch: refs/heads/MAINT_4_0_10 Home: https://github.com/phpmyadmin/phpmyadmin Commit: f9b36a377a67ef95889bc00cea3cf40ee08db62d https://github.com/phpmyadmin/phpmyadmin/commit/f9b36a377a67ef95889bc00cea3cf40ee08db62d Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M test/Environment_test.php Log Message: --- Use syntax compatible with older PHP versions Signed-off-by: Michal Čihař ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] d4447a: Include more verbose error message
Branch: refs/heads/MAINT_4_0_10 Home: https://github.com/phpmyadmin/phpmyadmin Commit: d4447a53fab90e21ec93e9e120e452659a7f5b54 https://github.com/phpmyadmin/phpmyadmin/commit/d4447a53fab90e21ec93e9e120e452659a7f5b54 Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M test/Environment_test.php Log Message: --- Include more verbose error message Signed-off-by: Michal Čihař ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] e95bb0: Remove own code for generating numeric PHP version
Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e95bb0e361a084deced2dda0b90fc25190b1515b https://github.com/phpmyadmin/phpmyadmin/commit/e95bb0e361a084deced2dda0b90fc25190b1515b Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M libraries/Config.php M libraries/database_interface.inc.php M libraries/display_import_ajax.lib.php M libraries/session.lib.php M test/classes/ConfigTest.php Log Message: --- Remove own code for generating numeric PHP version Since PHP 5.2.7 there is PHP_VERSION_ID for it. Signed-off-by: Michal Čihař ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 1e5d12: Revert "Make test check compatible with PHP 5.2"
Branch: refs/heads/MAINT_4_0_10 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1e5d12abcd870b4eb84abc6302a92e9984eea179 https://github.com/phpmyadmin/phpmyadmin/commit/1e5d12abcd870b4eb84abc6302a92e9984eea179 Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M test/classes/PMA_Advisor_test.php Log Message: --- Revert "Make test check compatible with PHP 5.2" This reverts commit 6babab9874797252b765bd92ca2908bcdc47bd78. Commit: 7ca28f105bb37b4f943224c3916c4eabcf6202f7 https://github.com/phpmyadmin/phpmyadmin/commit/7ca28f105bb37b4f943224c3916c4eabcf6202f7 Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M test/classes/PMA_Advisor_test.php Log Message: --- Skip not supported test on PHP 5.2 Signed-off-by: Michal Čihař Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6babab987479...7ca28f105bb3___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] e167f5: Make the test skip without pdo_mysql
Branch: refs/heads/MAINT_4_0_10 Home: https://github.com/phpmyadmin/phpmyadmin Commit: e167f5ade97bdf65c941da37ab37d115893f7b56 https://github.com/phpmyadmin/phpmyadmin/commit/e167f5ade97bdf65c941da37ab37d115893f7b56 Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M test/Environment_test.php Log Message: --- Make the test skip without pdo_mysql Signed-off-by: Michal Čihař Commit: c1377f30a2fa431a90da565c02aa9b55da5cc34c https://github.com/phpmyadmin/phpmyadmin/commit/c1377f30a2fa431a90da565c02aa9b55da5cc34c Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M libraries/dbi/dummy.lib.php Log Message: --- Define missing queries in the dummy driver Signed-off-by: Michal Čihař Commit: ed9e2b474db5037f43480485f6424db38f62c830 https://github.com/phpmyadmin/phpmyadmin/commit/ed9e2b474db5037f43480485f6424db38f62c830 Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M test/classes/PMA_Config_test.php Log Message: --- Remove non working break Signed-off-by: Michal Čihař Commit: 9b5c64e14d9b898fee82b6908ce4322c6630a412 https://github.com/phpmyadmin/phpmyadmin/commit/9b5c64e14d9b898fee82b6908ce4322c6630a412 Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M test/classes/PMA_Advisor_test.php Log Message: --- Correctly place expected result Signed-off-by: Michal Čihař Commit: 6babab9874797252b765bd92ca2908bcdc47bd78 https://github.com/phpmyadmin/phpmyadmin/commit/6babab9874797252b765bd92ca2908bcdc47bd78 Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M test/classes/PMA_Advisor_test.php Log Message: --- Make test check compatible with PHP 5.2 Signed-off-by: Michal Čihař Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2cc9f5655928...6babab987479___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 2cc9f5: Remove mistakenly pasted filename
Branch: refs/heads/MAINT_4_0_10 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2cc9f5655928b740b1e63035fea53aa400c269ae https://github.com/phpmyadmin/phpmyadmin/commit/2cc9f5655928b740b1e63035fea53aa400c269ae Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M test/classes/PMA_DBQbe_test.php Log Message: --- Remove mistakenly pasted filename Signed-off-by: Michal Čihař ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 00c64c: Skip tests if ReflectionClass::setAccessible is no...
Branch: refs/heads/MAINT_4_0_10 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 00c64c6dde51a3d21e121d778fa3d50639966861 https://github.com/phpmyadmin/phpmyadmin/commit/00c64c6dde51a3d21e121d778fa3d50639966861 Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M test/classes/PMA_DBQbe_test.php M test/classes/PMA_DbSearch_test.php M test/classes/PMA_DisplayResults_test.php M test/classes/PMA_Error_Handler_test.php M test/classes/PMA_Footer_test.php M test/classes/PMA_List_Database_test.php M test/classes/PMA_Scripts_test.php M test/classes/gis/PMA_GIS_Geometry_test.php Log Message: --- Skip tests if ReflectionClass::setAccessible is not available This is the case on PHP 5.2. Signed-off-by: Michal Čihař ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] f1cead: Run php lint on all files
Branch: refs/heads/MAINT_4_0_10 Home: https://github.com/phpmyadmin/phpmyadmin Commit: f1ceadaa46650c21a53634a5cf57f93f8b6c2464 https://github.com/phpmyadmin/phpmyadmin/commit/f1ceadaa46650c21a53634a5cf57f93f8b6c2464 Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M .travis.yml Log Message: --- Run php lint on all files Also avoid trying to use composer on PHP 5.2, it simply doesn't work there. Signed-off-by: Michal Čihař Commit: 16e2f464ffea5472520f94bb433a27adfe676060 https://github.com/phpmyadmin/phpmyadmin/commit/16e2f464ffea5472520f94bb433a27adfe676060 Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M .travis.yml Log Message: --- Try to run Travis own phpunit Signed-off-by: Michal Čihař Compare: https://github.com/phpmyadmin/phpmyadmin/compare/10dd46fca4bb...16e2f464ffea___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 10dd46: Use PHP 5.4 for running composer
Branch: refs/heads/MAINT_4_0_10 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 10dd46fca4bb7bd34e370699dde9b8a53be35636 https://github.com/phpmyadmin/phpmyadmin/commit/10dd46fca4bb7bd34e370699dde9b8a53be35636 Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M .travis.yml Log Message: --- Use PHP 5.4 for running composer Signed-off-by: Michal Čihař ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 632380: Test with PHP 5.2 to ensure we don't again release...
Branch: refs/heads/MAINT_4_0_10 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 632380d3d9e897284e0cd503e2ef7da91b13 https://github.com/phpmyadmin/phpmyadmin/commit/632380d3d9e897284e0cd503e2ef7da91b13 Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M .travis.yml Log Message: --- Test with PHP 5.2 to ensure we don't again release something broken Issue #11891 Signed-off-by: Michal Čihař ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 8b83e0: Use changelog from release notes
Branch: refs/heads/MAINT_4_5_4 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8b83e0de27e7074f3c1cb30f22c5e277a7a83a95 https://github.com/phpmyadmin/phpmyadmin/commit/8b83e0de27e7074f3c1cb30f22c5e277a7a83a95 Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M ChangeLog Log Message: --- Use changelog from release notes Signed-off-by: Michal Čihař ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 8b83e0: Use changelog from release notes
Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8b83e0de27e7074f3c1cb30f22c5e277a7a83a95 https://github.com/phpmyadmin/phpmyadmin/commit/8b83e0de27e7074f3c1cb30f22c5e277a7a83a95 Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M ChangeLog Log Message: --- Use changelog from release notes Signed-off-by: Michal Čihař Commit: 900315e4a33ca1e363440bdb23e2c8245ca63581 https://github.com/phpmyadmin/phpmyadmin/commit/900315e4a33ca1e363440bdb23e2c8245ca63581 Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M ChangeLog Log Message: --- Merge branch 'MAINT_4_5_4' into QA_4_5 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/48cd56d8bfc4...900315e4a33c___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 8b83e0: Use changelog from release notes
Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8b83e0de27e7074f3c1cb30f22c5e277a7a83a95 https://github.com/phpmyadmin/phpmyadmin/commit/8b83e0de27e7074f3c1cb30f22c5e277a7a83a95 Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M ChangeLog Log Message: --- Use changelog from release notes Signed-off-by: Michal Čihař Commit: 900315e4a33ca1e363440bdb23e2c8245ca63581 https://github.com/phpmyadmin/phpmyadmin/commit/900315e4a33ca1e363440bdb23e2c8245ca63581 Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M ChangeLog Log Message: --- Merge branch 'MAINT_4_5_4' into QA_4_5 Commit: d0d29c048dd0bc8dee0529d91bf28ff48d5004da https://github.com/phpmyadmin/phpmyadmin/commit/d0d29c048dd0bc8dee0529d91bf28ff48d5004da Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M ChangeLog Log Message: --- Merge branch 'QA_4_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/830dfe1b3e96...d0d29c048dd0___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 2ea1be: Use changelog from release notes
Branch: refs/heads/MAINT_4_4_15 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2ea1beb90ea27912fb71a08f4f27b59d9ae634d3 https://github.com/phpmyadmin/phpmyadmin/commit/2ea1beb90ea27912fb71a08f4f27b59d9ae634d3 Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M ChangeLog Log Message: --- Use changelog from release notes Signed-off-by: Michal Čihař ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 980ccb: Use changelog from release notes
Branch: refs/heads/MAINT_4_0_10 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 980ccb6ffbb13470b2b9c242a2d8a90efb8ed3c5 https://github.com/phpmyadmin/phpmyadmin/commit/980ccb6ffbb13470b2b9c242a2d8a90efb8ed3c5 Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M ChangeLog Log Message: --- Use changelog from release notes Signed-off-by: Michal Čihař ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 830dfe: Migrate setup language selection to LanguageManage...
Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 830dfe1b3e9660f4513b25f06559189f4d5602df https://github.com/phpmyadmin/phpmyadmin/commit/830dfe1b3e9660f4513b25f06559189f4d5602df Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M setup/frames/index.inc.php Log Message: --- Migrate setup language selection to LanguageManager Signed-off-by: Michal Čihař ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] cda50e: Mention changelog completion
Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: cda50e1a7a1377cda03d62a32e27e04f7960857f https://github.com/phpmyadmin/phpmyadmin/commit/cda50e1a7a1377cda03d62a32e27e04f7960857f Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M scripts/create-release.sh Log Message: --- Mention changelog completion Signed-off-by: Michal Čihař ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 0fe743: Document last release
Branch: refs/heads/MAINT_4_5_4 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0fe7438a05692f2fe305b3a89e55904902a3b562 https://github.com/phpmyadmin/phpmyadmin/commit/0fe7438a05692f2fe305b3a89e55904902a3b562 Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M ChangeLog Log Message: --- Document last release Signed-off-by: Michal Čihař ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 28b588: Document last release
Branch: refs/heads/MAINT_4_0_10 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 28b5882b96c084f30260540163f876cef44f6f62 https://github.com/phpmyadmin/phpmyadmin/commit/28b5882b96c084f30260540163f876cef44f6f62 Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M ChangeLog Log Message: --- Document last release Signed-off-by: Michal Čihař ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 0fe743: Document last release
Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0fe7438a05692f2fe305b3a89e55904902a3b562 https://github.com/phpmyadmin/phpmyadmin/commit/0fe7438a05692f2fe305b3a89e55904902a3b562 Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M ChangeLog Log Message: --- Document last release Signed-off-by: Michal Čihař Commit: 48cd56d8bfc4f2bd80316241bf754ee4f3f94f19 https://github.com/phpmyadmin/phpmyadmin/commit/48cd56d8bfc4f2bd80316241bf754ee4f3f94f19 Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M ChangeLog Log Message: --- Merge branch 'MAINT_4_5_4' into QA_4_5 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1d6efadaeac3...48cd56d8bfc4___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 0fe743: Document last release
Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0fe7438a05692f2fe305b3a89e55904902a3b562 https://github.com/phpmyadmin/phpmyadmin/commit/0fe7438a05692f2fe305b3a89e55904902a3b562 Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M ChangeLog Log Message: --- Document last release Signed-off-by: Michal Čihař Commit: 48cd56d8bfc4f2bd80316241bf754ee4f3f94f19 https://github.com/phpmyadmin/phpmyadmin/commit/48cd56d8bfc4f2bd80316241bf754ee4f3f94f19 Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M ChangeLog Log Message: --- Merge branch 'MAINT_4_5_4' into QA_4_5 Commit: 3db1812e514780a2d81a98ec0c3630fadafde92a https://github.com/phpmyadmin/phpmyadmin/commit/3db1812e514780a2d81a98ec0c3630fadafde92a Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M ChangeLog Log Message: --- Merge branch 'QA_4_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ed96969ff991...3db1812e5147___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 53eb03: Document last release
Branch: refs/heads/MAINT_4_4_15 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 53eb039e0563c900e0584428c9cad1db9392de14 https://github.com/phpmyadmin/phpmyadmin/commit/53eb039e0563c900e0584428c9cad1db9392de14 Author: Michal Čihař Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M ChangeLog Log Message: --- Document last release Signed-off-by: Michal Čihař ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 75a558: Fix XSS in DB_search.php
Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 75a55824012406a08c4debf5ddb7ae41c32a7dbc https://github.com/phpmyadmin/phpmyadmin/commit/75a55824012406a08c4debf5ddb7ae41c32a7dbc Author: Madhura Jayaratne Date: 2016-01-19 (Tue, 19 Jan 2016) Changed paths: M libraries/DbSearch.class.php Log Message: --- Fix XSS in DB_search.php Signed-off-by: Madhura Jayaratne Commit: 5aee5035646c4fc617564cb0d3d58c0435d64d81 https://github.com/phpmyadmin/phpmyadmin/commit/5aee5035646c4fc617564cb0d3d58c0435d64d81 Author: Madhura Jayaratne Date: 2016-01-19 (Tue, 19 Jan 2016) Changed paths: M setup/frames/form.inc.php M setup/index.php M setup/validate.php Log Message: --- Fix path disclosure, items 1.4.x, 1.5 and 1.6 Signed-off-by: Madhura Jayaratne Commit: 019c4f25d500ec5db9ba3b84cc961a7e4e850738 https://github.com/phpmyadmin/phpmyadmin/commit/019c4f25d500ec5db9ba3b84cc961a7e4e850738 Author: Madhura Jayaratne Date: 2016-01-19 (Tue, 19 Jan 2016) Changed paths: M js/normalization.js Log Message: --- Fix XSS in normalization.php Signed-off-by: Madhura Jayaratne Commit: edffb52884b09562490081c3b8666ef46c296418 https://github.com/phpmyadmin/phpmyadmin/commit/edffb52884b09562490081c3b8666ef46c296418 Author: Madhura Jayaratne Date: 2016-01-19 (Tue, 19 Jan 2016) Changed paths: M templates/table/search/rows_zoom.phtml Log Message: --- Fix XSS in zoom search Signed-off-by: Madhura Jayaratne Commit: ec0e88e37ef30a66eada1c072953f4ec385a3e49 https://github.com/phpmyadmin/phpmyadmin/commit/ec0e88e37ef30a66eada1c072953f4ec385a3e49 Author: Michal Čihař Date: 2016-01-19 (Tue, 19 Jan 2016) Changed paths: M libraries/common.inc.php M libraries/core.lib.php Log Message: --- Use hash_equals for comparing token Signed-off-by: Michal Čihař Commit: 0a24f92d081033576bfdd9d4bdec1a54501734c1 https://github.com/phpmyadmin/phpmyadmin/commit/0a24f92d081033576bfdd9d4bdec1a54501734c1 Author: Michal Čihař Date: 2016-01-19 (Tue, 19 Jan 2016) Changed paths: M import_status.php M libraries/Response.class.php M libraries/core.lib.php M libraries/display_import_ajax.lib.php M lint.php M normalization.php M setup/validate.php M version_check.php Log Message: --- Set correct content type for JSON responses Signed-off-by: Michal Čihař Commit: f20970d32c3dfdf82aef7b6c244da1f769043813 https://github.com/phpmyadmin/phpmyadmin/commit/f20970d32c3dfdf82aef7b6c244da1f769043813 Author: Michal Čihař Date: 2016-01-19 (Tue, 19 Jan 2016) Changed paths: M libraries/session.inc.php Log Message: --- Use phpseclib's Crypt::Random to generate CSRF token Signed-off-by: Michal Čihař Commit: cb7748ac9cffcd1cd0f3081499cd4aafa9d1065e https://github.com/phpmyadmin/phpmyadmin/commit/cb7748ac9cffcd1cd0f3081499cd4aafa9d1065e Author: Michal Čihař Date: 2016-01-19 (Tue, 19 Jan 2016) Changed paths: M libraries/phpseclib/Crypt/AES.php M libraries/phpseclib/Crypt/Base.php M libraries/phpseclib/Crypt/Random.php M libraries/phpseclib/Crypt/Rijndael.php Log Message: --- Update phpseclib to 2.0.1 New version uses PHP 7.0 random_bytes to generate cryptographically secure pseudo-random bytes. Signed-off-by: Michal Čihař Commit: 11496890d7e21786cbfd9fd17ab968f498116b3f https://github.com/phpmyadmin/phpmyadmin/commit/11496890d7e21786cbfd9fd17ab968f498116b3f Author: Michal Čihař Date: 2016-01-19 (Tue, 19 Jan 2016) Changed paths: M js/codemirror/addon/lint/sql-lint.js Log Message: --- Tell jQuery we're expecting JSON here It's better to be explicit rather than relying on autodetection. Signed-off-by: Michal Čihař Commit: aca42efa01917cc0fe8cfdb2927a6399ca1742f2 https://github.com/phpmyadmin/phpmyadmin/commit/aca42efa01917cc0fe8cfdb2927a6399ca1742f2 Author: Michal Čihař Date: 2016-01-25 (Mon, 25 Jan 2016) Changed paths: M templates/header_location.phtml Log Message: --- Escape javascript variable content Signed-off-by: Michal Čihař Commit: 671d61830417101352fd8153f276f8854bb17fd0 https://github.com/phpmyadmin/phpmyadmin/commit/671d61830417101352fd8153f276f8854bb17fd0 Author: Michal Čihař Date: 2016-01-25 (Mon, 25 Jan 2016) Changed paths: M ChangeLog M db_create.php M db_designer.php M export.php M gis_data_editor.php M js/server_status_monitor.js M js/server_status_variables.js M js/server_variables.js M libraries/sql.lib.php M schema_export.php M test/libraries/PMA_operations_test.php Log Message: --- Merge branch 'MAINT_4_5_4' into MAINT_4_5_4-security Commit: 8dedcc1a175eb07debd4fe116407c43694c60b22 https://github
[phpMyAdmin Git] [phpmyadmin/phpmyadmin]
Branch: refs/tags/RELEASE_4_4_15_3 Home: https://github.com/phpmyadmin/phpmyadmin ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] ac8159: [Security] Fix path disclosure, items 1.4.x, 1.5 a...
Branch: refs/heads/MAINT_4_0_10 Home: https://github.com/phpmyadmin/phpmyadmin Commit: ac81596bfcf0b3cae9f6bc821efa4aa1c7f0c81d https://github.com/phpmyadmin/phpmyadmin/commit/ac81596bfcf0b3cae9f6bc821efa4aa1c7f0c81d Author: Madhura Jayaratne Date: 2016-01-15 (Fri, 15 Jan 2016) Changed paths: M setup/frames/form.inc.php M setup/index.php M setup/validate.php Log Message: --- [Security] Fix path disclosure, items 1.4.x, 1.5 and 1.6 Signed-off-by: Madhura Jayaratne Commit: 9f3488fc3ab6b83618dbb4bebbea4b973764e2ac https://github.com/phpmyadmin/phpmyadmin/commit/9f3488fc3ab6b83618dbb4bebbea4b973764e2ac Author: Madhura Jayaratne Date: 2016-01-19 (Tue, 19 Jan 2016) Changed paths: M libraries/TableSearch.class.php Log Message: --- Fix XSS in zoom search Signed-off-by: Madhura Jayaratne Commit: 0ce4fd2750491a54d27f94cc1403f9da21738aa6 https://github.com/phpmyadmin/phpmyadmin/commit/0ce4fd2750491a54d27f94cc1403f9da21738aa6 Author: Madhura Jayaratne Date: 2016-01-19 (Tue, 19 Jan 2016) Changed paths: M libraries/DbSearch.class.php Log Message: --- Fix XSS in DB_search.php Signed-off-by: Madhura Jayaratne Commit: 6a96e67487f2faecb4de4204fee9b96b94020720 https://github.com/phpmyadmin/phpmyadmin/commit/6a96e67487f2faecb4de4204fee9b96b94020720 Author: Michal Čihař Date: 2016-01-26 (Tue, 26 Jan 2016) Changed paths: M js/functions.js Log Message: --- Use secure RNG if available Recent browsers come with better RNG, so let's use it for generating password instead of Math.random if available. Signed-off-by: Michal Čihař Commit: 2369daa7f5f550797f560e6b46a021e4558c2d72 https://github.com/phpmyadmin/phpmyadmin/commit/2369daa7f5f550797f560e6b46a021e4558c2d72 Author: Michal Čihař Date: 2016-01-26 (Tue, 26 Jan 2016) Changed paths: M js/functions.js Log Message: --- Use full alphabet to generate random passwords Signed-off-by: Michal Čihař Commit: 6fe54dfa000dd6f43f237e859781fad7111ac1bd https://github.com/phpmyadmin/phpmyadmin/commit/6fe54dfa000dd6f43f237e859781fad7111ac1bd Author: Michal Čihař Date: 2016-01-26 (Tue, 26 Jan 2016) Changed paths: A libraries/phpseclib/Crypt/Random.php M libraries/session.inc.php Log Message: --- Use phpseclib's Crypt::Random to generate CSRF token Signed-off-by: Michal Čihař Commit: 27eb98faedcdcd0b856577fcbdfe3e87b2445345 https://github.com/phpmyadmin/phpmyadmin/commit/27eb98faedcdcd0b856577fcbdfe3e87b2445345 Author: Madhura Jayaratne Date: 2016-01-26 (Tue, 26 Jan 2016) Changed paths: M libraries/core.lib.php Log Message: --- Escape javascript variable content Signed-off-by: Madhura Jayaratne Commit: fe62b69a5b032de8e1d9d0a04456c1cecf46428c https://github.com/phpmyadmin/phpmyadmin/commit/fe62b69a5b032de8e1d9d0a04456c1cecf46428c Author: Michal Čihař Date: 2016-01-26 (Tue, 26 Jan 2016) Changed paths: M libraries/common.inc.php M libraries/core.lib.php Log Message: --- Use hash_equals for comparing token Signed-off-by: Michal Čihař Commit: 8023340a259ecae6a3bd9268f4e39d097bdf0146 https://github.com/phpmyadmin/phpmyadmin/commit/8023340a259ecae6a3bd9268f4e39d097bdf0146 Author: Michal Čihař Date: 2016-01-26 (Tue, 26 Jan 2016) Changed paths: M libraries/common.inc.php Log Message: --- Include common libraries in setup We use PMA_fatalError which in turn needs Response and related objects. Signed-off-by: Michal Čihař Commit: 215f4a8ebe717ba646be00fca8519cf768a902f5 https://github.com/phpmyadmin/phpmyadmin/commit/215f4a8ebe717ba646be00fca8519cf768a902f5 Author: Michal Čihař Date: 2016-01-26 (Tue, 26 Jan 2016) Changed paths: M setup/lib/common.inc.php Log Message: --- Can not use PMA_fatalError when including fails Signed-off-by: Michal Čihař Commit: 7056ca9458d26b24a6b1d9255073237c1636ca33 https://github.com/phpmyadmin/phpmyadmin/commit/7056ca9458d26b24a6b1d9255073237c1636ca33 Author: Michal Čihař Date: 2016-01-26 (Tue, 26 Jan 2016) Changed paths: M libraries/common.inc.php Log Message: --- Do not process subforms with PMA_MINIMUM_COMMON In such case needed infrastructure is not loaded, so related code won't work anyway. Signed-off-by: Michal Čihař Commit: 25738352df8057b542eeac3237eb6fd1d3ba4289 https://github.com/phpmyadmin/phpmyadmin/commit/25738352df8057b542eeac3237eb6fd1d3ba4289 Author: Michal Čihař Date: 2016-01-26 (Tue, 26 Jan 2016) Changed paths: M libraries/database_interface.lib.php Log Message: --- Fallback to default collation connection If user supplied wrong string we should gracefully fallback. Signed-off-by: Michal Čihař Commit: 5b79467245b6e0a476775e2958b42088794f8e02
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 75a558: Fix XSS in DB_search.php
Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 75a55824012406a08c4debf5ddb7ae41c32a7dbc https://github.com/phpmyadmin/phpmyadmin/commit/75a55824012406a08c4debf5ddb7ae41c32a7dbc Author: Madhura Jayaratne Date: 2016-01-19 (Tue, 19 Jan 2016) Changed paths: M libraries/DbSearch.class.php Log Message: --- Fix XSS in DB_search.php Signed-off-by: Madhura Jayaratne Commit: 5aee5035646c4fc617564cb0d3d58c0435d64d81 https://github.com/phpmyadmin/phpmyadmin/commit/5aee5035646c4fc617564cb0d3d58c0435d64d81 Author: Madhura Jayaratne Date: 2016-01-19 (Tue, 19 Jan 2016) Changed paths: M setup/frames/form.inc.php M setup/index.php M setup/validate.php Log Message: --- Fix path disclosure, items 1.4.x, 1.5 and 1.6 Signed-off-by: Madhura Jayaratne Commit: 019c4f25d500ec5db9ba3b84cc961a7e4e850738 https://github.com/phpmyadmin/phpmyadmin/commit/019c4f25d500ec5db9ba3b84cc961a7e4e850738 Author: Madhura Jayaratne Date: 2016-01-19 (Tue, 19 Jan 2016) Changed paths: M js/normalization.js Log Message: --- Fix XSS in normalization.php Signed-off-by: Madhura Jayaratne Commit: edffb52884b09562490081c3b8666ef46c296418 https://github.com/phpmyadmin/phpmyadmin/commit/edffb52884b09562490081c3b8666ef46c296418 Author: Madhura Jayaratne Date: 2016-01-19 (Tue, 19 Jan 2016) Changed paths: M templates/table/search/rows_zoom.phtml Log Message: --- Fix XSS in zoom search Signed-off-by: Madhura Jayaratne Commit: ec0e88e37ef30a66eada1c072953f4ec385a3e49 https://github.com/phpmyadmin/phpmyadmin/commit/ec0e88e37ef30a66eada1c072953f4ec385a3e49 Author: Michal Čihař Date: 2016-01-19 (Tue, 19 Jan 2016) Changed paths: M libraries/common.inc.php M libraries/core.lib.php Log Message: --- Use hash_equals for comparing token Signed-off-by: Michal Čihař Commit: 0a24f92d081033576bfdd9d4bdec1a54501734c1 https://github.com/phpmyadmin/phpmyadmin/commit/0a24f92d081033576bfdd9d4bdec1a54501734c1 Author: Michal Čihař Date: 2016-01-19 (Tue, 19 Jan 2016) Changed paths: M import_status.php M libraries/Response.class.php M libraries/core.lib.php M libraries/display_import_ajax.lib.php M lint.php M normalization.php M setup/validate.php M version_check.php Log Message: --- Set correct content type for JSON responses Signed-off-by: Michal Čihař Commit: f20970d32c3dfdf82aef7b6c244da1f769043813 https://github.com/phpmyadmin/phpmyadmin/commit/f20970d32c3dfdf82aef7b6c244da1f769043813 Author: Michal Čihař Date: 2016-01-19 (Tue, 19 Jan 2016) Changed paths: M libraries/session.inc.php Log Message: --- Use phpseclib's Crypt::Random to generate CSRF token Signed-off-by: Michal Čihař Commit: cb7748ac9cffcd1cd0f3081499cd4aafa9d1065e https://github.com/phpmyadmin/phpmyadmin/commit/cb7748ac9cffcd1cd0f3081499cd4aafa9d1065e Author: Michal Čihař Date: 2016-01-19 (Tue, 19 Jan 2016) Changed paths: M libraries/phpseclib/Crypt/AES.php M libraries/phpseclib/Crypt/Base.php M libraries/phpseclib/Crypt/Random.php M libraries/phpseclib/Crypt/Rijndael.php Log Message: --- Update phpseclib to 2.0.1 New version uses PHP 7.0 random_bytes to generate cryptographically secure pseudo-random bytes. Signed-off-by: Michal Čihař Commit: 11496890d7e21786cbfd9fd17ab968f498116b3f https://github.com/phpmyadmin/phpmyadmin/commit/11496890d7e21786cbfd9fd17ab968f498116b3f Author: Michal Čihař Date: 2016-01-19 (Tue, 19 Jan 2016) Changed paths: M js/codemirror/addon/lint/sql-lint.js Log Message: --- Tell jQuery we're expecting JSON here It's better to be explicit rather than relying on autodetection. Signed-off-by: Michal Čihař Commit: aca42efa01917cc0fe8cfdb2927a6399ca1742f2 https://github.com/phpmyadmin/phpmyadmin/commit/aca42efa01917cc0fe8cfdb2927a6399ca1742f2 Author: Michal Čihař Date: 2016-01-25 (Mon, 25 Jan 2016) Changed paths: M templates/header_location.phtml Log Message: --- Escape javascript variable content Signed-off-by: Michal Čihař Commit: 671d61830417101352fd8153f276f8854bb17fd0 https://github.com/phpmyadmin/phpmyadmin/commit/671d61830417101352fd8153f276f8854bb17fd0 Author: Michal Čihař Date: 2016-01-25 (Mon, 25 Jan 2016) Changed paths: M ChangeLog M db_create.php M db_designer.php M export.php M gis_data_editor.php M js/server_status_monitor.js M js/server_status_variables.js M js/server_variables.js M libraries/sql.lib.php M schema_export.php M test/libraries/PMA_operations_test.php Log Message: --- Merge branch 'MAINT_4_5_4' into MAINT_4_5_4-security Commit: 8dedcc1a175eb07debd4fe116407c43694c60b22 https://github