Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2bf398a3a8d0627b88398384af246367cc1e00ba https://github.com/phpmyadmin/phpmyadmin/commit/2bf398a3a8d0627b88398384af24... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-10-10 (Mon, 10 Oct 2016)
Changed paths: M templates/navigation/logo.phtml
Log Message: ----------- Use sprintf instead of directly concatenating the variable
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Commit: 7bf85fe817114460de0ad51cf436d1921aef2924 https://github.com/phpmyadmin/phpmyadmin/commit/7bf85fe817114460de0ad51cf436... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-10-10 (Mon, 10 Oct 2016)
Changed paths: M libraries/navigation/NavigationTree.php M libraries/navigation/nodes/Node.php
Log Message: ----------- Use sprintf instead of directly concatenating the variable
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Commit: 62517b08e248401d8ac57bcec0a0809374c9cf26 https://github.com/phpmyadmin/phpmyadmin/commit/62517b08e248401d8ac57bcec0a0... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M libraries/navigation/NavigationTree.php M libraries/navigation/nodes/Node.php
Log Message: ----------- Merge remote-tracking branch 'security/pull/218' into QA_4_6-security
Commit: 624b067d5f3473db3a93b4281744bc613ed1e93f https://github.com/phpmyadmin/phpmyadmin/commit/624b067d5f3473db3a93b4281744... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M libraries/navigation/NavigationTree.php M libraries/navigation/nodes/Node.php
Log Message: ----------- Merge branch 'QA_4_6-security' into master-security
Commit: 3c9d440990b9d6462b9d5eea739c3b5fc18c5967 https://github.com/phpmyadmin/phpmyadmin/commit/3c9d440990b9d6462b9d5eea739c... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M templates/navigation/logo.phtml
Log Message: ----------- Merge remote-tracking branch 'security/pull/217' into QA_4_6-security
Commit: 96b4f13e54c9ebbebfd19d0690bfa0812b6818c1 https://github.com/phpmyadmin/phpmyadmin/commit/96b4f13e54c9ebbebfd19d0690bf... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M libraries/controllers/database/DatabaseStructureController.php
Log Message: ----------- Quote table name for use in regexp
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 4c84070ad6136c3158caa93286754ebbfbce61ab https://github.com/phpmyadmin/phpmyadmin/commit/4c84070ad6136c3158caa9328675... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M setup/frames/index.inc.php
Log Message: ----------- Avoid using REQUEST_URI in form action
It's really not necessary here and might cause redirection issues.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 9d712359d00afa828d5dd70325b213071d411f83 https://github.com/phpmyadmin/phpmyadmin/commit/9d712359d00afa828d5dd70325b2... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M libraries/navigation/NavigationTree.php
Log Message: ----------- Fix typo
Signed-off-by: Michal Čihař michal@cihar.com
Commit: e37bf40f44a3272a6709eb5b38feccac41658e3f https://github.com/phpmyadmin/phpmyadmin/commit/e37bf40f44a3272a6709eb5b38fe... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M libraries/config/PageSettings.php
Log Message: ----------- Avoid using REQUEST_URI for redirection
* Stick with PMA_sendHeaderLocation to handle server weirdness * Use already calculated URL
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 715732271931711e1836304ce6e3991c6f020a81 https://github.com/phpmyadmin/phpmyadmin/commit/715732271931711e1836304ce6e3... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M libraries/config/PageSettings.php M libraries/controllers/database/DatabaseStructureController.php M libraries/navigation/NavigationTree.php M setup/frames/index.inc.php M templates/navigation/logo.phtml
Log Message: ----------- Merge branch 'QA_4_6-security' into master-security
Commit: ec6c55c1df67b6a6e809087b095f36cfcf703d9f https://github.com/phpmyadmin/phpmyadmin/commit/ec6c55c1df67b6a6e809087b095f... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M libraries/config/PageSettings.php
Log Message: ----------- Add missing ;
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 9e5d3b8feb075af4b495d2f4258dac757606ded6 https://github.com/phpmyadmin/phpmyadmin/commit/9e5d3b8feb075af4b495d2f4258d... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M libraries/config/PageSettings.php
Log Message: ----------- Merge branch 'QA_4_6-security' into master-security
Commit: 4516a22c90e7f666b6cbae1640bbb6aed9f6deef https://github.com/phpmyadmin/phpmyadmin/commit/4516a22c90e7f666b6cbae1640bb... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M libraries/replication.inc.php
Log Message: ----------- Merge branch 'master' into master-security
Commit: a134a0117765644cd6d9311b5e3d963a20e6ed15 https://github.com/phpmyadmin/phpmyadmin/commit/a134a0117765644cd6d9311b5e3d... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M tbl_replace.php
Log Message: ----------- Avoid infinite recursion on goto
Signed-off-by: Michal Čihař michal@cihar.com
Commit: a9d05bf6ff521a9cc59ff3ea0c34a56cfc93115a https://github.com/phpmyadmin/phpmyadmin/commit/a9d05bf6ff521a9cc59ff3ea0c34... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M tbl_replace.php
Log Message: ----------- Merge branch 'QA_4_6-security' into master-security
Commit: 3a6247674e653507294f23480b4c0e1c532badbe https://github.com/phpmyadmin/phpmyadmin/commit/3a6247674e653507294f23480b4c... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M libraries/Theme.php
Log Message: ----------- Do not provide fallback to cookie for font size
* This should be already handled by Config class * Injecting cookie value to CSS could be security risk
Signed-off-by: Michal Čihař michal@cihar.com
Commit: fe394c90a877216cb34e58997b557dca79fd94ab https://github.com/phpmyadmin/phpmyadmin/commit/fe394c90a877216cb34e58997b55... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M scripts/create-release.sh M scripts/generate-mo M scripts/generate-sprites M scripts/lang-cleanup.sh M scripts/line-counts.sh M scripts/locales-contributors M scripts/remove-incomplete-mo M scripts/transformations_generator_main_class.sh M scripts/transformations_generator_plugin.sh M scripts/update-po M scripts/upload-release M test/install-browserstack M test/install-runkit M test/start-local-server
Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security
Commit: 3b6ed1f9ecaab86c488d106b1588d7683a6d53ef https://github.com/phpmyadmin/phpmyadmin/commit/3b6ed1f9ecaab86c488d106b1588... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M libraries/core.lib.php M test/libraries/core/PMA_cleanupPathInfo_test.php
Log Message: ----------- Improve PHP path cleanup
- properly handle situation when query string contains PATH_INFO - cleanup path from any relative parts
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 82d25d4addb2dc5dada9e7f62b37ed42053797a9 https://github.com/phpmyadmin/phpmyadmin/commit/82d25d4addb2dc5dada9e7f62b37... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M scripts/create-release.sh M scripts/generate-mo M scripts/generate-sprites M scripts/lang-cleanup.sh M scripts/line-counts.sh M scripts/locales-contributors M scripts/remove-incomplete-mo M scripts/transformations_generator_main_class.sh M scripts/transformations_generator_plugin.sh M scripts/update-po M scripts/upload-release M test/install-browserstack M test/install-runkit M test/start-local-server
Log Message: ----------- Merge branch 'master' into master-security
Commit: b40ada1974d95a98744897f363ae5214aa85dbc9 https://github.com/phpmyadmin/phpmyadmin/commit/b40ada1974d95a98744897f363ae... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M libraries/Theme.php M libraries/core.lib.php M test/libraries/core/PMA_cleanupPathInfo_test.php
Log Message: ----------- Merge branch 'QA_4_6-security' into master-security
Commit: 053e73d0c3a2280f2138b6f1405bce41851da03a https://github.com/phpmyadmin/phpmyadmin/commit/053e73d0c3a2280f2138b6f1405b... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M libraries/core.lib.php
Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security
Commit: 7b5c2699f6fe459de1a86ccc873227f7632670f7 https://github.com/phpmyadmin/phpmyadmin/commit/7b5c2699f6fe459de1a86ccc8732... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M libraries/core.lib.php
Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security
Commit: 34325315f733c843c10ff5f73d177d5e24645e38 https://github.com/phpmyadmin/phpmyadmin/commit/34325315f733c843c10ff5f73d17... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Log Message: ----------- Merge branch 'master' into master-security
Commit: 47d8026b260a45c6488d972beaa3e44dd68ced7d https://github.com/phpmyadmin/phpmyadmin/commit/47d8026b260a45c6488d972beaa3... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Log Message: ----------- Merge branch 'QA_4_6-security' into master-security
Commit: be8eb4bf3e080d90583d68ef685949b7d093e450 https://github.com/phpmyadmin/phpmyadmin/commit/be8eb4bf3e080d90583d68ef6859... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M .travis.yml M ChangeLog M doc/config.rst M doc/credits.rst M doc/faq.rst M doc/glossary.rst M libraries/SysInfoLinux.php M libraries/phpseclib/Crypt/Base.php M libraries/phpseclib/Crypt/Random.php M libraries/plugins/schema/svg/Svg.php M libraries/plugins/schema/svg/SvgRelationSchema.php M po/cs.po M po/es.po M setup/frames/index.inc.php M setup/lib/index.lib.php M setup/scripts.js M test/install-runkit M test/libraries/PMA_server_status_monitor_test.php M test/libraries/PMA_server_status_queries_test.php M test/libraries/PMA_server_status_test.php
Log Message: ----------- Merge commit '90e4325bcf' into QA_4_6-security
Commit: 665a5fcbe2e75c22a65c942a2ad8365b8599d1b3 https://github.com/phpmyadmin/phpmyadmin/commit/665a5fcbe2e75c22a65c942a2ad8... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M libraries/Util.php M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@latin.po M po/bg.po M po/bn.po M po/br.po M po/brx.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/eo.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/fy.po M po/gl.po M po/gu.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ky.po M po/li.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/ne.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr@latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz@latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po M test/libraries/PMA_SetupIndex_test.php
Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security
Commit: ea065f54d5aa2dfa60fb193ca2f5c3cde5cefe4e https://github.com/phpmyadmin/phpmyadmin/commit/ea065f54d5aa2dfa60fb193ca2f5... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M ChangeLog M doc/config.rst M doc/faq.rst M libraries/Util.php M libraries/core.lib.php M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@latin.po M po/bg.po M po/bn.po M po/br.po M po/brx.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/eo.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fil.po M po/fr.po M po/fy.po M po/gl.po M po/gu.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/ig.po M po/it.po M po/ja.po M po/ka.po M po/kab.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ky.po M po/li.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/ne.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr@latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz@latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po M scripts/upload-release M setup/frames/index.inc.php M setup/lib/index.lib.php M setup/scripts.js M test/libraries/PMA_SetupIndex_test.php
Log Message: ----------- Merge branch 'master' into master-security
Commit: 2d5bc6637a6fa766414b569a0930edcd28689a19 https://github.com/phpmyadmin/phpmyadmin/commit/2d5bc6637a6fa766414b569a0930... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Log Message: ----------- Merge branch 'QA_4_6-security' into master-security
Commit: e922991f334036cb3eb7ba7ade699025b7e088f3 https://github.com/phpmyadmin/phpmyadmin/commit/e922991f334036cb3eb7ba7ade69... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M libraries/Util.php
Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security
Commit: 8331f300c1f4374f00f71133d7d457bec3caed94 https://github.com/phpmyadmin/phpmyadmin/commit/8331f300c1f4374f00f71133d7d4... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M libraries/Util.php
Log Message: ----------- Merge branch 'master' into master-security
Commit: a717eb0ad365d56e15263b1e2e844f7efe39cdee https://github.com/phpmyadmin/phpmyadmin/commit/a717eb0ad365d56e15263b1e2e84... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Log Message: ----------- Merge branch 'QA_4_6-security' into master-security
Commit: e1d9e31dff329acc05e94fe03f0b8a21c4d5b437 https://github.com/phpmyadmin/phpmyadmin/commit/e1d9e31dff329acc05e94fe03f0b... Author: Michal Čihař michal@cihar.com Date: 2016-12-21 (Wed, 21 Dec 2016)
Changed paths: M ChangeLog M doc/config.rst M doc/faq.rst M js/rte.js M js/tbl_structure.js M libraries/Config.php M libraries/DatabaseInterface.php M libraries/Footer.php M libraries/Header.php M libraries/Util.php M libraries/config.default.php M libraries/controllers/table/TableStructureController.php M libraries/core.lib.php M libraries/plugins/auth/AuthenticationCookie.php M libraries/plugins/auth/AuthenticationHttp.php M libraries/pmd_common.php M libraries/rte/rte_routines.lib.php M phpunit.xml.dist M po/ca.po M po/cs.po M po/de.po M po/el.po M po/es.po M po/fr.po M po/ia.po M po/it.po M po/nl.po M po/sl.po M po/tr.po M scripts/lang-cleanup.sh M templates/database/designer/database_tables.phtml M templates/database/designer/table_list.phtml R test/.htaccess M test/classes/plugin/auth/AuthenticationCookieTest.php M test/classes/plugin/auth/AuthenticationHttpTest.php
Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security
Commit: 695a488c4294ebdb972607d8296746310ddb5b7b https://github.com/phpmyadmin/phpmyadmin/commit/695a488c4294ebdb972607d82967... Author: Michal Čihař michal@cihar.com Date: 2016-12-21 (Wed, 21 Dec 2016)
Changed paths: M libraries/replication_gui.lib.php
Log Message: ----------- Do not allow arbitrary connection in replication setup without AllowArbitraryServer
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 3f4487f985bd1f02eb41dbacb36b75a02fa62830 https://github.com/phpmyadmin/phpmyadmin/commit/3f4487f985bd1f02eb41dbacb36b... Author: Michal Čihař michal@cihar.com Date: 2016-12-21 (Wed, 21 Dec 2016)
Changed paths: M ChangeLog M README.rst M doc/config.rst M doc/faq.rst M js/db_structure.js M js/navigation.js M js/rte.js M js/server_privileges.js M js/tbl_structure.js M libraries/Config.php M libraries/DatabaseInterface.php M libraries/Footer.php M libraries/Header.php M libraries/Response.php M libraries/Util.php M libraries/config.default.php M libraries/config/PageSettings.php M libraries/controllers/database/DatabaseStructureController.php M libraries/controllers/table/TableStructureController.php M libraries/core.lib.php M libraries/export.lib.php M libraries/gis/GISPoint.php M libraries/navigation/Navigation.php M libraries/navigation/NavigationTree.php M libraries/plugins/auth/AuthenticationCookie.php M libraries/plugins/auth/AuthenticationHttp.php M libraries/pmd_common.php M libraries/rte/rte_routines.lib.php M phpunit.xml.dist M po/ca.po M po/cs.po M po/de.po M po/el.po M po/es.po M po/fr.po M po/ia.po M po/it.po M po/nl.po M po/sl.po M po/tr.po M scripts/lang-cleanup.sh M setup/lib/form_processing.lib.php M templates/database/designer/database_tables.phtml M templates/database/designer/table_list.phtml M templates/database/structure/table_header.phtml M templates/select_lang.phtml R test/.htaccess M test/classes/plugin/auth/AuthenticationCookieTest.php M test/classes/plugin/auth/AuthenticationHttpTest.php M test/libraries/PMA_Form_Processing_test.php M test/libraries/PMA_user_preferences_test.php
Log Message: ----------- Merge branch 'master' into master-security
Commit: 6859521e6222234941142042246d8e358f69adc8 https://github.com/phpmyadmin/phpmyadmin/commit/6859521e6222234941142042246d... Author: Michal Čihař michal@cihar.com Date: 2016-12-21 (Wed, 21 Dec 2016)
Changed paths: M libraries/replication_gui.lib.php
Log Message: ----------- Merge branch 'QA_4_6-security' into master-security
Commit: c962ee4287b50af754b8fe72c0c4ef6cebf3c489 https://github.com/phpmyadmin/phpmyadmin/commit/c962ee4287b50af754b8fe72c0c4... Author: Michal Čihař michal@cihar.com Date: 2016-12-21 (Wed, 21 Dec 2016)
Changed paths: M doc/setup.rst M libraries/config/ConfigFile.php M libraries/vendor_config.php M setup/config.php M setup/frames/config.inc.php M setup/frames/index.inc.php M setup/lib/index.lib.php M test/classes/config/ConfigFileTest.php M test/libraries/PMA_SetupIndex_test.php
Log Message: ----------- Remove setup download/load/delete features
This removes risk of third party manipulating with the configuration as there was race condition between editing and using the file.
Downloading the file should not be big hassle and this really makes the whole setup a bit simpler.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: f792f294f219290f3a9360788940d0e491f5d009 https://github.com/phpmyadmin/phpmyadmin/commit/f792f294f219290f3a9360788940... Author: Michal Čihař michal@cihar.com Date: 2016-12-21 (Wed, 21 Dec 2016)
Changed paths: M setup/index.php
Log Message: ----------- Disable setup if configuration already exists
The setup allows to figure out quite a lot about system and network, so it's safer to block access to it once phpMyAdmin has been configured.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: cbcf740adbad341c05705de6506908f41a24fbcf https://github.com/phpmyadmin/phpmyadmin/commit/cbcf740adbad341c05705de65069... Author: Michal Čihař michal@cihar.com Date: 2017-01-07 (Sat, 07 Jan 2017)
Changed paths: M ChangeLog M js/functions.js M libraries/Index.php M libraries/Table.php M libraries/dbi/DBIMysqli.php M libraries/replication_gui.lib.php M libraries/server_privileges.lib.php M libraries/sql-parser/src/Component.php M libraries/sql-parser/src/Components/AlterOperation.php M libraries/sql-parser/src/Components/Array2d.php M libraries/sql-parser/src/Components/ArrayObj.php M libraries/sql-parser/src/Components/CaseExpression.php M libraries/sql-parser/src/Components/Condition.php M libraries/sql-parser/src/Components/CreateDefinition.php M libraries/sql-parser/src/Components/DataType.php M libraries/sql-parser/src/Components/Expression.php M libraries/sql-parser/src/Components/ExpressionArray.php M libraries/sql-parser/src/Components/FunctionCall.php M libraries/sql-parser/src/Components/IntoKeyword.php M libraries/sql-parser/src/Components/JoinKeyword.php M libraries/sql-parser/src/Components/Key.php M libraries/sql-parser/src/Components/Limit.php M libraries/sql-parser/src/Components/OptionsArray.php M libraries/sql-parser/src/Components/OrderKeyword.php M libraries/sql-parser/src/Components/ParameterDefinition.php M libraries/sql-parser/src/Components/PartitionDefinition.php M libraries/sql-parser/src/Components/Reference.php M libraries/sql-parser/src/Components/RenameOperation.php M libraries/sql-parser/src/Components/SetOperation.php M libraries/sql-parser/src/Components/UnionKeyword.php M libraries/sql-parser/src/Context.php M libraries/sql-parser/src/Contexts/ContextMySql50000.php M libraries/sql-parser/src/Contexts/ContextMySql50100.php M libraries/sql-parser/src/Contexts/ContextMySql50500.php M libraries/sql-parser/src/Contexts/ContextMySql50600.php M libraries/sql-parser/src/Contexts/ContextMySql50700.php M libraries/sql-parser/src/Exceptions/LexerException.php M libraries/sql-parser/src/Exceptions/ParserException.php M libraries/sql-parser/src/Lexer.php M libraries/sql-parser/src/Parser.php M libraries/sql-parser/src/Statement.php M libraries/sql-parser/src/Statements/AlterStatement.php M libraries/sql-parser/src/Statements/AnalyzeStatement.php M libraries/sql-parser/src/Statements/BackupStatement.php M libraries/sql-parser/src/Statements/CallStatement.php M libraries/sql-parser/src/Statements/CheckStatement.php M libraries/sql-parser/src/Statements/ChecksumStatement.php M libraries/sql-parser/src/Statements/CreateStatement.php M libraries/sql-parser/src/Statements/DeleteStatement.php M libraries/sql-parser/src/Statements/DropStatement.php M libraries/sql-parser/src/Statements/ExplainStatement.php M libraries/sql-parser/src/Statements/InsertStatement.php M libraries/sql-parser/src/Statements/MaintenanceStatement.php M libraries/sql-parser/src/Statements/NotImplementedStatement.php M libraries/sql-parser/src/Statements/OptimizeStatement.php M libraries/sql-parser/src/Statements/RenameStatement.php M libraries/sql-parser/src/Statements/RepairStatement.php M libraries/sql-parser/src/Statements/ReplaceStatement.php M libraries/sql-parser/src/Statements/RestoreStatement.php M libraries/sql-parser/src/Statements/SelectStatement.php M libraries/sql-parser/src/Statements/SetStatement.php M libraries/sql-parser/src/Statements/ShowStatement.php M libraries/sql-parser/src/Statements/TransactionStatement.php M libraries/sql-parser/src/Statements/TruncateStatement.php M libraries/sql-parser/src/Statements/UpdateStatement.php M libraries/sql-parser/src/Token.php M libraries/sql-parser/src/TokensList.php M libraries/sql-parser/src/UtfString.php M libraries/sql-parser/src/Utils/BufferedQuery.php M libraries/sql-parser/src/Utils/CLI.php M libraries/sql-parser/src/Utils/Error.php M libraries/sql-parser/src/Utils/Formatter.php M libraries/sql-parser/src/Utils/Misc.php M libraries/sql-parser/src/Utils/Query.php M libraries/sql-parser/src/Utils/Routine.php M libraries/sql-parser/src/Utils/Table.php M libraries/sql-parser/src/Utils/Tokens.php M libraries/sql-parser/src/common.php M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@latin.po M po/bg.po M po/bn.po M po/br.po M po/brx.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/eo.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/fy.po M po/gl.po M po/gu.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ky.po M po/li.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/ne.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr@latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz@latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po M test/libraries/PMA_server_replication_test.php
Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security
Commit: 14b6e3b10b135c70a4bdf67ce80f066f125d27c5 https://github.com/phpmyadmin/phpmyadmin/commit/14b6e3b10b135c70a4bdf67ce80f... Author: Michal Čihař michal@cihar.com Date: 2017-01-07 (Sat, 07 Jan 2017)
Changed paths: M ChangeLog M doc/_ext/configext.py M doc/config.rst M doc/setup.rst M js/codemirror/LICENSE M js/codemirror/addon/hint/show-hint.css M js/codemirror/addon/hint/show-hint.js M js/codemirror/addon/hint/sql-hint.js M js/codemirror/addon/lint/lint.css M js/codemirror/addon/lint/lint.js M js/codemirror/addon/runmode/runmode.js M js/codemirror/lib/codemirror.css M js/codemirror/lib/codemirror.js M js/codemirror/mode/javascript/javascript.js M js/codemirror/mode/sql/sql.js M js/codemirror/mode/xml/xml.js M js/config.js M js/console.js M js/export.js M js/functions.js M js/jqplot/jquery.jqplot.js M js/jqplot/plugins/jqplot.barRenderer.js M js/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js M js/jqplot/plugins/jqplot.canvasTextRenderer.js M js/jqplot/plugins/jqplot.categoryAxisRenderer.js M js/jqplot/plugins/jqplot.cursor.js M js/jqplot/plugins/jqplot.dateAxisRenderer.js M js/jqplot/plugins/jqplot.highlighter.js M js/jqplot/plugins/jqplot.pieRenderer.js M js/jqplot/plugins/jqplot.pointLabels.js M js/jquery/additional-methods.js R js/jquery/jquery-2.1.4.min.js A js/jquery/jquery-migrate-3.0.0.js R js/jquery/jquery-ui-1.11.4.min.js M js/jquery/jquery-ui-timepicker-addon.js A js/jquery/jquery-ui.min.js M js/jquery/jquery.fullscreen.js A js/jquery/jquery.min.js M js/jquery/jquery.mousewheel.js M js/jquery/jquery.validate.js M js/jquery/src/jquery-ui/.jshintrc R js/jquery/src/jquery-ui/accordion.js R js/jquery/src/jquery-ui/autocomplete.js R js/jquery/src/jquery-ui/button.js M js/jquery/src/jquery-ui/core.js A js/jquery/src/jquery-ui/data.js R js/jquery/src/jquery-ui/datepicker.js R js/jquery/src/jquery-ui/dialog.js A js/jquery/src/jquery-ui/disable-selection.js R js/jquery/src/jquery-ui/draggable.js R js/jquery/src/jquery-ui/droppable.js R js/jquery/src/jquery-ui/effect-blind.js R js/jquery/src/jquery-ui/effect-bounce.js R js/jquery/src/jquery-ui/effect-clip.js R js/jquery/src/jquery-ui/effect-drop.js R js/jquery/src/jquery-ui/effect-explode.js R js/jquery/src/jquery-ui/effect-fade.js R js/jquery/src/jquery-ui/effect-fold.js R js/jquery/src/jquery-ui/effect-highlight.js R js/jquery/src/jquery-ui/effect-puff.js R js/jquery/src/jquery-ui/effect-pulsate.js R js/jquery/src/jquery-ui/effect-scale.js R js/jquery/src/jquery-ui/effect-shake.js R js/jquery/src/jquery-ui/effect-size.js R js/jquery/src/jquery-ui/effect-slide.js R js/jquery/src/jquery-ui/effect-transfer.js M js/jquery/src/jquery-ui/effect.js A js/jquery/src/jquery-ui/effects/effect-blind.js A js/jquery/src/jquery-ui/effects/effect-bounce.js A js/jquery/src/jquery-ui/effects/effect-clip.js A js/jquery/src/jquery-ui/effects/effect-drop.js A js/jquery/src/jquery-ui/effects/effect-explode.js A js/jquery/src/jquery-ui/effects/effect-fade.js A js/jquery/src/jquery-ui/effects/effect-fold.js A js/jquery/src/jquery-ui/effects/effect-highlight.js A js/jquery/src/jquery-ui/effects/effect-puff.js A js/jquery/src/jquery-ui/effects/effect-pulsate.js A js/jquery/src/jquery-ui/effects/effect-scale.js A js/jquery/src/jquery-ui/effects/effect-shake.js A js/jquery/src/jquery-ui/effects/effect-size.js A js/jquery/src/jquery-ui/effects/effect-slide.js A js/jquery/src/jquery-ui/effects/effect-transfer.js A js/jquery/src/jquery-ui/escape-selector.js A js/jquery/src/jquery-ui/focusable.js A js/jquery/src/jquery-ui/form-reset-mixin.js A js/jquery/src/jquery-ui/form.js A js/jquery/src/jquery-ui/i18n/datepicker-af.js A js/jquery/src/jquery-ui/i18n/datepicker-ar-DZ.js A js/jquery/src/jquery-ui/i18n/datepicker-ar.js A js/jquery/src/jquery-ui/i18n/datepicker-az.js A js/jquery/src/jquery-ui/i18n/datepicker-be.js A js/jquery/src/jquery-ui/i18n/datepicker-bg.js A js/jquery/src/jquery-ui/i18n/datepicker-bs.js A js/jquery/src/jquery-ui/i18n/datepicker-ca.js A js/jquery/src/jquery-ui/i18n/datepicker-cs.js A js/jquery/src/jquery-ui/i18n/datepicker-cy-GB.js A js/jquery/src/jquery-ui/i18n/datepicker-da.js A js/jquery/src/jquery-ui/i18n/datepicker-de.js A js/jquery/src/jquery-ui/i18n/datepicker-el.js A js/jquery/src/jquery-ui/i18n/datepicker-en-AU.js A js/jquery/src/jquery-ui/i18n/datepicker-en-GB.js A js/jquery/src/jquery-ui/i18n/datepicker-en-NZ.js A js/jquery/src/jquery-ui/i18n/datepicker-eo.js A js/jquery/src/jquery-ui/i18n/datepicker-es.js A js/jquery/src/jquery-ui/i18n/datepicker-et.js A js/jquery/src/jquery-ui/i18n/datepicker-eu.js A js/jquery/src/jquery-ui/i18n/datepicker-fa.js A js/jquery/src/jquery-ui/i18n/datepicker-fi.js A js/jquery/src/jquery-ui/i18n/datepicker-fo.js A js/jquery/src/jquery-ui/i18n/datepicker-fr-CA.js A js/jquery/src/jquery-ui/i18n/datepicker-fr-CH.js A js/jquery/src/jquery-ui/i18n/datepicker-fr.js A js/jquery/src/jquery-ui/i18n/datepicker-gl.js A js/jquery/src/jquery-ui/i18n/datepicker-he.js A js/jquery/src/jquery-ui/i18n/datepicker-hi.js A js/jquery/src/jquery-ui/i18n/datepicker-hr.js A js/jquery/src/jquery-ui/i18n/datepicker-hu.js A js/jquery/src/jquery-ui/i18n/datepicker-hy.js A js/jquery/src/jquery-ui/i18n/datepicker-id.js A js/jquery/src/jquery-ui/i18n/datepicker-is.js A js/jquery/src/jquery-ui/i18n/datepicker-it-CH.js A js/jquery/src/jquery-ui/i18n/datepicker-it.js A js/jquery/src/jquery-ui/i18n/datepicker-ja.js A js/jquery/src/jquery-ui/i18n/datepicker-ka.js A js/jquery/src/jquery-ui/i18n/datepicker-kk.js A js/jquery/src/jquery-ui/i18n/datepicker-km.js A js/jquery/src/jquery-ui/i18n/datepicker-ko.js A js/jquery/src/jquery-ui/i18n/datepicker-ky.js A js/jquery/src/jquery-ui/i18n/datepicker-lb.js A js/jquery/src/jquery-ui/i18n/datepicker-lt.js A js/jquery/src/jquery-ui/i18n/datepicker-lv.js A js/jquery/src/jquery-ui/i18n/datepicker-mk.js A js/jquery/src/jquery-ui/i18n/datepicker-ml.js A js/jquery/src/jquery-ui/i18n/datepicker-ms.js A js/jquery/src/jquery-ui/i18n/datepicker-nb.js A js/jquery/src/jquery-ui/i18n/datepicker-nl-BE.js A js/jquery/src/jquery-ui/i18n/datepicker-nl.js A js/jquery/src/jquery-ui/i18n/datepicker-nn.js A js/jquery/src/jquery-ui/i18n/datepicker-no.js A js/jquery/src/jquery-ui/i18n/datepicker-pl.js A js/jquery/src/jquery-ui/i18n/datepicker-pt-BR.js A js/jquery/src/jquery-ui/i18n/datepicker-pt.js A js/jquery/src/jquery-ui/i18n/datepicker-rm.js A js/jquery/src/jquery-ui/i18n/datepicker-ro.js A js/jquery/src/jquery-ui/i18n/datepicker-ru.js A js/jquery/src/jquery-ui/i18n/datepicker-sk.js A js/jquery/src/jquery-ui/i18n/datepicker-sl.js A js/jquery/src/jquery-ui/i18n/datepicker-sq.js A js/jquery/src/jquery-ui/i18n/datepicker-sr-SR.js A js/jquery/src/jquery-ui/i18n/datepicker-sr.js A js/jquery/src/jquery-ui/i18n/datepicker-sv.js A js/jquery/src/jquery-ui/i18n/datepicker-ta.js A js/jquery/src/jquery-ui/i18n/datepicker-th.js A js/jquery/src/jquery-ui/i18n/datepicker-tj.js A js/jquery/src/jquery-ui/i18n/datepicker-tr.js A js/jquery/src/jquery-ui/i18n/datepicker-uk.js A js/jquery/src/jquery-ui/i18n/datepicker-vi.js A js/jquery/src/jquery-ui/i18n/datepicker-zh-CN.js A js/jquery/src/jquery-ui/i18n/datepicker-zh-HK.js A js/jquery/src/jquery-ui/i18n/datepicker-zh-TW.js A js/jquery/src/jquery-ui/ie.js A js/jquery/src/jquery-ui/jquery-1-7.js A js/jquery/src/jquery-ui/keycode.js A js/jquery/src/jquery-ui/labels.js R js/jquery/src/jquery-ui/menu.js R js/jquery/src/jquery-ui/mouse.js A js/jquery/src/jquery-ui/plugin.js M js/jquery/src/jquery-ui/position.js R js/jquery/src/jquery-ui/progressbar.js R js/jquery/src/jquery-ui/resizable.js A js/jquery/src/jquery-ui/safe-active-element.js A js/jquery/src/jquery-ui/safe-blur.js A js/jquery/src/jquery-ui/scroll-parent.js R js/jquery/src/jquery-ui/selectable.js R js/jquery/src/jquery-ui/selectmenu.js R js/jquery/src/jquery-ui/slider.js R js/jquery/src/jquery-ui/sortable.js R js/jquery/src/jquery-ui/spinner.js A js/jquery/src/jquery-ui/tabbable.js R js/jquery/src/jquery-ui/tabs.js R js/jquery/src/jquery-ui/tooltip.js A js/jquery/src/jquery-ui/unique-id.js A js/jquery/src/jquery-ui/version.js M js/jquery/src/jquery-ui/widget.js A js/jquery/src/jquery-ui/widgets/accordion.js A js/jquery/src/jquery-ui/widgets/autocomplete.js A js/jquery/src/jquery-ui/widgets/button.js A js/jquery/src/jquery-ui/widgets/checkboxradio.js A js/jquery/src/jquery-ui/widgets/controlgroup.js A js/jquery/src/jquery-ui/widgets/datepicker.js A js/jquery/src/jquery-ui/widgets/dialog.js A js/jquery/src/jquery-ui/widgets/draggable.js A js/jquery/src/jquery-ui/widgets/droppable.js A js/jquery/src/jquery-ui/widgets/menu.js A js/jquery/src/jquery-ui/widgets/mouse.js A js/jquery/src/jquery-ui/widgets/progressbar.js A js/jquery/src/jquery-ui/widgets/resizable.js A js/jquery/src/jquery-ui/widgets/selectable.js A js/jquery/src/jquery-ui/widgets/selectmenu.js A js/jquery/src/jquery-ui/widgets/slider.js A js/jquery/src/jquery-ui/widgets/sortable.js A js/jquery/src/jquery-ui/widgets/spinner.js A js/jquery/src/jquery-ui/widgets/tabs.js A js/jquery/src/jquery-ui/widgets/tooltip.js A js/jquery/src/jquery/.eslintrc.json R js/jquery/src/jquery/.jshintrc M js/jquery/src/jquery/ajax.js M js/jquery/src/jquery/ajax/jsonp.js M js/jquery/src/jquery/ajax/load.js R js/jquery/src/jquery/ajax/parseJSON.js M js/jquery/src/jquery/ajax/parseXML.js M js/jquery/src/jquery/ajax/script.js A js/jquery/src/jquery/ajax/var/location.js M js/jquery/src/jquery/ajax/var/nonce.js M js/jquery/src/jquery/ajax/var/rquery.js M js/jquery/src/jquery/ajax/xhr.js M js/jquery/src/jquery/attributes.js M js/jquery/src/jquery/attributes/attr.js M js/jquery/src/jquery/attributes/classes.js M js/jquery/src/jquery/attributes/prop.js M js/jquery/src/jquery/attributes/support.js M js/jquery/src/jquery/attributes/val.js M js/jquery/src/jquery/callbacks.js M js/jquery/src/jquery/core.js A js/jquery/src/jquery/core/DOMEval.js M js/jquery/src/jquery/core/access.js M js/jquery/src/jquery/core/init.js M js/jquery/src/jquery/core/parseHTML.js A js/jquery/src/jquery/core/ready-no-deferred.js M js/jquery/src/jquery/core/ready.js A js/jquery/src/jquery/core/readyException.js A js/jquery/src/jquery/core/stripAndCollapse.js A js/jquery/src/jquery/core/support.js M js/jquery/src/jquery/core/var/rsingleTag.js M js/jquery/src/jquery/css.js M js/jquery/src/jquery/css/addGetHookIf.js A js/jquery/src/jquery/css/adjustCSS.js M js/jquery/src/jquery/css/curCSS.js R js/jquery/src/jquery/css/defaultDisplay.js M js/jquery/src/jquery/css/hiddenVisibleSelectors.js A js/jquery/src/jquery/css/showHide.js M js/jquery/src/jquery/css/support.js R js/jquery/src/jquery/css/swap.js M js/jquery/src/jquery/css/var/cssExpand.js M js/jquery/src/jquery/css/var/getStyles.js R js/jquery/src/jquery/css/var/isHidden.js A js/jquery/src/jquery/css/var/isHiddenWithinTree.js M js/jquery/src/jquery/css/var/rmargin.js M js/jquery/src/jquery/css/var/rnumnonpx.js A js/jquery/src/jquery/css/var/swap.js M js/jquery/src/jquery/data.js M js/jquery/src/jquery/data/Data.js R js/jquery/src/jquery/data/accepts.js A js/jquery/src/jquery/data/var/acceptData.js A js/jquery/src/jquery/data/var/dataPriv.js A js/jquery/src/jquery/data/var/dataUser.js R js/jquery/src/jquery/data/var/data_priv.js R js/jquery/src/jquery/data/var/data_user.js M js/jquery/src/jquery/deferred.js A js/jquery/src/jquery/deferred/exceptionHook.js M js/jquery/src/jquery/deprecated.js M js/jquery/src/jquery/dimensions.js M js/jquery/src/jquery/effects.js M js/jquery/src/jquery/effects/Tween.js M js/jquery/src/jquery/effects/animatedSelector.js M js/jquery/src/jquery/event.js M js/jquery/src/jquery/event/ajax.js M js/jquery/src/jquery/event/alias.js A js/jquery/src/jquery/event/focusin.js M js/jquery/src/jquery/event/support.js A js/jquery/src/jquery/event/trigger.js M js/jquery/src/jquery/exports/amd.js M js/jquery/src/jquery/exports/global.js R js/jquery/src/jquery/intro.js M js/jquery/src/jquery/jquery.js M js/jquery/src/jquery/manipulation.js M js/jquery/src/jquery/manipulation/_evalUrl.js A js/jquery/src/jquery/manipulation/buildFragment.js A js/jquery/src/jquery/manipulation/getAll.js A js/jquery/src/jquery/manipulation/setGlobalEval.js M js/jquery/src/jquery/manipulation/support.js M js/jquery/src/jquery/manipulation/var/rcheckableType.js A js/jquery/src/jquery/manipulation/var/rscriptType.js A js/jquery/src/jquery/manipulation/var/rtagName.js A js/jquery/src/jquery/manipulation/wrapMap.js M js/jquery/src/jquery/offset.js R js/jquery/src/jquery/outro.js M js/jquery/src/jquery/queue.js M js/jquery/src/jquery/queue/delay.js M js/jquery/src/jquery/selector-native.js M js/jquery/src/jquery/selector-sizzle.js M js/jquery/src/jquery/selector.js M js/jquery/src/jquery/serialize.js R js/jquery/src/jquery/sizzle/dist/sizzle.js R js/jquery/src/jquery/sizzle/dist/sizzle.min.js R js/jquery/src/jquery/sizzle/dist/sizzle.min.map R js/jquery/src/jquery/sizzle/test/data/empty.js R js/jquery/src/jquery/sizzle/test/data/mixed_sort.html R js/jquery/src/jquery/sizzle/test/data/testinit.js R js/jquery/src/jquery/sizzle/test/index.html R js/jquery/src/jquery/sizzle/test/jquery.js R js/jquery/src/jquery/sizzle/test/unit/extending.js R js/jquery/src/jquery/sizzle/test/unit/selector.js R js/jquery/src/jquery/sizzle/test/unit/utilities.js M js/jquery/src/jquery/traversing.js M js/jquery/src/jquery/traversing/findFilter.js A js/jquery/src/jquery/traversing/var/dir.js M js/jquery/src/jquery/traversing/var/rneedsContext.js A js/jquery/src/jquery/traversing/var/siblings.js A js/jquery/src/jquery/var/ObjectFunctionString.js M js/jquery/src/jquery/var/arr.js M js/jquery/src/jquery/var/class2type.js M js/jquery/src/jquery/var/concat.js A js/jquery/src/jquery/var/document.js A js/jquery/src/jquery/var/documentElement.js A js/jquery/src/jquery/var/fnToString.js A js/jquery/src/jquery/var/getProto.js M js/jquery/src/jquery/var/hasOwn.js M js/jquery/src/jquery/var/indexOf.js M js/jquery/src/jquery/var/pnum.js M js/jquery/src/jquery/var/push.js A js/jquery/src/jquery/var/rcssNum.js A js/jquery/src/jquery/var/rnothtmlwhite.js R js/jquery/src/jquery/var/rnotwhite.js M js/jquery/src/jquery/var/slice.js R js/jquery/src/jquery/var/strundefined.js M js/jquery/src/jquery/var/support.js M js/jquery/src/jquery/var/toString.js M js/jquery/src/jquery/wrap.js M js/makegrid.js M js/microhistory.js M js/navigation.js M js/normalization.js M js/pmd/init.js M js/pmd/move.js M js/server_databases.js M js/server_status_advisor.js M js/server_status_monitor.js M js/server_status_queries.js M js/sql.js M js/tbl_chart.js M js/tbl_zoom_plot_jqplot.js M libraries/Header.php M libraries/Index.php M libraries/Table.php M libraries/config.default.php M libraries/controllers/server/ServerVariablesController.php M libraries/controllers/table/TableChartController.php M libraries/dbi/DBIMysqli.php M libraries/gis/GISVisualization.php M libraries/plugins/auth/AuthenticationSignon.php M libraries/replication_gui.lib.php M libraries/server_privileges.lib.php M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@latin.po M po/bg.po M po/bn.po M po/br.po M po/brx.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/eo.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fil.po M po/fr.po M po/fy.po M po/gl.po M po/gu.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/ig.po M po/it.po M po/ja.po M po/ka.po M po/kab.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ky.po M po/li.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/ne.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr@latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz@latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po M setup/index.php M test/classes/plugin/auth/AuthenticationSignonTest.php M test/libraries/PMA_server_replication_test.php M test/selenium/PmaSeleniumCreateDropDatabaseTest.php M test/selenium/PmaSeleniumCreateRemoveUserTest.php M test/selenium/PmaSeleniumDbEventsTest.php M test/selenium/TestBase.php M themes/.gitignore M themes/original/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png M themes/original/jquery/images/ui-bg_glass_65_ffffff_1x400.png M themes/original/jquery/images/ui-bg_glass_75_dadada_1x400.png M themes/original/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png M themes/original/jquery/images/ui-bg_glass_95_fef1ec_1x400.png M themes/original/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png M themes/original/jquery/images/ui-icons_222222_256x240.png M themes/original/jquery/images/ui-icons_2e83ff_256x240.png M themes/original/jquery/images/ui-icons_454545_256x240.png M themes/original/jquery/images/ui-icons_888888_256x240.png M themes/original/jquery/images/ui-icons_cd0a0a_256x240.png R themes/original/jquery/jquery-ui-1.11.4.css A themes/original/jquery/jquery-ui.css M themes/pmahomme/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png M themes/pmahomme/jquery/images/ui-bg_glass_65_ffffff_1x400.png M themes/pmahomme/jquery/images/ui-bg_glass_75_dadada_1x400.png M themes/pmahomme/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png M themes/pmahomme/jquery/images/ui-bg_glass_95_fef1ec_1x400.png M themes/pmahomme/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png M themes/pmahomme/jquery/images/ui-icons_222222_256x240.png M themes/pmahomme/jquery/images/ui-icons_2e83ff_256x240.png M themes/pmahomme/jquery/images/ui-icons_454545_256x240.png M themes/pmahomme/jquery/images/ui-icons_888888_256x240.png M themes/pmahomme/jquery/images/ui-icons_cd0a0a_256x240.png R themes/pmahomme/jquery/jquery-ui-1.11.4.css A themes/pmahomme/jquery/jquery-ui.css M view_create.php
Log Message: ----------- Merge branch 'master' into master-security
Commit: 1dd22f4dea051f7ad0e135010da38ca6c5693438 https://github.com/phpmyadmin/phpmyadmin/commit/1dd22f4dea051f7ad0e135010da3... Author: Michal Čihař michal@cihar.com Date: 2017-01-07 (Sat, 07 Jan 2017)
Changed paths: M doc/setup.rst M libraries/config/ConfigFile.php M libraries/vendor_config.php M setup/config.php M setup/frames/config.inc.php M setup/frames/index.inc.php M setup/index.php M setup/lib/index.lib.php M test/classes/config/ConfigFileTest.php M test/libraries/PMA_SetupIndex_test.php
Log Message: ----------- Merge branch 'QA_4_6-security' into master-security
Commit: 4ab34edba6a14dfdad988310a88e1b3770c6ab64 https://github.com/phpmyadmin/phpmyadmin/commit/4ab34edba6a14dfdad988310a88e... Author: Michal Čihař michal@cihar.com Date: 2017-01-17 (Tue, 17 Jan 2017)
Changed paths: M libraries/php-gettext/gettext.php
Log Message: ----------- Merge changes from php-gettext 1.0.12
This ensures that parameter to select_string is numeric, avoiding code injection through it.
Our code is not vulnerable as we do not pass user supplied values to this function, this fix is included only to be closer to upstream.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: a5d677115e9ba308bdbe23cda31c4ca59d45cc35 https://github.com/phpmyadmin/phpmyadmin/commit/a5d677115e9ba308bdbe23cda31c... Author: Michal Čihař michal@cihar.com Date: 2017-01-17 (Tue, 17 Jan 2017)
Changed paths: M po/ko.po M po/pt.po M po/pt_BR.po
Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security
Commit: cbd2c17a1d2b57ba4bf55e4b6787fe2a10381cab https://github.com/phpmyadmin/phpmyadmin/commit/cbd2c17a1d2b57ba4bf55e4b6787... Author: Michal Čihař michal@cihar.com Date: 2017-01-17 (Tue, 17 Jan 2017)
Changed paths: R file_echo.php M js/server_status_monitor.js M libraries/Header.php M libraries/common.inc.php M libraries/core.lib.php M po/ko.po M po/pt.po M po/pt_BR.po M test/PMATestCase.php M test/bootstrap-dist.php M test/classes/ConfigTest.php M test/classes/DbQbeTest.php M test/classes/ThemeManagerTest.php M test/classes/plugin/auth/AuthenticationCookieTest.php M test/libraries/core/PMA_headerLocation_test.php
Log Message: ----------- Merge branch 'master' into master-security
Commit: 0c6d70ca68cebfe338621209fdbf103b026b85bb https://github.com/phpmyadmin/phpmyadmin/commit/0c6d70ca68cebfe338621209fdbf... Author: Michal Čihař michal@cihar.com Date: 2017-01-17 (Tue, 17 Jan 2017)
Log Message: ----------- Merge branch 'QA_4_6-security' into master-security
Commit: 1e2c24474e94b76a020c52bd107e8aae00336a0b https://github.com/phpmyadmin/phpmyadmin/commit/1e2c24474e94b76a020c52bd107e... Author: Michal Čihař michal@cihar.com Date: 2017-01-21 (Sat, 21 Jan 2017)
Changed paths: M ChangeLog M doc/config.rst M index.php M libraries/DbSearch.php M libraries/Table.php M libraries/common.inc.php M libraries/config.default.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/insert_edit.lib.php M libraries/navigation/NavigationTree.php M libraries/operations.lib.php M libraries/server_status_processes.lib.php M libraries/sql-parser/src/Lexer.php M libraries/sql-parser/src/Utils/Formatter.php A phpinfo.php M po/az.po M po/ia.po M po/pt.po M tbl_operations.php M test/classes/TableTest.php
Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security
Commit: 3adb0eb8889ca8d88c72e74b3a20f67db45d749f https://github.com/phpmyadmin/phpmyadmin/commit/3adb0eb8889ca8d88c72e74b3a20... Author: Michal Čihař michal@cihar.com Date: 2017-01-21 (Sat, 21 Jan 2017)
Changed paths: M ChangeLog
Log Message: ----------- Add changelog entries for security fixes
Signed-off-by: Michal Čihař michal@cihar.com
Commit: be4eaf52430d4864aaffc10bef514dad9dc731bb https://github.com/phpmyadmin/phpmyadmin/commit/be4eaf52430d4864aaffc10bef51... Author: Michal Čihař michal@cihar.com Date: 2017-01-21 (Sat, 21 Jan 2017)
Changed paths: M .travis.yml M ChangeLog M doc/config.rst M doc/setup.rst M export.php M index.php M js/functions.js M js/server_status_queries.js M js/tbl_operations.js M js/tbl_zoom_plot_jqplot.js M libraries/DbSearch.php M libraries/DisplayResults.php M libraries/Sanitize.php M libraries/Table.php M libraries/Util.php M libraries/central_columns.lib.php M libraries/common.inc.php M libraries/config.default.php M libraries/config.values.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/controllers/database/DatabaseStructureController.php M libraries/controllers/table/TableRelationController.php M libraries/dbi/DBIMysqli.php M libraries/insert_edit.lib.php M libraries/navigation/NavigationTree.php M libraries/operations.lib.php M libraries/plugins/export/ExportSql.php M libraries/pmd_common.php M libraries/server_status_processes.lib.php M libraries/server_status_queries.lib.php A phpinfo.php M po/az.po M po/de.po M po/ia.po M po/pt.po M tbl_operations.php M templates/database/designer/delete_relation_panel.phtml M templates/database/designer/new_relation_panel.phtml M templates/database/designer/options_panel.phtml M templates/database/designer/side_menu.phtml M templates/database/designer/table_list.phtml M templates/table/relation/common_form.phtml M test/PMATestCase.php M test/ci-test M test/classes/TableTest.php M test/classes/plugin/auth/AuthenticationCookieTest.php M test/classes/plugin/auth/AuthenticationHttpTest.php M test/classes/plugin/auth/AuthenticationSignonTest.php M test/classes/plugin/export/ExportSqlTest.php M test/install-runkit M test/libraries/PMA_Form_Processing_test.php M test/libraries/PMA_server_status_queries_test.php M test/libraries/PMA_user_preferences_test.php M test/libraries/core/PMA_headerLocation_test.php M test/selenium/PmaSeleniumDbEventsTest.php
Log Message: ----------- Merge branch 'master' into master-security
Commit: 744cf1d463f2d75ac33350032eed80b5730c1d57 https://github.com/phpmyadmin/phpmyadmin/commit/744cf1d463f2d75ac33350032eed... Author: Michal Čihař michal@cihar.com Date: 2017-01-21 (Sat, 21 Jan 2017)
Changed paths: M ChangeLog
Log Message: ----------- Merge branch 'QA_4_6-security' into master-security
Commit: 1db25d644758ae5841db9e8ae06f8c8b799ec48f https://github.com/phpmyadmin/phpmyadmin/commit/1db25d644758ae5841db9e8ae06f... Author: Michal Čihař michal@cihar.com Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths: M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@latin.po M po/bg.po M po/bn.po M po/br.po M po/brx.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/eo.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/fy.po M po/gl.po M po/gu.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ky.po M po/li.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/ne.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr@latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz@latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po
Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security
Commit: f5f496a8c10e48aa97fd5e2d1cd76724fc127df7 https://github.com/phpmyadmin/phpmyadmin/commit/f5f496a8c10e48aa97fd5e2d1cd7... Author: Michal Čihař michal@cihar.com Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths: M composer.json M db_sql_format.php M export.php M libraries/DisplayResults.php M libraries/Linter.php M libraries/Table.php M libraries/Tracker.php M libraries/Util.php M libraries/common.inc.php M libraries/controllers/table/TableStructureController.php M libraries/import.lib.php M libraries/operations.lib.php M libraries/parse_analyze.lib.php M libraries/plugins/export/ExportSql.php M libraries/plugins/import/ImportSql.php M libraries/plugins/import/ShapeFileImport.php M libraries/relation.lib.php M libraries/rte/rte_list.lib.php M libraries/rte/rte_routines.lib.php M libraries/sql.lib.php M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@latin.po M po/bg.po M po/bn.po M po/br.po M po/brx.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/eo.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fil.po M po/fr.po M po/fy.po M po/gl.po M po/gu.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/ig.po M po/it.po M po/ja.po M po/ka.po M po/kab.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ky.po M po/li.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/ne.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr@latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz@latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po M scripts/create-release.sh M scripts/update-po M tbl_export.php M test/bootstrap-dist.php M test/classes/DisplayResultsTest.php M test/libraries/PMA_import_test.php M test/libraries/common/PMA_quoting_slashing_test.php
Log Message: ----------- Merge branch 'master' into master-security
Commit: 95a049ba39845194153a1b6e3a2a2faca62dcb67 https://github.com/phpmyadmin/phpmyadmin/commit/95a049ba39845194153a1b6e3a2a... Author: Michal Čihař michal@cihar.com Date: 2017-01-23 (Mon, 23 Jan 2017)
Log Message: ----------- Merge branch 'QA_4_6-security' into master-security
Commit: d121c692265078fb75b19e9b1f6eb49aae54c9ab https://github.com/phpmyadmin/phpmyadmin/commit/d121c692265078fb75b19e9b1f6e... Author: Burak Yavuz hitowerdigit@hotmail.com Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths: M po/tr.po
Log Message: ----------- Translated using Weblate (Turkish)
Currently translated at 100.0% (3226 of 3226 strings)
[CI skip]
Commit: 18f18af84822f22d04d7f1c52395bd1e26643b46 https://github.com/phpmyadmin/phpmyadmin/commit/18f18af84822f22d04d7f1c52395... Author: Domen mitenem@outlook.com Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths: M po/sl.po
Log Message: ----------- Translated using Weblate (Slovenian)
Currently translated at 100.0% (3226 of 3226 strings)
[CI skip]
Commit: 3087a889567ecf547ac98f6c7668c67a1153f3af https://github.com/phpmyadmin/phpmyadmin/commit/3087a889567ecf547ac98f6c7668... Author: Isaac Bennetch bennetch@gmail.com Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths: M ChangeLog M doc/setup.rst M libraries/Theme.php M libraries/config/ConfigFile.php M libraries/config/PageSettings.php M libraries/controllers/database/DatabaseStructureController.php M libraries/core.lib.php M libraries/navigation/NavigationTree.php M libraries/navigation/nodes/Node.php M libraries/php-gettext/gettext.php M libraries/replication_gui.lib.php M libraries/vendor_config.php M setup/config.php M setup/frames/config.inc.php M setup/frames/index.inc.php M setup/index.php M setup/lib/index.lib.php M tbl_replace.php M templates/navigation/logo.phtml M test/classes/config/ConfigFileTest.php M test/libraries/PMA_SetupIndex_test.php M test/libraries/core/PMA_cleanupPathInfo_test.php
Log Message: ----------- Merge remote-tracking branch 'security/QA_4_6-security' into QA_4_6
Commit: c812bcd4112c3d44e6e6bc72e710b9935c6aa9d3 https://github.com/phpmyadmin/phpmyadmin/commit/c812bcd4112c3d44e6e6bc72e710... Author: Isaac Bennetch bennetch@gmail.com Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.php
Log Message: ----------- Prepare for 4.6.6 release
Signed-off-by: Isaac Bennetch bennetch@gmail.com
Commit: 8d952350fa4d061b3a37795d98405c22388a1607 https://github.com/phpmyadmin/phpmyadmin/commit/8d952350fa4d061b3a37795d9840... Author: Giovanni Sora g.sora@tiscali.it Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths: M po/ia.po
Log Message: ----------- Translated using Weblate (Interlingua)
Currently translated at 76.0% (2454 of 3226 strings)
[CI skip]
Commit: 4938bc223f4e1e09d75118c1d456765065e44346 https://github.com/phpmyadmin/phpmyadmin/commit/4938bc223f4e1e09d75118c1d456... Author: Weblate noreply@weblate.org Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths: M ChangeLog M README M doc/conf.py M doc/setup.rst M libraries/Config.php M libraries/Theme.php M libraries/config/ConfigFile.php M libraries/config/PageSettings.php M libraries/controllers/database/DatabaseStructureController.php M libraries/core.lib.php M libraries/navigation/NavigationTree.php M libraries/navigation/nodes/Node.php M libraries/php-gettext/gettext.php M libraries/replication_gui.lib.php M libraries/vendor_config.php M setup/config.php M setup/frames/config.inc.php M setup/frames/index.inc.php M setup/index.php M setup/lib/index.lib.php M tbl_replace.php M templates/navigation/logo.phtml M test/classes/config/ConfigFileTest.php M test/libraries/PMA_SetupIndex_test.php M test/libraries/core/PMA_cleanupPathInfo_test.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Commit: da40b6a7573873bcb2f350decf1f85ae3d0cc3d7 https://github.com/phpmyadmin/phpmyadmin/commit/da40b6a7573873bcb2f350decf1f... Author: Stefano Martinelli stefano.ste.martinelli@gmail.com Date: 2017-01-24 (Tue, 24 Jan 2017)
Changed paths: M po/it.po
Log Message: ----------- Translated using Weblate (Italian)
Currently translated at 100.0% (3226 of 3226 strings)
[CI skip]
Commit: 20aa51f601280649475b4a69f2f71bea6d11bb00 https://github.com/phpmyadmin/phpmyadmin/commit/20aa51f601280649475b4a69f2f7... Author: Michal Čihař michal@cihar.com Date: 2017-01-24 (Tue, 24 Jan 2017)
Changed paths: M ChangeLog M doc/setup.rst M libraries/Theme.php M libraries/config/ConfigFile.php M libraries/config/PageSettings.php M libraries/controllers/database/DatabaseStructureController.php M libraries/core.lib.php M libraries/navigation/NavigationTree.php M libraries/navigation/nodes/Node.php M libraries/replication_gui.lib.php M libraries/vendor_config.php M setup/config.php M setup/frames/config.inc.php M setup/frames/index.inc.php M setup/index.php M setup/lib/index.lib.php M tbl_replace.php M templates/navigation/logo.phtml M test/classes/config/ConfigFileTest.php M test/libraries/PMA_SetupIndex_test.php M test/libraries/core/PMA_cleanupPathInfo_test.php
Log Message: ----------- Merge branch 'master-security'
Commit: fa7f9f69401c722872555c19f99068985f0b39da https://github.com/phpmyadmin/phpmyadmin/commit/fa7f9f69401c722872555c19f990... Author: Michal Čihař michal@cihar.com Date: 2017-01-24 (Tue, 24 Jan 2017)
Log Message: ----------- Merge commit '3087a889567ecf547ac98f6c7668c67a1153f3af'
Commit: 476649fbdccb18ebe2f8c0486fb4ca6ddd77e590 https://github.com/phpmyadmin/phpmyadmin/commit/476649fbdccb18ebe2f8c0486fb4... Author: Michal Čihař michal@cihar.com Date: 2017-01-24 (Tue, 24 Jan 2017)
Changed paths: M ChangeLog
Log Message: ----------- Merge commit 'c812bcd4112c3d44e6e6bc72e710b9935c6aa9d3'
Commit: d6b198e3fafcb6ce1a81db32d5b903c240c3f65a https://github.com/phpmyadmin/phpmyadmin/commit/d6b198e3fafcb6ce1a81db32d5b9... Author: Michal Čihař michal@cihar.com Date: 2017-01-24 (Tue, 24 Jan 2017)
Log Message: ----------- Merge branch 'QA_4_6'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d7f28a5e8424...d6b198e3fafc