- Git - lists.phpmyadmin.net

[phpmyadmin/phpmyadmin] 584c4e: Fix syntax in documentation markup
by Michal Čihař 25 Nov '16

25 Nov '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 584c4e4b42ab230497e0caeac68edcb14a6c253d https://github.com/phpmyadmin/phpmyadmin/commit/584c4e4b42ab230497e0caeac68… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M doc/glossary.rst Log Message: ----------- Fix syntax in documentation markup Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 12f596ceb203692673e37e2c7106a0dc0f80e824 https://github.com/phpmyadmin/phpmyadmin/commit/12f596ceb203692673e37e2c710… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M ChangeLog M libraries/php-gettext/gettext.inc Log Message: ----------- Fix PHP error when mbstring is not installed It is still dependency for us, but we should be able to tell user nicely that it is missing. Fixes #12734 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 14d6e2048f0756312b6bae79d61daca1b31ae036 https://github.com/phpmyadmin/phpmyadmin/commit/14d6e2048f0756312b6bae79d61… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M ChangeLog Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/84c977b2a43a...14d6e2048f07

1 0

[phpmyadmin/docker] a01796: Cancel removal of /www/sql
by Michal Čihař 25 Nov '16

25 Nov '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/docker Commit: a01796864211e78ed8ec5f87eaebafb81aaa6938 https://github.com/phpmyadmin/docker/commit/a01796864211e78ed8ec5f87eaebafb… Author: Andrius Solopovas <andrius.solopovas(a)gmail.com> Date: 2016-11-24 (Thu, 24 Nov 2016) Changed paths: M Dockerfile Log Message: ----------- Cancel removal of /www/sql Please do not delete /www/sql folder as it contains create_tables.sql file that creates pma tables and phpmyadmin db for configuration storage Commit: 3142368a079de734f4c3b24a0dba9beb575aac03 https://github.com/phpmyadmin/docker/commit/3142368a079de734f4c3b24a0dba9be… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M Dockerfile Log Message: ----------- Merge pull request #89 from asolopovas/patch-1 Cancel removal of /www/sql Compare: https://github.com/phpmyadmin/docker/compare/9b115208c7d8...3142368a079d

1 0

[phpmyadmin/phpmyadmin] 80087a: Translated using Weblate (French)
by Deven Bansod 25 Nov '16

25 Nov '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 80087a021544bb0b1cf4fe6c35ca6edbe2d55189 https://github.com/phpmyadmin/phpmyadmin/commit/80087a021544bb0b1cf4fe6c35c… Author: Marc Delisle <marc(a)infomarc.info> Date: 2016-11-21 (Mon, 21 Nov 2016) Changed paths: M po/fr.po Log Message: ----------- Translated using Weblate (French) Currently translated at 99.5% (3207 of 3222 strings) [CI skip] Commit: 1a27a8eeff3501964a77d248ed02e4d90ad64f50 https://github.com/phpmyadmin/phpmyadmin/commit/1a27a8eeff3501964a77d248ed0… Author: Marc Delisle <marc(a)infomarc.info> Date: 2016-11-24 (Thu, 24 Nov 2016) Changed paths: M po/fr.po Log Message: ----------- Translated using Weblate (French) Currently translated at 99.6% (3210 of 3222 strings) [CI skip] Commit: 637d55bb4459ffceae9a5d0be36ab022ac583e10 https://github.com/phpmyadmin/phpmyadmin/commit/637d55bb4459ffceae9a5d0be36… Author: Carlos Ferreira <c.ferreira(a)acsiiweb.com> Date: 2016-11-24 (Thu, 24 Nov 2016) Changed paths: M po/fr.po Log Message: ----------- Translated using Weblate (French) Currently translated at 100.0% (3222 of 3222 strings) [CI skip] Commit: 5daee71272efd87a24fe58f90303e82a5b6caf6d https://github.com/phpmyadmin/phpmyadmin/commit/5daee71272efd87a24fe58f9030… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2016-11-24 (Thu, 24 Nov 2016) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.php Log Message: ----------- 4.6.5 release and ChangeLog Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com> Commit: 253894e2995ae4175f4429bf5cdaedfb6a722988 https://github.com/phpmyadmin/phpmyadmin/commit/253894e2995ae4175f4429bf5cd… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2016-11-24 (Thu, 24 Nov 2016) Changed paths: M ChangeLog M README M doc/conf.py M import.php M index.php M js/config.js M js/microhistory.js M libraries/Config.php M libraries/DbQbe.php M libraries/Error.php M libraries/ErrorHandler.php M libraries/Message.php M libraries/SavedSearches.php M libraries/Tracker.php M libraries/VersionInformation.php M libraries/core.lib.php M libraries/export.lib.php M libraries/ip_allow_deny.lib.php M libraries/plugins/AuthenticationPlugin.php M libraries/plugins/auth/AuthenticationConfig.php M libraries/plugins/auth/AuthenticationCookie.php M libraries/plugins/auth/AuthenticationHttp.php M libraries/tbl_partition_definition.inc.php M libraries/tracking.lib.php M prefs_manage.php M test/classes/ErrorTest.php M test/classes/MessageTest.php M test/libraries/core/PMA_isAllowedDomain_test.php M test/libraries/core/PMA_safeUnserialize_test.php M test/libraries/core/PMA_sanitizeMySQLHost_test.php Log Message: ----------- Resolve merge conflicts with ChangeLog Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com> Commit: b1136b88b16ec398ab4422bb3c3d55c17f6afc45 https://github.com/phpmyadmin/phpmyadmin/commit/b1136b88b16ec398ab4422bb3c3… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.php Log Message: ----------- Prepare for 4.6.6-dev Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com> Commit: 2c4ffca9e2c2ed1abe4ed41d6af2f3c33b808dff https://github.com/phpmyadmin/phpmyadmin/commit/2c4ffca9e2c2ed1abe4ed41d6af… Author: ratajs <simonrataj(a)seznam.cz> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M po/cs.po Log Message: ----------- Translated using Weblate (Czech) Currently translated at 93.2% (3006 of 3222 strings) [CI skip] Commit: 6497f5ab77e09505942317f1c152ab1a9976f669 https://github.com/phpmyadmin/phpmyadmin/commit/6497f5ab77e09505942317f1c15… Author: Weblate <noreply(a)weblate.org> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M ChangeLog M README M doc/conf.py M import.php M index.php M js/config.js M js/microhistory.js M libraries/Config.php M libraries/DbQbe.php M libraries/Error.php M libraries/ErrorHandler.php M libraries/Message.php M libraries/SavedSearches.php M libraries/Tracker.php M libraries/VersionInformation.php M libraries/core.lib.php M libraries/export.lib.php M libraries/ip_allow_deny.lib.php M libraries/plugins/AuthenticationPlugin.php M libraries/plugins/auth/AuthenticationConfig.php M libraries/plugins/auth/AuthenticationCookie.php M libraries/plugins/auth/AuthenticationHttp.php M libraries/tbl_partition_definition.inc.php M libraries/tracking.lib.php M prefs_manage.php M test/classes/ErrorTest.php M test/classes/MessageTest.php M test/libraries/core/PMA_isAllowedDomain_test.php M test/libraries/core/PMA_safeUnserialize_test.php M test/libraries/core/PMA_sanitizeMySQLHost_test.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: deeb3e62dfb3a2a03928164a3fc0fd2f283b3ff5 https://github.com/phpmyadmin/phpmyadmin/commit/deeb3e62dfb3a2a03928164a3fc… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M libraries/navigation/nodes/Node.php M libraries/navigation/nodes/NodeDatabase.php Log Message: ----------- Avoid use of improper parameters in escapeString Fix #12735 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: a600ff34ff31376da3d59d577c34a9e0705e94d1 https://github.com/phpmyadmin/phpmyadmin/commit/a600ff34ff31376da3d59d577c3… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M libraries/relation.lib.php Log Message: ----------- Fix some more instances of wrong arguments Issue #12735 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: b9ee59500fc746b99d4ec1e4c038cddb8ccf5cfb https://github.com/phpmyadmin/phpmyadmin/commit/b9ee59500fc746b99d4ec1e4c03… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog for #12735 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 84c977b2a43a47bda60fd3611c90506fbe0d886d https://github.com/phpmyadmin/phpmyadmin/commit/84c977b2a43a47bda60fd3611c9… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M ChangeLog M libraries/navigation/nodes/Node.php M libraries/navigation/nodes/NodeDatabase.php M libraries/relation.lib.php Log Message: ----------- Merge branch 'QA_4_6' Conflicts: ChangeLog README doc/conf.py libraries/Config.php po/cs.po po/fr.po Compare: https://github.com/phpmyadmin/phpmyadmin/compare/fb161a7bebe6...84c977b2a43a

1 0

[phpmyadmin/phpmyadmin] deeb3e: Avoid use of improper parameters in escapeString
by Deven Bansod 25 Nov '16

25 Nov '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: deeb3e62dfb3a2a03928164a3fc0fd2f283b3ff5 https://github.com/phpmyadmin/phpmyadmin/commit/deeb3e62dfb3a2a03928164a3fc… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M libraries/navigation/nodes/Node.php M libraries/navigation/nodes/NodeDatabase.php Log Message: ----------- Avoid use of improper parameters in escapeString Fix #12735 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: a600ff34ff31376da3d59d577c34a9e0705e94d1 https://github.com/phpmyadmin/phpmyadmin/commit/a600ff34ff31376da3d59d577c3… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M libraries/relation.lib.php Log Message: ----------- Fix some more instances of wrong arguments Issue #12735 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: b9ee59500fc746b99d4ec1e4c038cddb8ccf5cfb https://github.com/phpmyadmin/phpmyadmin/commit/b9ee59500fc746b99d4ec1e4c03… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog for #12735 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6497f5ab77e0...b9ee59500fc7

1 0

[phpmyadmin/localized_docs] 6cea2b: Translated using Weblate (Polish)
by Stanisław Krukowski 25 Nov '16

25 Nov '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/localized_docs Commit: 6cea2b66ecefb14747e10213310e6bd01d36de23 https://github.com/phpmyadmin/localized_docs/commit/6cea2b66ecefb14747e1021… Author: Stanisław Krukowski <dfk0077(a)riseup.net> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M po/pl.mo M po/pl.po Log Message: ----------- Translated using Weblate (Polish) Currently translated at 11.7% (271 of 2315 strings) [CI skip]

1 0

[phpmyadmin/phpmyadmin] b12411: Fix header in User Properties editor
by Isaac Bennetch 25 Nov '16

25 Nov '16

Branch: refs/heads/STABLE Home: https://github.com/phpmyadmin/phpmyadmin Commit: b12411cc2466639e7684c8414e65e19b8d170cc7 https://github.com/phpmyadmin/phpmyadmin/commit/b12411cc2466639e7684c8414e6… Author: Pavel Rochnyack <pavel2000(a)ngs.ru> Date: 2016-08-03 (Wed, 03 Aug 2016) Changed paths: M libraries/server_privileges.lib.php M test/libraries/PMA_server_privileges_test.php Log Message: ----------- Fix header in User Properties editor Signed-off-by: Pavel Rochnyack <pavel2000(a)ngs.ru> Commit: 7249a769285d74d6a3c2a0a62c1946a93ed6a0bc https://github.com/phpmyadmin/phpmyadmin/commit/7249a769285d74d6a3c2a0a62c1… Author: Pavel Rochnyack <pavel2000(a)ngs.ru> Date: 2016-08-14 (Sun, 14 Aug 2016) Changed paths: M po/ru.po M templates/columns_definitions/column_definitions_form.phtml Log Message: ----------- Translation improvements * Improved Russian translation * Added lost internationalization to column_definitions_form.phtml Signed-off-by: Pavel Rochnyack <pavel2000(a)ngs.ru> Commit: 5a5ae580f2a82de9775cae743e446d3a177552ec https://github.com/phpmyadmin/phpmyadmin/commit/5a5ae580f2a82de9775cae743e4… Author: Pavel Rochnyack <pavel2000(a)ngs.ru> Date: 2016-08-14 (Sun, 14 Aug 2016) Changed paths: M libraries/Partition.php M libraries/controllers/table/TableStructureController.php M libraries/create_addfield.lib.php M libraries/operations.lib.php M libraries/tbl_partition_definition.inc.php M po/ru.po M templates/columns_definitions/partitions.phtml M templates/table/structure/display_partitions.phtml M templates/table/structure/display_structure.phtml Log Message: ----------- Partitions editor: Allow to edit partition names; Add 'COLUMNS Partitioning' support. + Add 'COLUMNS Partitioning' support + Allow to edit partition names * Do not show duplicate partition names in 'Partition maintenance' snippet on 'Operations' tab. Caused by subpartitions presence. * Optimize Partition::getPartitionMethod() - need only one row, so use 'LIMIT 1' in query to avoid much data transfer from database. * Change HTML-code of partition comment textarea to avoid extra spaces added to value. * Added missing htmlspecialchars() on subpartitions comment. Signed-off-by: Pavel Rochnyack <pavel2000(a)ngs.ru> Commit: c660c627f0b8dc069bde459c4eefed3dbcef3904 https://github.com/phpmyadmin/phpmyadmin/commit/c660c627f0b8dc069bde459c4ee… Author: Pavel Rochnyack <pavel2000(a)ngs.ru> Date: 2016-08-14 (Sun, 14 Aug 2016) Changed paths: M libraries/insert_edit.lib.php M test/libraries/PMA_insert_edit_test.php Log Message: ----------- When editing table records, display readonly inputs for fields without write access . Signed-off-by: Pavel Rochnyack <pavel2000(a)ngs.ru> Commit: d1e353f23539e12545ee77314df7ccdf4a7ec2e5 https://github.com/phpmyadmin/phpmyadmin/commit/d1e353f23539e12545ee77314df… Author: Pavel Rochnyack <pavel2000(a)ngs.ru> Date: 2016-08-14 (Sun, 14 Aug 2016) Changed paths: M libraries/server_privileges.lib.php M server_privileges.php Log Message: ----------- Fix #12419 wrong description on GRANT option of table/routine privileges. Signed-off-by: Pavel Rochnyack <pavel2000(a)ngs.ru> Commit: 6c497b590f8fb837bd7538f6b1c6ad7ece1b3fd7 https://github.com/phpmyadmin/phpmyadmin/commit/6c497b590f8fb837bd7538f6b1c… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-08-16 (Tue, 16 Aug 2016) Changed paths: M js/navigation.js Log Message: ----------- Reload Navigation if no prev entry stored This automatically ensures check for url params. If token does not match, store the current NavTree status in sessionStorage Fix #12384 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: bd403cdbd2162db2f80b09e8751596a1f8b4b32d https://github.com/phpmyadmin/phpmyadmin/commit/bd403cdbd2162db2f80b09e8751… Author: Axel Rindle <axel.rindle(a)gmx.de> Date: 2016-08-17 (Wed, 17 Aug 2016) Changed paths: M po/de.po Log Message: ----------- Translated using Weblate (German) Currently translated at 100.0% (3214 of 3214 strings) [CI skip] Commit: 0c3dac812ce739a96d554fbb4a20b37418255fc8 https://github.com/phpmyadmin/phpmyadmin/commit/0c3dac812ce739a96d554fbb4a2… Author: Weblate <noreply(a)weblate.org> Date: 2016-08-17 (Wed, 17 Aug 2016) Changed paths: M .scrutinizer.yml M ChangeLog M README M build.xml M changelog.php M config.sample.inc.php M doc/conf.py M doc/config.rst M doc/setup.rst M examples/openid.php M examples/signon.php R examples/swekey.sample.conf M file_echo.php M import.php M index.php M js/functions.js M js/tbl_relation.js M libraries/Config.php M libraries/DbSearch.php M libraries/Error.php M libraries/File.php M libraries/RecentFavoriteTable.php M libraries/Response.php M libraries/Table.php M libraries/Util.php M libraries/VersionInformation.php M libraries/common.inc.php M libraries/config.default.php M libraries/config/ServerConfigChecks.php M libraries/config/Validator.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/core.lib.php M libraries/create_addfield.lib.php M libraries/db_designer.lib.php M libraries/dbi/DBIMysql.php M libraries/dbi/DBIMysqli.php M libraries/display_export.lib.php M libraries/display_git_revision.lib.php M libraries/engines/Pbxt.php M libraries/error_report.lib.php M libraries/file_listing.lib.php M libraries/gis/GISGeometry.php M libraries/ip_allow_deny.lib.php M libraries/navigation/NavigationTree.php M libraries/navigation/nodes/Node.php M libraries/navigation/nodes/NodeDatabase.php M libraries/plugin_interface.lib.php M libraries/plugins/auth/AuthenticationCookie.php R libraries/plugins/auth/swekey/authentication.inc.php R libraries/plugins/auth/swekey/musbe-ca.crt R libraries/plugins/auth/swekey/swekey.auth.lib.php R libraries/plugins/auth/swekey/swekey.php M libraries/plugins/export/ExportMediawiki.php M libraries/plugins/export/ExportPhparray.php M libraries/plugins/export/ExportSql.php M libraries/plugins/export/ExportXml.php M libraries/plugins/import/ImportShp.php M libraries/plugins/schema/ExportRelationSchema.php M libraries/plugins/transformations/abs/FormattedTransformationsPlugin.php M libraries/plugins/transformations/abs/ImageLinkTransformationsPlugin.php M libraries/plugins/transformations/abs/ImageUploadTransformationsPlugin.php M libraries/plugins/transformations/abs/InlineTransformationsPlugin.php M libraries/plugins/transformations/abs/RegexValidationTransformationsPlugin.php M libraries/plugins/transformations/abs/TextImageLinkTransformationsPlugin.php M libraries/plugins/transformations/abs/TextLinkTransformationsPlugin.php R libraries/plugins/transformations/generator_main_class.sh R libraries/plugins/transformations/generator_plugin.sh M libraries/pmd_common.php M libraries/relation.lib.php M libraries/replication.inc.php M libraries/replication_gui.lib.php M libraries/sanitizing.lib.php M libraries/server_privileges.lib.php M libraries/server_status_variables.lib.php M libraries/server_user_groups.lib.php M libraries/session.inc.php M libraries/tracking.lib.php M libraries/zip_extension.lib.php M lint.php M normalization.php R phpinfo.php M phpunit.xml.dist A scripts/transformations_generator_main_class.sh A scripts/transformations_generator_plugin.sh M tbl_addfield.php M templates/list/item.phtml M templates/server/databases/create.phtml M templates/table/gis_visualization/gis_visualization.phtml M templates/table/search/zoom_result_form.phtml M templates/table/structure/display_structure.phtml M test/classes/DisplayResultsTest.php M test/classes/engines/PbxtTest.php M test/classes/plugin/auth/AuthenticationCookieTest.php M test/classes/plugin/export/ExportPhparrayTest.php M test/classes/plugin/export/ExportXmlTest.php M test/classes/plugin/transformations/TransformationPluginsTest.php M test/libraries/PMA_ip_allow_deny_test.php M test/libraries/PMA_zip_extension_test.php A test/libraries/core/PMA_isAllowedDomain_test.php A test/libraries/core/PMA_safeUnserialize_test.php A test/libraries/core/PMA_sanitizeMySQLHost_test.php M themes.php M transformation_wrapper.php M url.php M user_password.php M version_check.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: b3d8ebad3fc2dcea89e87c0a77bb0cb84f76cec3 https://github.com/phpmyadmin/phpmyadmin/commit/b3d8ebad3fc2dcea89e87c0a77b… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2016-08-16 (Tue, 16 Aug 2016) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.php Log Message: ----------- Prepare for 4.6.5 Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com> Commit: 28bfcebcf19df84df6abf531397f950ed8eaf884 https://github.com/phpmyadmin/phpmyadmin/commit/28bfcebcf19df84df6abf531397… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-17 (Wed, 17 Aug 2016) Changed paths: M ChangeLog R libraries/tcpdf/include/sRGB.icc Log Message: ----------- Remove potentionally license problematic sRGB profile We really do not need it, so there is no reason to ship it. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 27f4ff93eed69065bb6241002f91ad1711a408ee https://github.com/phpmyadmin/phpmyadmin/commit/27f4ff93eed69065bb6241002f9… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-17 (Wed, 17 Aug 2016) Changed paths: M doc/setup.rst Log Message: ----------- Document how to set up credentials on Docker Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: cff9e555ae523e019769da21d43e59ea0aec7974 https://github.com/phpmyadmin/phpmyadmin/commit/cff9e555ae523e019769da21d43… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-17 (Wed, 17 Aug 2016) Changed paths: M js/navigation.js Log Message: ----------- Merge pull request #12462 from devenbansod/fix_12384 Reload Navigation if no previous entry stored Commit: a53bc7c0e3b2416749441ffca3042270959cba53 https://github.com/phpmyadmin/phpmyadmin/commit/a53bc7c0e3b2416749441ffca30… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-17 (Wed, 17 Aug 2016) Changed paths: M libraries/insert_edit.lib.php M test/libraries/PMA_insert_edit_test.php Log Message: ----------- Merge pull request #12459 from rpv-tomsk/column-privileges When editing table records, display readonly inputs for fields without write access. Commit: 7412f90aaf75cc1b4e3b983aa60e12f05165ac78 https://github.com/phpmyadmin/phpmyadmin/commit/7412f90aaf75cc1b4e3b983aa60… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-17 (Wed, 17 Aug 2016) Changed paths: M ChangeLog Log Message: ----------- Add changelog entries Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 03461d85c889e7b04759917c6f0c816b6b95e7ff https://github.com/phpmyadmin/phpmyadmin/commit/03461d85c889e7b04759917c6f0… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-17 (Wed, 17 Aug 2016) Changed paths: M po/ru.po M templates/columns_definitions/column_definitions_form.phtml Log Message: ----------- Merge pull request #12458 from rpv-tomsk/fix-ru-translation Translation improvements Commit: fa60ccfca0b3619442ca473baeffcec45e9ace01 https://github.com/phpmyadmin/phpmyadmin/commit/fa60ccfca0b3619442ca473baef… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-17 (Wed, 17 Aug 2016) Changed paths: M po/af.po M po/ar.po M po/az.po M po/be.po M po/be(a)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(a)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(a)latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po Log Message: ----------- Update po files [CI skip] Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: ba59178a75e11a6f4ca6fd2902b6d30b3827e8a1 https://github.com/phpmyadmin/phpmyadmin/commit/ba59178a75e11a6f4ca6fd2902b… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-17 (Wed, 17 Aug 2016) Changed paths: M libraries/Partition.php M libraries/controllers/table/TableStructureController.php M libraries/create_addfield.lib.php M libraries/operations.lib.php M libraries/tbl_partition_definition.inc.php M templates/columns_definitions/partitions.phtml M templates/table/structure/display_partitions.phtml M templates/table/structure/display_structure.phtml Log Message: ----------- Merge pull request #12430 from rpv-tomsk/improve-partitions-support Partitions editor: Allow to edit partition names; Add 'COLUMNS Partitioning' support. Commit: 27936aa8bf1492858495aef8dcc552b7d41e4665 https://github.com/phpmyadmin/phpmyadmin/commit/27936aa8bf1492858495aef8dcc… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-17 (Wed, 17 Aug 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for issue #12430 Impove partitioning support Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 1d3608b6a99cea8996ae349e8ccebb3a8aa7944e https://github.com/phpmyadmin/phpmyadmin/commit/1d3608b6a99cea8996ae349e8cc… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-17 (Wed, 17 Aug 2016) Changed paths: M libraries/Partition.php M libraries/controllers/table/TableStructureController.php M libraries/create_addfield.lib.php M libraries/operations.lib.php M libraries/tbl_partition_definition.inc.php M templates/columns_definitions/partitions.phtml M templates/table/structure/display_partitions.phtml M templates/table/structure/display_structure.phtml Log Message: ----------- Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 Commit: 5410e3859bc96f2ff3a45e8f627931937f9c81bc https://github.com/phpmyadmin/phpmyadmin/commit/5410e3859bc96f2ff3a45e8f627… Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: 2016-08-17 (Wed, 17 Aug 2016) Changed paths: M po/tr.po Log Message: ----------- Translated using Weblate (Turkish) Currently translated at 100.0% (3206 of 3206 strings) [CI skip] Commit: 41613c512dd207dc36aced8ef387d7de1e7abd7c https://github.com/phpmyadmin/phpmyadmin/commit/41613c512dd207dc36aced8ef38… Author: Kristjan Räts <kristjanrats(a)gmail.com> Date: 2016-08-17 (Wed, 17 Aug 2016) Changed paths: M po/et.po Log Message: ----------- Translated using Weblate (Estonian) Currently translated at 100.0% (3206 of 3206 strings) [CI skip] Commit: 311be7515c8c280041565594ca853f31a4177082 https://github.com/phpmyadmin/phpmyadmin/commit/311be7515c8c280041565594ca8… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-17 (Wed, 17 Aug 2016) Changed paths: M js/functions.js M libraries/core.lib.php M test/.htaccess Log Message: ----------- Use https when available Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 76a471a790bf31873f469866374dfbab63e5f40c https://github.com/phpmyadmin/phpmyadmin/commit/76a471a790bf31873f469866374… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-17 (Wed, 17 Aug 2016) Changed paths: M user_password.php Log Message: ----------- Avoid problems with PHP comparison - allow password where empty returns true - compare using === Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: b53fff29b20ebdc04aa34515e3c3a7940c2e065e https://github.com/phpmyadmin/phpmyadmin/commit/b53fff29b20ebdc04aa34515e3c… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-17 (Wed, 17 Aug 2016) Changed paths: M doc/config.rst M doc/faq.rst Log Message: ----------- Crossreference docs for PmaAbsoluteUri Issue #12374 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 1099f68c1a94c39e1f04baa6403152f00b3ee345 https://github.com/phpmyadmin/phpmyadmin/commit/1099f68c1a94c39e1f04baa6403… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-17 (Wed, 17 Aug 2016) Changed paths: M doc/config.rst M doc/faq.rst M libraries/config.default.php Log Message: ----------- Reintroduce PmaAbsoluteUri setting It has no affect yet. Issue #12374 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 83476322ba5a31caf17651ac57256da54b3cda10 https://github.com/phpmyadmin/phpmyadmin/commit/83476322ba5a31caf17651ac572… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-17 (Wed, 17 Aug 2016) Changed paths: M libraries/Config.php M test/classes/plugin/auth/AuthenticationCookieTest.php M test/libraries/PMA_user_preferences_test.php Log Message: ----------- Use PmaAbsolueUri for cookie path Issue #12374 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 01b9db6b1c6f986ee38b814b37879082cd2d4520 https://github.com/phpmyadmin/phpmyadmin/commit/01b9db6b1c6f986ee38b814b378… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-17 (Wed, 17 Aug 2016) Changed paths: M libraries/Config.php M libraries/core.lib.php M libraries/session.inc.php M test/classes/ConfigTest.php Log Message: ----------- Rename getCookiePath() to getRootPath() It is not used only for cookies, so generic name makes more sense. Issue #12374 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: a458b704127c0cd1b21d8111842a7ff86043d74e https://github.com/phpmyadmin/phpmyadmin/commit/a458b704127c0cd1b21d8111842… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-17 (Wed, 17 Aug 2016) Changed paths: M libraries/Config.php Log Message: ----------- Use PmaAbsoluteUri for isHttps Issue #12374 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: f6a64ed83518aad7985942158fc492d7e6cbec62 https://github.com/phpmyadmin/phpmyadmin/commit/f6a64ed83518aad7985942158fc… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-17 (Wed, 17 Aug 2016) Changed paths: M ChangeLog Log Message: ----------- Reintroduced simplified PmaAbsoluteUri configuration directive Fixes #12374 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 7898060916b7b9d82ef35d73117228c7246f510a https://github.com/phpmyadmin/phpmyadmin/commit/7898060916b7b9d82ef35d73117… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-17 (Wed, 17 Aug 2016) Changed paths: M libraries/Config.php M test/classes/ConfigTest.php Log Message: ----------- Ensure PmaAbsoluteUri ends with / This was probably most frequest user error we want to fix. Issue #12374 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: a02f9c6ad03fd87d907865191128c363addc6b05 https://github.com/phpmyadmin/phpmyadmin/commit/a02f9c6ad03fd87d90786519112… Author: dingo thirteen <dingo13(a)gmail.com> Date: 2016-08-17 (Wed, 17 Aug 2016) Changed paths: M po/nl.po Log Message: ----------- Translated using Weblate (Dutch) Currently translated at 100.0% (3206 of 3206 strings) [CI skip] Commit: 9d3263c9f34c2225c27286487a058e02eb703585 https://github.com/phpmyadmin/phpmyadmin/commit/9d3263c9f34c2225c27286487a0… Author: Stefano Martinelli <stefano.ste.martinelli(a)gmail.com> Date: 2016-08-17 (Wed, 17 Aug 2016) Changed paths: M po/it.po Log Message: ----------- Translated using Weblate (Italian) Currently translated at 100.0% (3206 of 3206 strings) [CI skip] Commit: df5099459db3d311ac86ca36ba4dd03e8a19c9db https://github.com/phpmyadmin/phpmyadmin/commit/df5099459db3d311ac86ca36ba4… Author: Weblate <noreply(a)weblate.org> Date: 2016-08-17 (Wed, 17 Aug 2016) Changed paths: M ChangeLog M doc/config.rst M doc/faq.rst M js/functions.js M libraries/Config.php M libraries/config.default.php M libraries/core.lib.php M libraries/session.inc.php M test/.htaccess M test/classes/ConfigTest.php M test/classes/plugin/auth/AuthenticationCookieTest.php M test/libraries/PMA_user_preferences_test.php M user_password.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: 717adf40f36840f4cf498a32aeb6d4f6400173c8 https://github.com/phpmyadmin/phpmyadmin/commit/717adf40f36840f4cf498a32aeb… Author: Domen <mitenem(a)outlook.com> Date: 2016-08-17 (Wed, 17 Aug 2016) Changed paths: M po/sl.po Log Message: ----------- Translated using Weblate (Slovenian) Currently translated at 100.0% (3206 of 3206 strings) [CI skip] Commit: 9dbe520e905344597554b06931bd966ce195b9dc https://github.com/phpmyadmin/phpmyadmin/commit/9dbe520e905344597554b06931b… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M libraries/core.lib.php M libraries/plugins/auth/AuthenticationCookie.php M libraries/plugins/auth/AuthenticationHttp.php Log Message: ----------- Strip null bytes from MySQL username In old PHP versions this could lead to allow/deny rules bypass. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 2de86f02af17f49e22d6474542770d72dd4723b3 https://github.com/phpmyadmin/phpmyadmin/commit/2de86f02af17f49e22d64745427… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M libraries/ip_allow_deny.lib.php Log Message: ----------- Use hash_equals for comparing username in allow/deny rules The comparison should happen in constant time to avoid possible leak of usernames in rules. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: c83b2b0872c035d2625f631a341cb2009ceb9d22 https://github.com/phpmyadmin/phpmyadmin/commit/c83b2b0872c035d2625f631a341… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M libraries/plugins/auth/AuthenticationCookie.php M libraries/plugins/auth/AuthenticationHttp.php Log Message: ----------- Use hash_equals for checking username This makes the comparison happen in constant time and makes it impossible to use it to guess stored usernames. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 61976131350eca8cbba74270a44ea7baa708259f https://github.com/phpmyadmin/phpmyadmin/commit/61976131350eca8cbba74270a44… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M libraries/VersionInformation.php Log Message: ----------- Silent errors when getting remote file - both curl and fopen wrappers can emmit errors in cases where remote site is not accessible - do not pass false value to json_decode Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: cf83d6afbe4383e7668c1207be6d5bee0646be04 https://github.com/phpmyadmin/phpmyadmin/commit/cf83d6afbe4383e7668c1207be6… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M libraries/export.lib.php Log Message: ----------- Remove debugging code Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: a0ca9394a214afd15a4b883f8953b7b32f3caf04 https://github.com/phpmyadmin/phpmyadmin/commit/a0ca9394a214afd15a4b883f895… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M libraries/Error.php M test/classes/ErrorTest.php Log Message: ----------- Strip path even if openbasedir restrictions apply This really should not be the case here as what we get here is code executed by PHP, so it should have already passed openbasedir restrictions. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 6e3282e15856192d484f2c56a7ae83796bf2e716 https://github.com/phpmyadmin/phpmyadmin/commit/6e3282e15856192d484f2c56a7a… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M js/microhistory.js Log Message: ----------- Store copy of hash instead of working on live object This avoids possible race conditions when doing the checks. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: b63bd9977c436f6ad564d429e663bb580bb4e730 https://github.com/phpmyadmin/phpmyadmin/commit/b63bd9977c436f6ad564d429e66… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M libraries/navigation/NavigationHeader.php Log Message: ----------- Stricter validation of NavigationLogoLink It now has to be URL including scheme. Otherwise it's not really possible to validate it for being just http/https. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 3ef6201bd6d43eed7f360bb2ead22ef7c484381e https://github.com/phpmyadmin/phpmyadmin/commit/3ef6201bd6d43eed7f360bb2ead… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M js/config.js Log Message: ----------- Fix hash validation - use copy of hash to avoid race condition - stricter regex to match whole string Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 45e33d63a252011b02b55b74432c4a90484eaa5e https://github.com/phpmyadmin/phpmyadmin/commit/45e33d63a252011b02b55b74432… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M libraries/DbQbe.php M libraries/SavedSearches.php Log Message: ----------- Limit maximal number of rows in QBE User would be lost in them anyway by that count and it prevents DOS. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: c44f5ab080641765d8a234b791ad75395b932335 https://github.com/phpmyadmin/phpmyadmin/commit/c44f5ab080641765d8a234b791a… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M ChangeLog M libraries/core.lib.php M setup/lib/ConfigGenerator.php M show_config_errors.php Log Message: ----------- Always use UTC time in HTTP headers Using timezones in this context can cause problem when DST changes apply. Also this can be information leak of server timezone. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: d62494cd8c99185077f516be76093f4cb4a32837 https://github.com/phpmyadmin/phpmyadmin/commit/d62494cd8c99185077f516be760… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M ChangeLog M libraries/core.lib.php M po/sl.po M setup/lib/ConfigGenerator.php M show_config_errors.php Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: 6faa1fe46a4a69c43bb1f9eb8a059a9811700e3c https://github.com/phpmyadmin/phpmyadmin/commit/6faa1fe46a4a69c43bb1f9eb8a0… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M index.php M js/functions.js M libraries/Advisor.php M libraries/Footer.php M libraries/Util.php M libraries/navigation/NavigationHeader.php M libraries/plugins/auth/AuthenticationCookie.php M test/classes/AdvisorTest.php M test/classes/FooterTest.php M themes.php Log Message: ----------- Add rel="noopener noreferrer" to all external target="_blank" links Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: ba82f0000c7837bd3b834b24660325652ec27675 https://github.com/phpmyadmin/phpmyadmin/commit/ba82f0000c7837bd3b834b24660… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M index.php M js/functions.js M libraries/Advisor.php M libraries/Footer.php M libraries/Util.php M libraries/navigation/NavigationHeader.php M libraries/plugins/auth/AuthenticationCookie.php M test/classes/AdvisorTest.php M test/classes/FooterTest.php M themes.php Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: 232bbd04613e571ee0a52c1e02cf79026f74470d https://github.com/phpmyadmin/phpmyadmin/commit/232bbd04613e571ee0a52c1e02c… Author: Domen <mitenem(a)outlook.com> Date: 2016-08-21 (Sun, 21 Aug 2016) Changed paths: M po/sl.po Log Message: ----------- Translated using Weblate (Slovenian) Currently translated at 100.0% (3206 of 3206 strings) [CI skip] Commit: 140d0e5a5b24f367a40afa8d1336e3e1a9cb40ad https://github.com/phpmyadmin/phpmyadmin/commit/140d0e5a5b24f367a40afa8d133… Author: Bohdan S <tpsolodkov(a)gmail.com> Date: 2016-08-21 (Sun, 21 Aug 2016) Changed paths: M po/uk.po Log Message: ----------- Translated using Weblate (Ukrainian) Currently translated at 80.3% (2575 of 3206 strings) [CI skip] Commit: 6ab7c1318f66e8fe6231cf3a1b06195bab18b436 https://github.com/phpmyadmin/phpmyadmin/commit/6ab7c1318f66e8fe6231cf3a1b0… Author: Παναγιώτης Παπάζογλου <papaz_p(a)yahoo.com> Date: 2016-08-23 (Tue, 23 Aug 2016) Changed paths: M po/el.po Log Message: ----------- Translated using Weblate (Greek) Currently translated at 100.0% (3206 of 3206 strings) [CI skip] Commit: d4352a309701d77e9037f67a41005296a9a5fc66 https://github.com/phpmyadmin/phpmyadmin/commit/d4352a309701d77e9037f67a410… Author: Satnam S Virdi <pika10singh(a)gmail.com> Date: 2016-08-23 (Tue, 23 Aug 2016) Changed paths: M po/pa.po Log Message: ----------- Translated using Weblate (Punjabi) Currently translated at 3.1% (102 of 3206 strings) [CI skip] Commit: 09597d9c5eeb487ec57792757de058d59daf425a https://github.com/phpmyadmin/phpmyadmin/commit/09597d9c5eeb487ec57792757de… Author: Lucius Gaitán <luciuspgc(a)gmail.com> Date: 2016-08-24 (Wed, 24 Aug 2016) Changed paths: M po/pt_BR.po Log Message: ----------- Translated using Weblate (Portuguese (Brazil)) Currently translated at 93.1% (2987 of 3206 strings) [CI skip] Commit: 4a9b84faa2c1a9305c72eb600043e7fc68b1892c https://github.com/phpmyadmin/phpmyadmin/commit/4a9b84faa2c1a9305c72eb60004… Author: Giovanni Sora <g.sora(a)tiscali.it> Date: 2016-08-24 (Wed, 24 Aug 2016) Changed paths: M po/ia.po Log Message: ----------- Translated using Weblate (Interlingua) Currently translated at 73.5% (2357 of 3206 strings) [CI skip] Commit: 265efb046fe50acb8ca277da533911414af177d3 https://github.com/phpmyadmin/phpmyadmin/commit/265efb046fe50acb8ca277da533… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-24 (Wed, 24 Aug 2016) Changed paths: M libraries/sanitizing.lib.php Log Message: ----------- Extend PMA_checkLink to cover more use cases - allow to support mailto, ftp or http links on request - do not use multibyte functions as we're interested in first chars anyway and we're comparing against ascii ones Issue #12479 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 48b6dd58d8d7efa30b5330108eb3fd38f5230e23 https://github.com/phpmyadmin/phpmyadmin/commit/48b6dd58d8d7efa30b5330108eb… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-24 (Wed, 24 Aug 2016) Changed paths: M ChangeLog M libraries/navigation/NavigationHeader.php M libraries/plugins/transformations/abs/TextImageLinkTransformationsPlugin.php M libraries/plugins/transformations/abs/TextLinkTransformationsPlugin.php Log Message: ----------- Use one code to check external links There is no good reason to duplicate the check in several places. Fixes #12479 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 38cf23470728537bed4330a0e669fa636d157eab https://github.com/phpmyadmin/phpmyadmin/commit/38cf23470728537bed4330a0e66… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-24 (Wed, 24 Aug 2016) Changed paths: M libraries/special_schema_links.lib.php Log Message: ----------- Force relative paths in links This way we avoid potential problem if script name resolves to a domain. Issue #12483 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: ed6188d2c89deb7d46df958b07de5cf0ca24f2f7 https://github.com/phpmyadmin/phpmyadmin/commit/ed6188d2c89deb7d46df958b07d… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-24 (Wed, 24 Aug 2016) Changed paths: M ChangeLog M libraries/sanitizing.lib.php Log Message: ----------- Whitelist relative URLs from built in transformatons Fixes #12483 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: cbd6137c03a7cf0db7b361bf34656e4c046d863b https://github.com/phpmyadmin/phpmyadmin/commit/cbd6137c03a7cf0db7b361bf346… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-24 (Wed, 24 Aug 2016) Changed paths: M libraries/DisplayResults.php M test/classes/DisplayResultsTest.php Log Message: ----------- Avoid double escaping of built in transformation URLs We do already escape them in the tranformation, so avoid doing that before. Issue #12483 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: d5c6801a8580f221fc64471016b06cc4dae9ffba https://github.com/phpmyadmin/phpmyadmin/commit/d5c6801a8580f221fc64471016b… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-24 (Wed, 24 Aug 2016) Changed paths: M ChangeLog M libraries/DisplayResults.php M libraries/navigation/NavigationHeader.php M libraries/plugins/transformations/abs/TextImageLinkTransformationsPlugin.php M libraries/plugins/transformations/abs/TextLinkTransformationsPlugin.php M libraries/sanitizing.lib.php M libraries/special_schema_links.lib.php M po/el.po M po/ia.po M po/pa.po M po/pt_BR.po M po/sl.po M po/uk.po M test/classes/DisplayResultsTest.php Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: 6879923acc50842029541f6602a54b3600df6e34 https://github.com/phpmyadmin/phpmyadmin/commit/6879923acc50842029541f6602a… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-24 (Wed, 24 Aug 2016) Changed paths: M ChangeLog M index.php Log Message: ----------- Do not show warning about short blowfish_secret if none is set With empty blowfish_secret user would always get both warnings... Fixes #12485 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: c4714b003c21948e13eb0162c5c951d5e84a1c75 https://github.com/phpmyadmin/phpmyadmin/commit/c4714b003c21948e13eb0162c5c… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-24 (Wed, 24 Aug 2016) Changed paths: M ChangeLog M index.php Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: 54a059449321d7796cb59a920178f9c4c8031549 https://github.com/phpmyadmin/phpmyadmin/commit/54a059449321d7796cb59a92017… Author: Renan Souza do Nascimento <renan.sn(a)icloud.com> Date: 2016-08-25 (Thu, 25 Aug 2016) Changed paths: M po/pt.po Log Message: ----------- Translated using Weblate (Portuguese) Currently translated at 53.7% (1724 of 3206 strings) [CI skip] Commit: fb3b722da1ae7e87aed06d4868a0dc63d6025dc6 https://github.com/phpmyadmin/phpmyadmin/commit/fb3b722da1ae7e87aed06d4868a… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-25 (Thu, 25 Aug 2016) Changed paths: M ChangeLog M js/get_image.js.php M js/get_scripts.js.php M js/whitelist.php Log Message: ----------- Fixed random logouts due to wrong cookie path Some script did not properly configure their relative path and this could lead to wrong cookie path being set. This doesn't happen in all cases as the PHP session engine doesn't seem to set the cookie session in every request. Fixes #12251 Fixes phpmyadmin/docker#32 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 33348c5ed52648669c7a503228ff09255da9be5f https://github.com/phpmyadmin/phpmyadmin/commit/33348c5ed52648669c7a503228f… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-25 (Thu, 25 Aug 2016) Changed paths: M libraries/Table.php Log Message: ----------- Allow to specify length of 0 Issue #12480 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 9882dcba3a03fb7352a85b5100f2fa850fd80ada https://github.com/phpmyadmin/phpmyadmin/commit/9882dcba3a03fb7352a85b5100f… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-25 (Thu, 25 Aug 2016) Changed paths: M ChangeLog M libraries/Table.php Log Message: ----------- Fixed editing of ENUM/SET/DECIMAL fields structure Fixes #12480 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 26cc80324e455af8aeb00d9176f075ad26c6364a https://github.com/phpmyadmin/phpmyadmin/commit/26cc80324e455af8aeb00d9176f… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-25 (Thu, 25 Aug 2016) Changed paths: M libraries/Config.php Log Message: ----------- Validate git commit hash before using Just to ensure we've parsed correct data. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 0a20356ec4110e682b5bbb219f5f08db10bc418c https://github.com/phpmyadmin/phpmyadmin/commit/0a20356ec4110e682b5bbb219f5… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-25 (Thu, 25 Aug 2016) Changed paths: M ChangeLog M js/get_image.js.php M js/get_scripts.js.php M js/whitelist.php M libraries/Config.php M libraries/Table.php M po/pt.po Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: df29d8ae4100841ecdb59fdfdd29b76f9a28661d https://github.com/phpmyadmin/phpmyadmin/commit/df29d8ae4100841ecdb59fdfdd2… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-08-25 (Thu, 25 Aug 2016) Changed paths: M libraries/navigation/nodes/Node.php Log Message: ----------- Add appr. escaping for $cfg options 'hide_db' and 'only_db' These can lead to SQL injection. Fix #12497 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: d0b8281e84f30d0c1a5a48b73752e8b1bce29b1a https://github.com/phpmyadmin/phpmyadmin/commit/d0b8281e84f30d0c1a5a48b7375… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-08-25 (Thu, 25 Aug 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for #12497 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 96f5f101cc6db57abaea88f4ff5015f1839a2c8e https://github.com/phpmyadmin/phpmyadmin/commit/96f5f101cc6db57abaea88f4ff5… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-08-26 (Fri, 26 Aug 2016) Changed paths: M libraries/Advisor.php Log Message: ----------- Add error checking in reading the advisory_rules file If the file does not exist or if it is not readable by PHP, it can return FALSE. In such cases, we should print a user-friendly message and return from parsing the rules file. Fix #12476 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: b3e7f10f2ed8949512b623cac4055de86fe368fc https://github.com/phpmyadmin/phpmyadmin/commit/b3e7f10f2ed8949512b623cac40… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-08-26 (Fri, 26 Aug 2016) Changed paths: M libraries/common.inc.php Log Message: ----------- Check if the indices are present and map to a string value Fix #12477 The indices may not be present in the json_decode result, or might not be strings Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: d7181d1b5a35bf91053d74babf1a3cef666d894e https://github.com/phpmyadmin/phpmyadmin/commit/d7181d1b5a35bf91053d74babf1… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-08-26 (Fri, 26 Aug 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entries for #12476 and #12477 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: ad5187383d35c1bace5f3e53afe1449848cbf93d https://github.com/phpmyadmin/phpmyadmin/commit/ad5187383d35c1bace5f3e53afe… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-27 (Sat, 27 Aug 2016) Changed paths: M ChangeLog M js/functions.js M js/sql.js Log Message: ----------- Automatically save SQL query in browser local storage ..when available rather than in cookie as we do not want to send huge cookies with SQL query there and back. Issue #12251 Issue phpmyadmin/docker#32 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: efe97b150066dc7f0882885c2c5e43860ff7df98 https://github.com/phpmyadmin/phpmyadmin/commit/efe97b150066dc7f0882885c2c5… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2016-08-27 (Sat, 27 Aug 2016) Changed paths: M ChangeLog M templates/columns_definitions/transformation_option.phtml Log Message: ----------- Unable to edit transformations, issue 12292 Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com> Commit: 38ce0c9d445c0187115267c0d86db62df4849f0a https://github.com/phpmyadmin/phpmyadmin/commit/38ce0c9d445c0187115267c0d86… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-28 (Sun, 28 Aug 2016) Changed paths: M ChangeLog M libraries/dbi/DBIMysqli.php Log Message: ----------- Remove unused paramenter when connecting to MySQLi Fixes #12502 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: ee1878d3caad4c938a252d993d7583e66ad09d39 https://github.com/phpmyadmin/phpmyadmin/commit/ee1878d3caad4c938a252d993d7… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-30 (Tue, 30 Aug 2016) Changed paths: M .gitignore Log Message: ----------- Extend .gitignore Fixes #12515 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: e16af0866d31dc175de44c89759494313bb12b85 https://github.com/phpmyadmin/phpmyadmin/commit/e16af0866d31dc175de44c89759… Author: Diego Bemquerer Castro <dbc_5(a)yahoo.com.br> Date: 2016-08-30 (Tue, 30 Aug 2016) Changed paths: M po/pt_BR.po Log Message: ----------- Translated using Weblate (Portuguese (Brazil)) Currently translated at 93.1% (2987 of 3206 strings) [CI skip] Commit: 7563c88c9b029c48633ecebb64be9b001df84cb3 https://github.com/phpmyadmin/phpmyadmin/commit/7563c88c9b029c48633ecebb64b… Author: Weblate <noreply(a)weblate.org> Date: 2016-08-30 (Tue, 30 Aug 2016) Changed paths: M .gitignore Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: d24dd24b750c879bfc35dadb2df988c97b3954c3 https://github.com/phpmyadmin/phpmyadmin/commit/d24dd24b750c879bfc35dadb2df… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-30 (Tue, 30 Aug 2016) Changed paths: M libraries/Util.php Log Message: ----------- Ensure unlim_num_rows is numberic Fixes #12516 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: c9000876d5a157943ac21318f8450641c994d050 https://github.com/phpmyadmin/phpmyadmin/commit/c9000876d5a157943ac21318f84… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-30 (Tue, 30 Aug 2016) Changed paths: M po/pt_BR.po Log Message: ----------- Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 Commit: a3d811571a9312d7125b1e79311a8399d0951a1d https://github.com/phpmyadmin/phpmyadmin/commit/a3d811571a9312d7125b1e79311… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-30 (Tue, 30 Aug 2016) Changed paths: M libraries/sanitizing.lib.php Log Message: ----------- Fix <iframe> tag Fixes #12513 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: f3babbb945ec54f55969e16191f3f2e9a13a2f74 https://github.com/phpmyadmin/phpmyadmin/commit/f3babbb945ec54f55969e16191f… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-30 (Tue, 30 Aug 2016) Changed paths: M libraries/Linter.php Log Message: ----------- Correctly calculate string length Fixes #12517 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: f3ca367efa5a44161ca6fa3a2a9fa3b9ed24cbb1 https://github.com/phpmyadmin/phpmyadmin/commit/f3ca367efa5a44161ca6fa3a2a9… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-30 (Tue, 30 Aug 2016) Changed paths: M ChangeLog M libraries/Util.php M libraries/common.inc.php M test/bootstrap-dist.php M test/libraries/common/PMA_formatNumberByteDown_test.php Log Message: ----------- Fix number formatting with different settings of precision in PHP - fixed Util::formatNumber to avoid rounding issues to mess up display - force precision = 14 to ensure we get sane behavior With precision set to higher value many things do not behave as expected producing strange numbers in various places. For example with precision=19 you get: php > echo round(1.2, 2); 1.199999999999999956 Fixes #12303 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 283f5d10ce65e0656f98335bd1f2767fba3be6db https://github.com/phpmyadmin/phpmyadmin/commit/283f5d10ce65e0656f98335bd1f… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M import.php Log Message: ----------- Fix possible DOS on too big skip value - loop only as long as long we have data to skip - convert skip parameter to integer Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: dcc9f8585c49ce2258d40aea511b524488bbce05 https://github.com/phpmyadmin/phpmyadmin/commit/dcc9f8585c49ce2258d40aea511… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M .gitignore M ChangeLog M js/functions.js M js/sql.js M libraries/Advisor.php M libraries/Linter.php M libraries/Util.php M libraries/common.inc.php M libraries/dbi/DBIMysqli.php M libraries/navigation/nodes/Node.php M libraries/sanitizing.lib.php M po/pt_BR.po M templates/columns_definitions/transformation_option.phtml M test/bootstrap-dist.php M test/libraries/common/PMA_formatNumberByteDown_test.php Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: 7ddcbc0de6283f42fc0592901d88ee53b457bee9 https://github.com/phpmyadmin/phpmyadmin/commit/7ddcbc0de6283f42fc0592901d8… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M libraries/tbl_partition_definition.inc.php Log Message: ----------- Validate (sub)partion count from request before use Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: cb3f2632a968826a0207daa0718573fb01f24c14 https://github.com/phpmyadmin/phpmyadmin/commit/cb3f2632a968826a0207daa0718… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M libraries/session.inc.php Log Message: ----------- Properly escape session startup errors Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 2251ca21c0c538e4f24bda47be02179845fa0b8a https://github.com/phpmyadmin/phpmyadmin/commit/2251ca21c0c538e4f24bda47be0… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M libraries/session.inc.php Log Message: ----------- Fix regexp for file path cleanup Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: eb3e3b73c34d7b6916a541f8eae08167b49ae455 https://github.com/phpmyadmin/phpmyadmin/commit/eb3e3b73c34d7b6916a541f8eae… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M libraries/DatabaseInterface.php M libraries/Error.php M libraries/ErrorHandler.php Log Message: ----------- Simplified handling of connection errors There is no need to retrigger errors, just let the handler know to handle them without backtrace. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 733a5d582193d32c5435bd6324316c9da1b01678 https://github.com/phpmyadmin/phpmyadmin/commit/733a5d582193d32c5435bd63243… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M libraries/ErrorHandler.php M libraries/Message.php M libraries/plugins/AuthenticationPlugin.php Log Message: ----------- Avoid rendering BB code when showing PHP/MySQL errors Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: d01c078b7d48c8f7d4f0784cb4b04ae933a6d23b https://github.com/phpmyadmin/phpmyadmin/commit/d01c078b7d48c8f7d4f0784cb4b… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M libraries/DatabaseInterface.php M libraries/Error.php M libraries/ErrorHandler.php M libraries/session.inc.php Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: 829d51c9dd34f53e90a8f4ec0afc9e985844556c https://github.com/phpmyadmin/phpmyadmin/commit/829d51c9dd34f53e90a8f4ec0af… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M libraries/Error.php Log Message: ----------- Treat hide_location error as user ones Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: e01f40480445d56bc7ae4572f50d9dbba5f28546 https://github.com/phpmyadmin/phpmyadmin/commit/e01f40480445d56bc7ae4572f50… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M libraries/DatabaseInterface.php Log Message: ----------- Remove unused variable Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 48b44fcf915c6219439b013dc1f0bdcb79572cc0 https://github.com/phpmyadmin/phpmyadmin/commit/48b44fcf915c6219439b013dc1f… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M po/ru.po Log Message: ----------- Translated using Weblate (Russian) Currently translated at 98.1% (3153 of 3213 strings) [CI skip] Commit: beda3204d520438786db638703a6671df61de972 https://github.com/phpmyadmin/phpmyadmin/commit/beda3204d520438786db638703a… Author: Jozef Pistej <pistej2(a)gmail.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M po/sk.po Log Message: ----------- Translated using Weblate (Slovak) Currently translated at 83.4% (2675 of 3206 strings) [CI skip] Commit: 2e58cf01058be40d09d81cf84ab311a58f747916 https://github.com/phpmyadmin/phpmyadmin/commit/2e58cf01058be40d09d81cf84ab… Author: Weblate <noreply(a)weblate.org> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M libraries/DatabaseInterface.php M libraries/Error.php M libraries/ErrorHandler.php M libraries/session.inc.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: 4c34f140779711e1511c721a262028a929a81f91 https://github.com/phpmyadmin/phpmyadmin/commit/4c34f140779711e1511c721a262… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M libraries/DatabaseInterface.php M libraries/Error.php Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: dac36c3cd889f87165ae776e3929fe9f946f67ad https://github.com/phpmyadmin/phpmyadmin/commit/dac36c3cd889f87165ae776e392… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M index.php M libraries/core.lib.php M test/libraries/core/PMA_isAllowedDomain_test.php Log Message: ----------- Stricter URL validation - do not use empty() as empty('0') is true - do not lowercase the strings, use them as they are - lowercase all domains in our codebase - do not allow to specify port Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 9f0c4c37f3067abcaa7a40b9ef907e343ee62de4 https://github.com/phpmyadmin/phpmyadmin/commit/9f0c4c37f3067abcaa7a40b9ef9… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M test/classes/MessageTest.php Log Message: ----------- Fix test failures with recent changes to Message class Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 2f2e3565ba1e85072d2c1a1f0a06b84bebce8f9f https://github.com/phpmyadmin/phpmyadmin/commit/2f2e3565ba1e85072d2c1a1f0a0… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M libraries/ip_allow_deny.lib.php Log Message: ----------- Use hash_equals when comparing IPv6 allow rules Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: c4613745f398f0fdd8bb238ce7f02eea58d7125d https://github.com/phpmyadmin/phpmyadmin/commit/c4613745f398f0fdd8bb238ce7f… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M po/ru.po M po/sk.po Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: e803caed716a7a224c262eb5625120ed0068bcc1 https://github.com/phpmyadmin/phpmyadmin/commit/e803caed716a7a224c262eb5625… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M ChangeLog M libraries/Util.php Log Message: ----------- Use single quotes in PHP code Fixes #12405 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 3d99185919cdca3ea31caafc7421c507086bdb9c https://github.com/phpmyadmin/phpmyadmin/commit/3d99185919cdca3ea31caafc742… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M ChangeLog M libraries/Util.php Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: 2a2d6d8bd6c535a6906ffc2b2abcb75eb9676a65 https://github.com/phpmyadmin/phpmyadmin/commit/2a2d6d8bd6c535a6906ffc2b2ab… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-04 (Sun, 04 Sep 2016) Changed paths: M ChangeLog M js/tbl_structure.js Log Message: ----------- Fix #12534: Remove option from after_field select after a column is dropped Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 0a7d3afd27bba56c69ead885319aa8d8519c0b6b https://github.com/phpmyadmin/phpmyadmin/commit/0a7d3afd27bba56c69ead885319… Author: Balázs Úr <urbalazs(a)gmail.com> Date: 2016-09-04 (Sun, 04 Sep 2016) Changed paths: M po/hu.po Log Message: ----------- Translated using Weblate (Hungarian) Currently translated at 100.0% (3206 of 3206 strings) [CI skip] Commit: 934c740c2ce454edd31b9540d76117f436ed1d15 https://github.com/phpmyadmin/phpmyadmin/commit/934c740c2ce454edd31b9540d76… Author: Balázs Úr <urbalazs(a)gmail.com> Date: 2016-09-05 (Mon, 05 Sep 2016) Changed paths: M po/hu.po Log Message: ----------- Translated using Weblate (Hungarian) Currently translated at 100.0% (3206 of 3206 strings) [CI skip] Commit: 6bcc593c84b3430c2b90b7d81e48c99b78a751a1 https://github.com/phpmyadmin/phpmyadmin/commit/6bcc593c84b3430c2b90b7d81e4… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-05 (Mon, 05 Sep 2016) Changed paths: M libraries/dbi/DBIDummy.php Log Message: ----------- Fix 'Unsupported query' message from Travis logs Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 715403c0e7568390b2493651617319acb00a497b https://github.com/phpmyadmin/phpmyadmin/commit/715403c0e7568390b2493651617… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-06 (Tue, 06 Sep 2016) Changed paths: M import.php M js/functions.js M js/messages.php M libraries/import.lib.php M libraries/sql.lib.php M test/libraries/PMA_sql_test.php Log Message: ----------- Fix #12531 : Properly flag queries as DROP DATABASE Parser recognizes various DROP statements correctly, but the flags set by SQL Parser are incorrectly used. In js/functions.js, removed the Regex-based matching, rather handle it in PHP as we have correct flags available from SQL Parser Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 28c981dd31a62b17f10787c3ebaa5159aed67875 https://github.com/phpmyadmin/phpmyadmin/commit/28c981dd31a62b17f10787c3eba… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-06 (Tue, 06 Sep 2016) Changed paths: M import.php M js/functions.js M js/messages.php M libraries/import.lib.php M libraries/sql.lib.php M test/libraries/PMA_sql_test.php Log Message: ----------- Merge pull request #12532 from devenbansod/fix_12531 Fix #12531 : Properly flag queries as DROP DATABASE Commit: 954ebe9cbc210527298e873155f71682e78167a0 https://github.com/phpmyadmin/phpmyadmin/commit/954ebe9cbc210527298e873155f… Author: Sevdimali İsa <sevdimaliisayev(a)mail.ru> Date: 2016-09-06 (Tue, 06 Sep 2016) Changed paths: M po/az.po Log Message: ----------- Translated using Weblate (Azerbaijani) Currently translated at 52.4% (1680 of 3206 strings) [CI skip] Commit: 5e15a2b0545eed9dd5ae58086297ca07c17067b8 https://github.com/phpmyadmin/phpmyadmin/commit/5e15a2b0545eed9dd5ae5808629… Author: Weblate <noreply(a)weblate.org> Date: 2016-09-06 (Tue, 06 Sep 2016) Changed paths: M import.php M js/functions.js M js/messages.php M libraries/import.lib.php M libraries/sql.lib.php M test/libraries/PMA_sql_test.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: 9df5aebc22542ce7cc087e0d3e1942f45f45455a https://github.com/phpmyadmin/phpmyadmin/commit/9df5aebc22542ce7cc087e0d3e1… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-06 (Tue, 06 Sep 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #12531 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 6c9c8a83d08a380c9be9f24e8a992b40c0c0f1d5 https://github.com/phpmyadmin/phpmyadmin/commit/6c9c8a83d08a380c9be9f24e8a9… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-06 (Tue, 06 Sep 2016) Changed paths: M po/az.po Log Message: ----------- Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 Commit: 40d9d82840490d06fcdbf5c594cd43ea7c32f5fc https://github.com/phpmyadmin/phpmyadmin/commit/40d9d82840490d06fcdbf5c594c… Author: Sudheesh Singanamalla <susingan(a)microsoft.com> Date: 2016-09-06 (Tue, 06 Sep 2016) Changed paths: M js/config.js Log Message: ----------- Fixes #12470 Stores tab_id hash into a variable instead of location.hash Signed-off-by: Sudheesh Singanamalla <sudheesh1995(a)outlook.com> Commit: 8ebc43ebc1b45ba3f2e4921ffab6d81b6f8b0c43 https://github.com/phpmyadmin/phpmyadmin/commit/8ebc43ebc1b45ba3f2e4921ffab… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-06 (Tue, 06 Sep 2016) Changed paths: M js/config.js Log Message: ----------- Merge pull request #12541 from sudheesh001/QA_4_6 Fixes #12470 Stores tab_id hash into a variable instead of location.hash Commit: f3cd949738c49cc58315452bb218d443fd96c535 https://github.com/phpmyadmin/phpmyadmin/commit/f3cd949738c49cc58315452bb21… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-06 (Tue, 06 Sep 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog for issue #12470 Fix possible race condition in setting URL hash Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 42d54a938add52cd2f6961421fc679162dca5353 https://github.com/phpmyadmin/phpmyadmin/commit/42d54a938add52cd2f6961421fc… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-07 (Wed, 07 Sep 2016) Changed paths: M libraries/DatabaseInterface.php M libraries/VersionInformation.php Log Message: ----------- Remove MySQL version caching In my testing the session/cache access is slower than fetching single value from MySQL and calculating the values. Also the caching would need some logic for invalidation as the server can be upgraded or configuration changed. Fixes #11924 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 0bea337231db23da3050d01fbeaf7efa466688c1 https://github.com/phpmyadmin/phpmyadmin/commit/0bea337231db23da3050d01fbea… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-07 (Wed, 07 Sep 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog for #11924 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 4e534c977f7bf51aa2c5c6879d2112c79d1bedda https://github.com/phpmyadmin/phpmyadmin/commit/4e534c977f7bf51aa2c5c6879d2… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-09 (Fri, 09 Sep 2016) Changed paths: M libraries/Table.php M libraries/export.lib.php Log Message: ----------- Fix Export and Copy of Tables with Generated/Virtual columns We include only the non-generated columns insert using INSERT INTO .. SELECT .. FROM .. while copying data. In Export too, we export the data of only the non-generated columns Fix #12221 Fix #12518 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 429c679f776e780db22481e94d31e07d81977dbd https://github.com/phpmyadmin/phpmyadmin/commit/429c679f776e780db22481e94d3… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-09 (Fri, 09 Sep 2016) Changed paths: M libraries/Table.php M test/classes/TableTest.php Log Message: ----------- Fix tests, added testcase for Generated columns in moveCopy Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 35bf74a174004f77f342e3ad3a25dc140db916e4 https://github.com/phpmyadmin/phpmyadmin/commit/35bf74a174004f77f342e3ad3a2… Author: Martin Lacina <martin(a)whistler.sk> Date: 2016-09-09 (Fri, 09 Sep 2016) Changed paths: M po/sk.po Log Message: ----------- Translated using Weblate (Slovak) Currently translated at 83.5% (2680 of 3206 strings) [CI skip] Commit: c73c720cb34eb4c050717c5def342b6655607ceb https://github.com/phpmyadmin/phpmyadmin/commit/c73c720cb34eb4c050717c5def3… Author: jin123456bat <326550324(a)qq.com> Date: 2016-09-11 (Sun, 11 Sep 2016) Changed paths: M po/zh_CN.po Log Message: ----------- Translated using Weblate (Chinese (China)) Currently translated at 87.9% (2819 of 3206 strings) [CI skip] Commit: ebb2ab12ce76ae91819ecdea9b111fea17494655 https://github.com/phpmyadmin/phpmyadmin/commit/ebb2ab12ce76ae91819ecdea9b1… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-12 (Mon, 12 Sep 2016) Changed paths: M libraries/server_privileges.lib.php M test/libraries/PMA_server_privileges_test.php Log Message: ----------- Merge branch 'fix-HtmlHeaderForUserProperties' of https://github.com/rpv-tomsk/phpmyadmin into rpv-tomsk-fix-HtmlHeaderForUserProperties Commit: 7fdffa313fb692675118720f2289b8712438b435 https://github.com/phpmyadmin/phpmyadmin/commit/7fdffa313fb692675118720f228… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-13 (Tue, 13 Sep 2016) Changed paths: M libraries/server_user_groups.lib.php Log Message: ----------- Fix label for Add User Group form Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: bc589dfbbf5202266a961927d439033f7f6e208a https://github.com/phpmyadmin/phpmyadmin/commit/bc589dfbbf5202266a961927d43… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-13 (Tue, 13 Sep 2016) Changed paths: M libraries/server_user_groups.lib.php Log Message: ----------- Fix Class name Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 5145c8c3238eaca1d0a6b80adc9f7c8e07d6bfef https://github.com/phpmyadmin/phpmyadmin/commit/5145c8c3238eaca1d0a6b80adc9… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-13 (Tue, 13 Sep 2016) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Fix #12320 : Copying a user does not copy usergroup Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 16474f3ddee0b194c3afcf8bffaba8df887a40f6 https://github.com/phpmyadmin/phpmyadmin/commit/16474f3ddee0b194c3afcf8bffa… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-13 (Tue, 13 Sep 2016) Changed paths: M ChangeLog M libraries/sql-parser/src/Components/AlterOperation.php M libraries/sql-parser/src/Components/CreateDefinition.php M libraries/sql-parser/src/Components/IntoKeyword.php M libraries/sql-parser/src/Components/OptionsArray.php M libraries/sql-parser/src/Components/PartitionDefinition.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/Statements/CreateStatement.php M libraries/sql-parser/src/Statements/InsertStatement.php M libraries/sql-parser/src/Statements/SetStatement.php Log Message: ----------- Update SQL parser to 3.4.5 - issue #11628 Proper parsing of INSERT ... ON DUPLICATE KEY queries - issue #12545 Proper parsing of CREATE TABLE ... PARTITION queries Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 37ff86315b448cfa70814a6d4fa7f070491e0acc https://github.com/phpmyadmin/phpmyadmin/commit/37ff86315b448cfa70814a6d4fa… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-13 (Tue, 13 Sep 2016) Changed paths: M libraries/Table.php Log Message: ----------- Fix usage of backquote parameter in getNonGenerated func Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: b593bfeb7c00ec9c49adcefb925aa1966e6b7c08 https://github.com/phpmyadmin/phpmyadmin/commit/b593bfeb7c00ec9c49adcefb925… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-13 (Tue, 13 Sep 2016) Changed paths: M libraries/sql-parser/src/Statement.php M libraries/sql-parser/src/Statements/ReplaceStatement.php M libraries/sql-parser/src/Utils/CLI.php M libraries/sql-parser/src/Utils/Formatter.php Log Message: ----------- Update SQL parser to 3.4.6 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 093620495bb5d2ce4a5571b85905ec91b78dd793 https://github.com/phpmyadmin/phpmyadmin/commit/093620495bb5d2ce4a5571b8590… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-13 (Tue, 13 Sep 2016) Changed paths: M test/libraries/PMA_server_privileges_test.php Log Message: ----------- Added tests for Usergroup as hidden field in Copy User form Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: d6b80ad910302c23399335dd83a2e1bd947196fc https://github.com/phpmyadmin/phpmyadmin/commit/d6b80ad910302c23399335dd83a… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-14 (Wed, 14 Sep 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for #12473 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 10e4f0a3ddcf7d8d540322b8a0fbc07a01171bbb https://github.com/phpmyadmin/phpmyadmin/commit/10e4f0a3ddcf7d8d540322b8a0f… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-14 (Wed, 14 Sep 2016) Changed paths: M js/functions.js Log Message: ----------- Check if the regex matching returns null before using it further Fix #12473 : Code can throw unhandled exception Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: e285135deb40a56177094b13416ab8bf91c54312 https://github.com/phpmyadmin/phpmyadmin/commit/e285135deb40a56177094b13416… Author: Dadan Setia <da2n_s(a)yahoo.co.id> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M po/id.po Log Message: ----------- Translated using Weblate (Indonesian) Currently translated at 68.8% (2208 of 3206 strings) [CI skip] Commit: 168a419f48201eeaf10764bb45a409346c4f5a8e https://github.com/phpmyadmin/phpmyadmin/commit/168a419f48201eeaf10764bb45a… Author: yanagimoto <yanagimoto(a)klink.co.jp> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M po/ja.po Log Message: ----------- Translated using Weblate (Japanese) Currently translated at 70.9% (2276 of 3206 strings) [CI skip] Commit: 54e3434c0fc79737927e6f5f4e227a19daef5197 https://github.com/phpmyadmin/phpmyadmin/commit/54e3434c0fc79737927e6f5f4e2… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M ChangeLog M js/functions.js Log Message: ----------- Do not try to keep alive session even after expiry There is no sense in sending keepalive requests even after potential session expiry. So limit sending of these only as long we're not idle over cookie login validity. Fixes #12550 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: ee7d7d0b45b6b20cd51b41762df7a9f8b30cb79b https://github.com/phpmyadmin/phpmyadmin/commit/ee7d7d0b45b6b20cd51b41762df… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M ChangeLog M libraries/sanitizing.lib.php Log Message: ----------- Fixed rendering BBCode links in setup The URL validation needs to be adjusted for setup as the links need to go one level up. Fixes #12512 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 2559dc3a62a416eba8284542303173127feeb767 https://github.com/phpmyadmin/phpmyadmin/commit/2559dc3a62a416eba8284542303… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M ChangeLog M import.php M js/config.js M js/functions.js M js/messages.php M js/tbl_structure.js M libraries/DatabaseInterface.php M libraries/VersionInformation.php M libraries/dbi/DBIDummy.php M libraries/import.lib.php M libraries/sanitizing.lib.php M libraries/server_user_groups.lib.php M libraries/sql-parser/src/Components/AlterOperation.php M libraries/sql-parser/src/Components/CreateDefinition.php M libraries/sql-parser/src/Components/IntoKeyword.php M libraries/sql-parser/src/Components/OptionsArray.php M libraries/sql-parser/src/Components/PartitionDefinition.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/Statement.php M libraries/sql-parser/src/Statements/CreateStatement.php M libraries/sql-parser/src/Statements/InsertStatement.php M libraries/sql-parser/src/Statements/ReplaceStatement.php M libraries/sql-parser/src/Statements/SetStatement.php M libraries/sql-parser/src/Utils/CLI.php M libraries/sql-parser/src/Utils/Formatter.php M libraries/sql.lib.php M po/az.po M po/hu.po M po/id.po M po/ja.po M po/sk.po M po/zh_CN.po M test/libraries/PMA_sql_test.php Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: f8ea67f2bc59d46290b85b2e578c649655f000e7 https://github.com/phpmyadmin/phpmyadmin/commit/f8ea67f2bc59d46290b85b2e578… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M ChangeLog M js/messages.php M js/rte.js M libraries/DatabaseInterface.php M libraries/rte/rte_export.lib.php M libraries/rte/rte_list.lib.php M libraries/rte/rte_routines.lib.php M libraries/rte/rte_words.lib.php Log Message: ----------- Fix #12530: Show enabled links for Edit and Execute after proper priv checks Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 815bf44584f104d1616ca1d05a2aaba34580a418 https://github.com/phpmyadmin/phpmyadmin/commit/815bf44584f104d1616ca1d05a2… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M libraries/rte/rte_export.lib.php M libraries/rte/rte_routines.lib.php M libraries/rte/rte_words.lib.php Log Message: ----------- Fix error messages to suit better localization Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 023ced3552c1e9d114539a7569623448c5878d96 https://github.com/phpmyadmin/phpmyadmin/commit/023ced3552c1e9d114539a75696… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M js/common.js M libraries/insert_edit.lib.php Log Message: ----------- Don't use PMA_DROP_IMPORT on Table insert if it has Blob field If we force PMA_DROP_IMPORT on all pages, users can't use Chrome's drag-drop-files feature on Table Insert page with blob field Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 734b69b41873286931e96089de1d01b2f396cb98 https://github.com/phpmyadmin/phpmyadmin/commit/734b69b41873286931e96089de1… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for #12487 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Conflicts: ChangeLog Commit: a52597f048fae7a0c89cd55fae6ad5bb0fe34d0e https://github.com/phpmyadmin/phpmyadmin/commit/a52597f048fae7a0c89cd55fae6… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M js/common.js M libraries/insert_edit.lib.php Log Message: ----------- Include explaning statements near related code Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 14616cbcdf8bc3acd1912733d507491789ceb521 https://github.com/phpmyadmin/phpmyadmin/commit/14616cbcdf8bc3acd1912733d50… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M test/libraries/PMA_insert_edit_test.php Log Message: ----------- Fixed tests Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: b054aa70ef443929484f087f459d4d856fcabaa5 https://github.com/phpmyadmin/phpmyadmin/commit/b054aa70ef443929484f087f459… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M js/export.js Log Message: ----------- Uncheck the Add CREATE PROCEDURE / FUNCTION etc. checkbox for a selective export User can always check it if he/she wants to export the procs,funcs etc. too Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 4f1432eb2fe6a25efbf740c9f712d4454e109969 https://github.com/phpmyadmin/phpmyadmin/commit/4f1432eb2fe6a25efbf740c9f71… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for #12300 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Conflicts: ChangeLog Commit: e8d07e3783f0a1b7140ba3ee6a3b2e472e210b65 https://github.com/phpmyadmin/phpmyadmin/commit/e8d07e3783f0a1b7140ba3ee6a3… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php Log Message: ----------- Allow vertical scrolling to read longer text values in grid editing Fix #12554 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: b6952bbe55a9fa727482a47533cc066c5e36f189 https://github.com/phpmyadmin/phpmyadmin/commit/b6952bbe55a9fa727482a47533c… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for #12554 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Conflicts: ChangeLog Commit: 3424fae6422a0ac344c6a27a085139ee3ae5d6f5 https://github.com/phpmyadmin/phpmyadmin/commit/3424fae6422a0ac344c6a27a085… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M libraries/Table.php M libraries/export.lib.php M test/classes/TableTest.php Log Message: ----------- Merge pull request #12548 from devenbansod/fix_12518 Fix Export and Copy of Tables with Generated/Virtual columns Commit: ea90f285517e79f6db80b5038e563f483269839b https://github.com/phpmyadmin/phpmyadmin/commit/ea90f285517e79f6db80b5038e5… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog for #12548 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: b5c10991e9e04ccd5b63d95d47a2e1e727dd821a https://github.com/phpmyadmin/phpmyadmin/commit/b5c10991e9e04ccd5b63d95d47a… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M libraries/server_privileges.lib.php M test/libraries/PMA_server_privileges_test.php Log Message: ----------- Merge pull request #12553 from devenbansod/fix_12320 Fix #12320 : Copying a user does not copy usergroup Commit: 350be95a53d496ea774d35c8a9d02bd377f3b0da https://github.com/phpmyadmin/phpmyadmin/commit/350be95a53d496ea774d35c8a9d… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #12553 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: b18426f887ef1958c696a0e6c8404dfd1b51673c https://github.com/phpmyadmin/phpmyadmin/commit/b18426f887ef1958c696a0e6c84… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M js/functions.js Log Message: ----------- Correctly reference Math.min (issue #12550) Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: bd9bbc4b4dc2121a3c5f3a2b7bf7bfc60559f15c https://github.com/phpmyadmin/phpmyadmin/commit/bd9bbc4b4dc2121a3c5f3a2b7bf… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M doc/setup.rst Log Message: ----------- Document test removal suggestion for production usage Issue #12547 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: a588880750b50764217f3379af7beac9f9201769 https://github.com/phpmyadmin/phpmyadmin/commit/a588880750b50764217f3379af7… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M js/tbl_change.js Log Message: ----------- Special handling for radio fields after cloning on tbl insert page Fix #12272 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 14340f9c31977bbd19763f573a1c20366f22d089 https://github.com/phpmyadmin/phpmyadmin/commit/14340f9c31977bbd19763f573a1… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for #12272 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 71cce8e2f565cb17c814617b6297c3d33a1139d3 https://github.com/phpmyadmin/phpmyadmin/commit/71cce8e2f565cb17c814617b629… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M ChangeLog M doc/setup.rst M js/functions.js M libraries/Table.php M libraries/export.lib.php M libraries/server_privileges.lib.php M test/classes/TableTest.php M test/libraries/PMA_server_privileges_test.php Log Message: ----------- Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 Conflicts: ChangeLog Commit: 2fc2c25aaf823ce78040667e1c9bb6ce68ce62e5 https://github.com/phpmyadmin/phpmyadmin/commit/2fc2c25aaf823ce78040667e1c9… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M doc/transformations.rst Log Message: ----------- Fix documentation to match state after PMASA-2016-54 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 9d27af821cf77be6ceab358a9a52f48205bc7613 https://github.com/phpmyadmin/phpmyadmin/commit/9d27af821cf77be6ceab358a9a5… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M ChangeLog M js/tbl_change.js Log Message: ----------- Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 Commit: ea5870bb9b90b48865e4d28609ccb1b4ecb410d8 https://github.com/phpmyadmin/phpmyadmin/commit/ea5870bb9b90b48865e4d28609c… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-18 (Sun, 18 Sep 2016) Changed paths: M test/libraries/PMA_export_test.php Log Message: ----------- Fix class name in export test comments Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: d800fc16791ad389629935634a7fe587864e0f46 https://github.com/phpmyadmin/phpmyadmin/commit/d800fc16791ad389629935634a7… Author: dingo thirteen <dingo13(a)gmail.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M po/nl.po Log Message: ----------- Translated using Weblate (Dutch) Currently translated at 100.0% (3206 of 3206 strings) [CI skip] Commit: 3992bd65be6db0afc768052c54b70156eec1d711 https://github.com/phpmyadmin/phpmyadmin/commit/3992bd65be6db0afc768052c54b… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M po/de.po Log Message: ----------- Translated using Weblate (German) Currently translated at 99.8% (3201 of 3206 strings) [CI skip] Commit: e2ac325a7a0c9327647bc8ab28a4970d5a052144 https://github.com/phpmyadmin/phpmyadmin/commit/e2ac325a7a0c9327647bc8ab28a… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M ChangeLog M js/common.js M libraries/insert_edit.lib.php M test/libraries/PMA_insert_edit_test.php Log Message: ----------- Merge remote-tracking branch 'origin/pull/12557' into QA_4_6 Commit: 337e5755c039962a32883d96329e8157ba6e0d59 https://github.com/phpmyadmin/phpmyadmin/commit/337e5755c039962a32883d96329… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M ChangeLog M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php Log Message: ----------- Merge remote-tracking branch 'origin/pull/12555' into QA_4_6 Commit: bccd690673ffaf36b19a28fc8449531a23ef2ad2 https://github.com/phpmyadmin/phpmyadmin/commit/bccd690673ffaf36b19a28fc844… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M ChangeLog M js/messages.php M js/rte.js M libraries/DatabaseInterface.php M libraries/rte/rte_export.lib.php M libraries/rte/rte_list.lib.php M libraries/rte/rte_routines.lib.php M libraries/rte/rte_words.lib.php Log Message: ----------- Merge remote-tracking branch 'origin/pull/12544' into QA_4_6 Commit: 5c0af8facf0ba94ca5484dd8601104e36f3c8024 https://github.com/phpmyadmin/phpmyadmin/commit/5c0af8facf0ba94ca5484dd8601… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M ChangeLog M js/export.js Log Message: ----------- Merge remote-tracking branch 'origin/pull/12556' into QA_4_6 Commit: f7f03127f7486281ccd4335f8137bec19ebb7254 https://github.com/phpmyadmin/phpmyadmin/commit/f7f03127f7486281ccd4335f813… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M libraries/tbl_info.inc.php M tbl_operations.php Log Message: ----------- Store create options in serapate array instead of polluting global namespace This is just a minor cleanup to avoid possible problems when MySQL create table options would collide with our variable names. See also issue #12567 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 161e408ab760e9be8a58bfdf7ce26881a0570798 https://github.com/phpmyadmin/phpmyadmin/commit/161e408ab760e9be8a58bfdf7ce… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M ChangeLog M doc/setup.rst M doc/transformations.rst M js/common.js M js/export.js M js/functions.js M js/messages.php M js/rte.js M js/tbl_change.js M libraries/DatabaseInterface.php M libraries/Table.php M libraries/export.lib.php M libraries/insert_edit.lib.php M libraries/rte/rte_export.lib.php M libraries/rte/rte_list.lib.php M libraries/rte/rte_routines.lib.php M libraries/rte/rte_words.lib.php M libraries/server_privileges.lib.php M libraries/tbl_info.inc.php M po/de.po M po/nl.po M tbl_operations.php M test/classes/TableTest.php M test/libraries/PMA_export_test.php M test/libraries/PMA_insert_edit_test.php M test/libraries/PMA_server_privileges_test.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: fbad6b9b4d175aa82cd35972aa2dcd9ef3ec4346 https://github.com/phpmyadmin/phpmyadmin/commit/fbad6b9b4d175aa82cd35972aa2… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M libraries/plugins/AuthenticationPlugin.php M libraries/plugins/auth/AuthenticationConfig.php M libraries/plugins/auth/AuthenticationCookie.php M libraries/plugins/auth/AuthenticationHttp.php Log Message: ----------- Verify value of access_time to avoid unwanted session extension We need to ansure the access_time parameter is in valid range to avoid possibility of remotely extending session validity. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: d519c9039e786b731925181eb74e606173fcec78 https://github.com/phpmyadmin/phpmyadmin/commit/d519c9039e786b731925181eb74… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-20 (Tue, 20 Sep 2016) Changed paths: M ChangeLog M libraries/sql-parser/src/Components/OptionsArray.php M libraries/sql-parser/src/Statements/CreateStatement.php M libraries/sql-parser/src/Statements/InsertStatement.php M libraries/sql-parser/src/Utils/Formatter.php Log Message: ----------- Update SQL parser to 3.4.7 - issue #12298 Fixed export of view definitions Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 38cb18b0deefa00c5e2257c02c61ad882da0ba04 https://github.com/phpmyadmin/phpmyadmin/commit/38cb18b0deefa00c5e2257c02c6… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-20 (Tue, 20 Sep 2016) Changed paths: M libraries/rte/rte_routines.lib.php Log Message: ----------- Fix #12242 : Edit routine detail dialog does not fill "Return length" field in mysql functions Use correct field to get the details about the length of returning value's datatype Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: b463665b1384db2d6222765ae9f3e520dc33d9d7 https://github.com/phpmyadmin/phpmyadmin/commit/b463665b1384db2d6222765ae9f… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-20 (Tue, 20 Sep 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for #12242 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 5a456eb1eaa6d36d7317677c5bc0b228864d3102 https://github.com/phpmyadmin/phpmyadmin/commit/5a456eb1eaa6d36d7317677c5bc… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-20 (Tue, 20 Sep 2016) Changed paths: M js/tbl_structure.js Log Message: ----------- Fix extra spaces in field name in adding key and dropping field Fix #12575 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 54063a75c3518de9c708e2c20e88494672ec4db8 https://github.com/phpmyadmin/phpmyadmin/commit/54063a75c3518de9c708e2c20e8… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-20 (Tue, 20 Sep 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for #12575 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 1acf38c05e1812b02391e409d79d08d8c177b718 https://github.com/phpmyadmin/phpmyadmin/commit/1acf38c05e1812b02391e409d79… Author: Xavier Navarro <xvnavarro(a)gmail.com> Date: 2016-09-21 (Wed, 21 Sep 2016) Changed paths: M po/ca.po Log Message: ----------- Translated using Weblate (Catalan) Currently translated at 100.0% (3206 of 3206 strings) [CI skip] Commit: 93965187759f4b2016962e80fb995278524c9be0 https://github.com/phpmyadmin/phpmyadmin/commit/93965187759f4b2016962e80fb9… Author: Niemand Jedermann <predatorix(a)web.de> Date: 2016-09-21 (Wed, 21 Sep 2016) Changed paths: M po/de.po Log Message: ----------- Translated using Weblate (German) Currently translated at 100.0% (3206 of 3206 strings) [CI skip] Commit: 1e5dfe6a0380f40f9a6a44b1abccf5b9ea2ee54c https://github.com/phpmyadmin/phpmyadmin/commit/1e5dfe6a0380f40f9a6a44b1abc… Author: yanagimoto <yanagimoto(a)klink.co.jp> Date: 2016-09-21 (Wed, 21 Sep 2016) Changed paths: M po/ja.po Log Message: ----------- Translated using Weblate (Japanese) Currently translated at 71.2% (2284 of 3206 strings) [CI skip] Commit: f1b54f3b5f73062fee06e68f873f906f605d5663 https://github.com/phpmyadmin/phpmyadmin/commit/f1b54f3b5f73062fee06e68f873… Author: 조영민 <bayleys(a)naver.com> Date: 2016-09-21 (Wed, 21 Sep 2016) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 78.0% (2501 of 3206 strings) [CI skip] Commit: adcaf7ca4b74ec89c7cb86274c70fa4327f79d1c https://github.com/phpmyadmin/phpmyadmin/commit/adcaf7ca4b74ec89c7cb86274c7… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-21 (Wed, 21 Sep 2016) Changed paths: M libraries/controllers/table/TableSearchController.php Log Message: ----------- Use intval to prevent XSS instead, and use numeric to check valid datatype Fix #12382 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: abc117244025e2792eb5ef1dbf8e6bd032e5d800 https://github.com/phpmyadmin/phpmyadmin/commit/abc117244025e2792eb5ef1dbf8… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-21 (Wed, 21 Sep 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog for #12382 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 43c5a3abdc6aeee6022249e3291ff4e49ee492b9 https://github.com/phpmyadmin/phpmyadmin/commit/43c5a3abdc6aeee6022249e3291… Author: Weblate <noreply(a)weblate.org> Date: 2016-09-21 (Wed, 21 Sep 2016) Changed paths: M ChangeLog M libraries/controllers/table/TableSearchController.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: 2d69d40fa2a42332f00c6bc439f1053f6aebdf37 https://github.com/phpmyadmin/phpmyadmin/commit/2d69d40fa2a42332f00c6bc439f… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-22 (Thu, 22 Sep 2016) Changed paths: M libraries/controllers/table/TableSearchController.php Log Message: ----------- Fix error in adcaf7c Fix #12382 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: f4877a782639202770e71771d927129ff8fa2085 https://github.com/phpmyadmin/phpmyadmin/commit/f4877a782639202770e71771d92… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-22 (Thu, 22 Sep 2016) Changed paths: M libraries/sql.lib.php Log Message: ----------- Assign LIMIT clause only to syntactically correct queries Assigning LIMIT clause to an syntactically-wrong query is not needed. Also we would want to show the true query and the true error message to the query executor Fix #12321 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: d219c4f474f5d1c8c97f7168aa695aef79cc0ca7 https://github.com/phpmyadmin/phpmyadmin/commit/d219c4f474f5d1c8c97f7168aa6… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-22 (Thu, 22 Sep 2016) Changed paths: M libraries/controllers/table/TableSearchController.php Log Message: ----------- Merge pull request #12578 from devenbansod/fix_error_in_adcaf7c Fix error in adcaf7c Commit: b83ba03bd451a43e1b39bb18cc018b1448380f2c https://github.com/phpmyadmin/phpmyadmin/commit/b83ba03bd451a43e1b39bb18cc0… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-22 (Thu, 22 Sep 2016) Changed paths: M libraries/sql.lib.php Log Message: ----------- Merge pull request #12580 from devenbansod/fix_12321 Assign LIMIT clause only to syntactically correct queries Commit: 35011c01709cbad9d42503788c7ad19211894151 https://github.com/phpmyadmin/phpmyadmin/commit/35011c01709cbad9d42503788c7… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-22 (Thu, 22 Sep 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #12321 and #12580 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 5a9813e11faf4096f3fe744fa8a0b286b97d5864 https://github.com/phpmyadmin/phpmyadmin/commit/5a9813e11faf4096f3fe744fa8a… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-22 (Thu, 22 Sep 2016) Changed paths: M libraries/rte/rte_routines.lib.php Log Message: ----------- Do not backquote the user and host if already backquoted Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 19c91010c61427c23c8876e5c7a03dc606af5c4b https://github.com/phpmyadmin/phpmyadmin/commit/19c91010c61427c23c8876e5c7a… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-22 (Thu, 22 Sep 2016) Changed paths: M ChangeLog M libraries/controllers/table/TableSearchController.php M libraries/sql.lib.php Log Message: ----------- Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 Commit: e2bd783f579e9b71b9c6d192ac207e7043b1d519 https://github.com/phpmyadmin/phpmyadmin/commit/e2bd783f579e9b71b9c6d192ac2… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-22 (Thu, 22 Sep 2016) Changed paths: M import.php Log Message: ----------- Use Response instead of Message's display method to print error Fix #12569 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 316e0004cc32af37038abd9ca12776636e63a863 https://github.com/phpmyadmin/phpmyadmin/commit/316e0004cc32af37038abd9ca12… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-23 (Fri, 23 Sep 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for #12461 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 2f0ec1499303fc583d5e9b2b264a0948296cac45 https://github.com/phpmyadmin/phpmyadmin/commit/2f0ec1499303fc583d5e9b2b264… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-23 (Fri, 23 Sep 2016) Changed paths: M libraries/sql.lib.php Log Message: ----------- Refactor check function instead of separate function Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 54c81312a9467a704a645e27e619d15f9aed542d https://github.com/phpmyadmin/phpmyadmin/commit/54c81312a9467a704a645e27e61… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-23 (Fri, 23 Sep 2016) Changed paths: M import.php Log Message: ----------- If multiple queries are submitted, save the commulative bookmark only once Fix #12179 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 02a708c7d0b88f51608be923fe9eb3c6bc369c93 https://github.com/phpmyadmin/phpmyadmin/commit/02a708c7d0b88f51608be923fe9… Author: Daniel Palmeira Huanca <daniel46758(a)hotmail.com> Date: 2016-09-25 (Sun, 25 Sep 2016) Changed paths: M po/pt_BR.po Log Message: ----------- Translated using Weblate (Portuguese (Brazil)) Currently translated at 93.2% (2988 of 3206 strings) [CI skip] Commit: b6263ede846d779f15ab626fc160cf401c4809aa https://github.com/phpmyadmin/phpmyadmin/commit/b6263ede846d779f15ab626fc16… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-26 (Mon, 26 Sep 2016) Changed paths: M libraries/config.default.php Log Message: ----------- Use example.com as example domain Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: a381b5a60674dc36e2dc5a557ec6f2a7ef12a9c0 https://github.com/phpmyadmin/phpmyadmin/commit/a381b5a60674dc36e2dc5a557ec… Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: 2016-09-26 (Mon, 26 Sep 2016) Changed paths: M po/ru.po Log Message: ----------- Translated using Weblate (Russian) Currently translated at 98.1% (3155 of 3213 strings) [CI skip] Commit: 2caac6c618d77a49198c4540ddb30343b9bc805a https://github.com/phpmyadmin/phpmyadmin/commit/2caac6c618d77a49198c4540ddb… Author: Domen <mitenem(a)outlook.com> Date: 2016-09-26 (Mon, 26 Sep 2016) Changed paths: M po/sl.po Log Message: ----------- Translated using Weblate (Slovenian) Currently translated at 100.0% (3206 of 3206 strings) [CI skip] Commit: 07e53c88c15f995aefedc8013e87ba2968b5fcde https://github.com/phpmyadmin/phpmyadmin/commit/07e53c88c15f995aefedc8013e8… Author: Weblate <noreply(a)weblate.org> Date: 2016-09-26 (Mon, 26 Sep 2016) Changed paths: M libraries/config.default.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: 07b0f092321dd9801e4da773a168b04efca4b1c1 https://github.com/phpmyadmin/phpmyadmin/commit/07b0f092321dd9801e4da773a16… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-26 (Mon, 26 Sep 2016) Changed paths: M ChangeLog M doc/config.rst Log Message: ----------- Clarify documentation on ArbitraryServerRegexp - recommend using start/end of string in regexp - add examples - add note mentioning port inclusion in the match - fixes #12511 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: d956922a6195819bf0fa5b12d2b216317f0404e4 https://github.com/phpmyadmin/phpmyadmin/commit/d956922a6195819bf0fa5b12d2b… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-26 (Mon, 26 Sep 2016) Changed paths: M ChangeLog M libraries/Util.php Log Message: ----------- Remove duplicate code in SQL escaping Fixes #12508 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: a1c27b957c319efcdd341134d2c63ad00f11f5e8 https://github.com/phpmyadmin/phpmyadmin/commit/a1c27b957c319efcdd341134d2c… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-26 (Mon, 26 Sep 2016) Changed paths: M ChangeLog M libraries/tbl_info.inc.php Log Message: ----------- Cleanup code for getting table information Fixes #12475 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 3df5113a8c472567308c913b8a6e68f24a6b1f57 https://github.com/phpmyadmin/phpmyadmin/commit/3df5113a8c472567308c913b8a6… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-26 (Mon, 26 Sep 2016) Changed paths: M ChangeLog M doc/config.rst M js/tbl_structure.js M libraries/Util.php M libraries/config.default.php M libraries/controllers/table/TableSearchController.php M libraries/rte/rte_routines.lib.php M libraries/sql-parser/src/Components/OptionsArray.php M libraries/sql-parser/src/Statements/CreateStatement.php M libraries/sql-parser/src/Statements/InsertStatement.php M libraries/sql-parser/src/Utils/Formatter.php M libraries/sql.lib.php M libraries/tbl_info.inc.php M po/ca.po M po/de.po M po/ja.po M po/ko.po M po/pt_BR.po M po/ru.po M po/sl.po Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: 2d316e47e1f3e9447892f61116f1599702782777 https://github.com/phpmyadmin/phpmyadmin/commit/2d316e47e1f3e9447892f61116f… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-27 (Tue, 27 Sep 2016) Changed paths: M doc/config.rst Log Message: ----------- Add missing escaping in sample regexp Fixes #12594 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: f99aa697847a778670aac5a08a5f0c496fbabc44 https://github.com/phpmyadmin/phpmyadmin/commit/f99aa697847a778670aac5a08a5… Author: Jozef Pistej <pistej2(a)gmail.com> Date: 2016-09-27 (Tue, 27 Sep 2016) Changed paths: M po/sk.po Log Message: ----------- Translated using Weblate (Slovak) Currently translated at 83.6% (2682 of 3206 strings) [CI skip] Commit: 5511b39e1630b07630a78e7ae657f5dd1a087daa https://github.com/phpmyadmin/phpmyadmin/commit/5511b39e1630b07630a78e7ae65… Author: Weblate <noreply(a)weblate.org> Date: 2016-09-27 (Tue, 27 Sep 2016) Changed paths: M doc/config.rst Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: 96eba72fa6363ce4959efbd71b174048a82d7db0 https://github.com/phpmyadmin/phpmyadmin/commit/96eba72fa6363ce4959efbd71b1… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-27 (Tue, 27 Sep 2016) Changed paths: M libraries/Util.php M libraries/sql.lib.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php Log Message: ----------- Fix #12327: Show as PHP No longer works Fix output of show_as_php. Don't show the links that are not required or that may not work as expected Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 9bd75db679fd8b3c7da551074951dc993e66d721 https://github.com/phpmyadmin/phpmyadmin/commit/9bd75db679fd8b3c7da55107495… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-27 (Tue, 27 Sep 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for #12327 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 59cd9bf3a1b6cf292e4d3700301d7d0328977e8d https://github.com/phpmyadmin/phpmyadmin/commit/59cd9bf3a1b6cf292e4d3700301… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-28 (Wed, 28 Sep 2016) Changed paths: M tbl_export.php Log Message: ----------- Replace FROM clause aliases only if FROM clause is present Fix #12579 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 7084608fff35fd24f1ba7265fd2de408d8e7408b https://github.com/phpmyadmin/phpmyadmin/commit/7084608fff35fd24f1ba7265fd2… Author: Jozef Pistej <pistej2(a)gmail.com> Date: 2016-09-28 (Wed, 28 Sep 2016) Changed paths: M po/sk.po Log Message: ----------- Translated using Weblate (Slovak) Currently translated at 83.6% (2682 of 3206 strings) [CI skip] Commit: 7a80af393ddfc1eebd13a42745193b608180afdb https://github.com/phpmyadmin/phpmyadmin/commit/7a80af393ddfc1eebd13a427451… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-28 (Wed, 28 Sep 2016) Changed paths: M doc/config.rst Log Message: ----------- Add missing escaping in sample regexp Fixes #12594 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: bba3ae2ab53e2b56a80bdc8a7db557412cbf184d https://github.com/phpmyadmin/phpmyadmin/commit/bba3ae2ab53e2b56a80bdc8a7db… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-28 (Wed, 28 Sep 2016) Log Message: ----------- Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 Commit: f54f8fa322eb3b1e894c24e0fa14383fe853ddc0 https://github.com/phpmyadmin/phpmyadmin/commit/f54f8fa322eb3b1e894c24e0fa1… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-28 (Wed, 28 Sep 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog for #12579 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: fdc80a2fd935f8db871b548a6deb2fddbf006e67 https://github.com/phpmyadmin/phpmyadmin/commit/fdc80a2fd935f8db871b548a6de… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-30 (Fri, 30 Sep 2016) Changed paths: M js/codemirror/addon/lint/sql-lint.js Log Message: ----------- Fix #12455: Query history stores separate entry for every letter typed Don't store history when linting, rather store it only when user has submitted the query. Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 5c74f443578152f59a3c688b5cc5cf3d756afff6 https://github.com/phpmyadmin/phpmyadmin/commit/5c74f443578152f59a3c688b5cc… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-30 (Fri, 30 Sep 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for #12455 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: f87358dff730e7a5ada13922108151a9eee107cf https://github.com/phpmyadmin/phpmyadmin/commit/f87358dff730e7a5ada13922108… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-02 (Sun, 02 Oct 2016) Changed paths: M prefs_manage.php Log Message: ----------- Don't assume the default arg_separator in URL Respect the value for arg_separator.input too. Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: a16d1c9a6a41336ab751830f3c408613978628a8 https://github.com/phpmyadmin/phpmyadmin/commit/a16d1c9a6a41336ab751830f3c4… Author: Yogi Erka Julyansa Putra <erka.j.p(a)gmail.com> Date: 2016-10-02 (Sun, 02 Oct 2016) Changed paths: M po/id.po Log Message: ----------- Translated using Weblate (Indonesian) Currently translated at 68.8% (2208 of 3206 strings) [CI skip] Commit: ada82985082c0a4be0cb3df06b667345d7202973 https://github.com/phpmyadmin/phpmyadmin/commit/ada82985082c0a4be0cb3df06b6… Author: Dragan Zlatkovski <dragan_natalia(a)yahoo.com> Date: 2016-10-02 (Sun, 02 Oct 2016) Changed paths: M po/mk.po Log Message: ----------- Translated using Weblate (Macedonian) Currently translated at 17.2% (554 of 3206 strings) [CI skip] Commit: 0e0fdf985a29d2f20f3c115e748a6d8becc19eaa https://github.com/phpmyadmin/phpmyadmin/commit/0e0fdf985a29d2f20f3c115e748… Author: an wei <justregonly1(a)gmail.com> Date: 2016-10-03 (Mon, 03 Oct 2016) Changed paths: M po/zh_CN.po Log Message: ----------- Translated using Weblate (Chinese (China)) Currently translated at 88.0% (2824 of 3206 strings) [CI skip] Commit: cc161ba3107b935808c9550728c337ce3de32090 https://github.com/phpmyadmin/phpmyadmin/commit/cc161ba3107b935808c9550728c… Author: Dadan Setia <da2n_s(a)yahoo.co.id> Date: 2016-10-03 (Mon, 03 Oct 2016) Changed paths: M po/id.po Log Message: ----------- Translated using Weblate (Indonesian) Currently translated at 68.8% (2207 of 3206 strings) [CI skip] Commit: b9adbff762a3fcf3f20e5a2fb0caad9f9ca001e0 https://github.com/phpmyadmin/phpmyadmin/commit/b9adbff762a3fcf3f20e5a2fb0c… Author: Weblate <noreply(a)weblate.org> Date: 2016-10-03 (Mon, 03 Oct 2016) Changed paths: M libraries/sql.lib.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: 4fb7d734016c90f49299ce9724f486058b81cdad https://github.com/phpmyadmin/phpmyadmin/commit/4fb7d734016c90f49299ce9724f… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-03 (Mon, 03 Oct 2016) Changed paths: M libraries/sql.lib.php Log Message: ----------- Don't assume justBrowsing if there is a Join in the query Fix #12189 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: b2d337814a5f99fda19d0bea392a40c0f1b8e154 https://github.com/phpmyadmin/phpmyadmin/commit/b2d337814a5f99fda19d0bea392… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-03 (Mon, 03 Oct 2016) Changed paths: M po/id.po M po/mk.po Log Message: ----------- Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 Commit: 6a53b89cb7fa9e74ec05e04654242e3368122d00 https://github.com/phpmyadmin/phpmyadmin/commit/6a53b89cb7fa9e74ec05e046542… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-03 (Mon, 03 Oct 2016) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Escape database name properly to be used in MySQL wildcard statements Fix #12602 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: c202b7a87ce0318e848faa6e5d8a24f3f1e9313f https://github.com/phpmyadmin/phpmyadmin/commit/c202b7a87ce0318e848faa6e5d8… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-03 (Mon, 03 Oct 2016) Changed paths: M po/id.po M po/zh_CN.po Log Message: ----------- Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 Commit: aa19ffde328eeca98e68aab940035cbed01e04dc https://github.com/phpmyadmin/phpmyadmin/commit/aa19ffde328eeca98e68aab9400… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-03 (Mon, 03 Oct 2016) Changed paths: M ChangeLog 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 A 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 Log Message: ----------- Update SQL parser to 3.4.9 - issue #12316 Correct export of complex SELECT statements - issue #12080 Fixed parsing of subselect queries - issue #11740 Fixed handling DELETE ... USING queries - issue #12100 Fixed handling of CASE operator Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 4e020dea6bf173053d0a6ab7e2504f82fab174b4 https://github.com/phpmyadmin/phpmyadmin/commit/4e020dea6bf173053d0a6ab7e25… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-03 (Mon, 03 Oct 2016) Changed paths: M libraries/sql-parser/src/Components/CaseExpression.php M libraries/sql-parser/src/Statements/DeleteStatement.php Log Message: ----------- Update SQL parser to 3.4.10 Fixes #12612 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: e1d5a1338d7ba88aa33ad145f4df8acebffea4c0 https://github.com/phpmyadmin/phpmyadmin/commit/e1d5a1338d7ba88aa33ad145f4d… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-03 (Mon, 03 Oct 2016) Changed paths: R scripts/revision-info Log Message: ----------- Remove outdated script This is not used on the demo, there is separate one in scripts repo. Fixes #12605 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 0a5ab3bfe954f5222624afdb677ec4d3db1996b8 https://github.com/phpmyadmin/phpmyadmin/commit/0a5ab3bfe954f5222624afdb677… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-03 (Mon, 03 Oct 2016) Changed paths: R scripts/remove_control_m.sh Log Message: ----------- Remove unused script Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 200a92b73801c140d3d916c518e1458be7868557 https://github.com/phpmyadmin/phpmyadmin/commit/200a92b73801c140d3d916c518e… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-03 (Mon, 03 Oct 2016) Changed paths: M ChangeLog M js/codemirror/addon/lint/sql-lint.js Log Message: ----------- Merge remote-tracking branch 'origin/pull/12601' into QA_4_6 Commit: 0292b89c4a9a6837c5fce64ba0c80aaf1e216a83 https://github.com/phpmyadmin/phpmyadmin/commit/0292b89c4a9a6837c5fce64ba0c… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-03 (Mon, 03 Oct 2016) Changed paths: M ChangeLog M libraries/Util.php M libraries/sql.lib.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php Log Message: ----------- Merge remote-tracking branch 'origin/pull/12596' into QA_4_6 Commit: 5071b8a0166672bdfccb18556e58c647aae77df6 https://github.com/phpmyadmin/phpmyadmin/commit/5071b8a0166672bdfccb18556e5… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-03 (Mon, 03 Oct 2016) Changed paths: M import.php Log Message: ----------- Merge remote-tracking branch 'origin/pull/12584' into QA_4_6 Commit: 4ba041720fb0177f156547b09915d3e13d98144d https://github.com/phpmyadmin/phpmyadmin/commit/4ba041720fb0177f156547b0991… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-03 (Mon, 03 Oct 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #12584 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 26c7a585332f505220c7e7e0c720ae016aafe29e https://github.com/phpmyadmin/phpmyadmin/commit/26c7a585332f505220c7e7e0c72… Author: Deven Bansod <devenbansod(a)users.noreply.github.com> Date: 2016-10-04 (Tue, 04 Oct 2016) Changed paths: M libraries/server_privileges.lib.php M server_privileges.php Log Message: ----------- Merge pull request #12440 from rpv-tomsk/grant-option-description-12419 Fix #12419 wrong description on GRANT option of table/routine privileges Commit: 46ae5005080202d10865720e020aa23f4c4ae597 https://github.com/phpmyadmin/phpmyadmin/commit/46ae5005080202d10865720e020… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-04 (Tue, 04 Oct 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for #12419 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: cd4c8374b12601af9e925c5a47dcff6524278996 https://github.com/phpmyadmin/phpmyadmin/commit/cd4c8374b12601af9e925c5a47d… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-04 (Tue, 04 Oct 2016) Changed paths: M ChangeLog M libraries/Config.php Log Message: ----------- Fixed regexp for matching browser versions Fixes #12615 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: ddf580c51b5f7c4b6f295469b327c308863c2509 https://github.com/phpmyadmin/phpmyadmin/commit/ddf580c51b5f7c4b6f295469b32… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-04 (Tue, 04 Oct 2016) Changed paths: M libraries/Config.php Log Message: ----------- Fix OmniWeb version match (issue #12615) Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 686db2039d7937e8fb869897f022eef16cd3c6d5 https://github.com/phpmyadmin/phpmyadmin/commit/686db2039d7937e8fb869897f02… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-04 (Tue, 04 Oct 2016) Changed paths: M import.php Log Message: ----------- Merge pull request #12582 from devenbansod/fix_12569 Use Response instead of Message's display method to print error Commit: a7786dd93a5ce1ee6a6026864275bb5b753b87ae https://github.com/phpmyadmin/phpmyadmin/commit/a7786dd93a5ce1ee6a602686427… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-04 (Tue, 04 Oct 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog for #12582 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 4055eb9162006111bd33964535a076b87d2a4d6f https://github.com/phpmyadmin/phpmyadmin/commit/4055eb9162006111bd33964535a… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-04 (Tue, 04 Oct 2016) Changed paths: M ChangeLog M index.php M libraries/common.inc.php Log Message: ----------- Refuse to work with mbstring.func_overload enabled In several places our code assumes that strlen does return length in bytes and not in chars. This can be different with mbstring.func_overload and will lead to several hard to debug breakages. Therefore it's safer to simply deny using phpMyAdmin with this setting. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 17b34be04f5cc2a5f83d73eba7cd41cbc3ebb7b2 https://github.com/phpmyadmin/phpmyadmin/commit/17b34be04f5cc2a5f83d73eba7c… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-04 (Tue, 04 Oct 2016) Changed paths: M libraries/core.lib.php M test/libraries/core/PMA_safeUnserialize_test.php Log Message: ----------- Correctly parse string length when checking serialized data Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: a7a541347b5f5037207a01a2a20a8c13076efce8 https://github.com/phpmyadmin/phpmyadmin/commit/a7a541347b5f5037207a01a2a20… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-04 (Tue, 04 Oct 2016) Changed paths: M prefs_manage.php Log Message: ----------- Merge branch 'QA_4_6-security' of github.com:phpmyadmin/phpmyadmin-security into QA_4_6-security Commit: 69951525318b246193d82ad7e101748a24a18e93 https://github.com/phpmyadmin/phpmyadmin/commit/69951525318b246193d82ad7e10… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-04 (Tue, 04 Oct 2016) Changed paths: M ChangeLog M doc/config.rst M import.php M js/codemirror/addon/lint/sql-lint.js M libraries/Config.php M libraries/Util.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 A 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.lib.php M po/id.po M po/mk.po M po/sk.po M po/zh_CN.po R scripts/remove_control_m.sh R scripts/revision-info M server_privileges.php M tbl_export.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: 39f4a595b2c3c14d07cca2bcde5d2432d2aa86a0 https://github.com/phpmyadmin/phpmyadmin/commit/39f4a595b2c3c14d07cca2bcde5… Author: Val Bancer <valerij.bancer(a)gmail.com> Date: 2016-10-05 (Wed, 05 Oct 2016) Changed paths: M po/ru.po Log Message: ----------- Translated using Weblate (Russian) Currently translated at 98.2% (3156 of 3213 strings) [CI skip] Commit: 889cd31618c86f7f30fcfe5f8e501f94e5e41a3c https://github.com/phpmyadmin/phpmyadmin/commit/889cd31618c86f7f30fcfe5f8e5… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-05 (Wed, 05 Oct 2016) Changed paths: M prefs_manage.php Log Message: ----------- Prevent leaving an orphaned file while importing preferences Fix #12362 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: c4a2e1b6f2f8ab87b08858196e50b1043bdc6600 https://github.com/phpmyadmin/phpmyadmin/commit/c4a2e1b6f2f8ab87b08858196e5… Author: Weblate <noreply(a)weblate.org> Date: 2016-10-05 (Wed, 05 Oct 2016) Changed paths: M prefs_manage.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: 7d2760cec55410762ef6689a4aa314492b305fed https://github.com/phpmyadmin/phpmyadmin/commit/7d2760cec55410762ef6689a4aa… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-05 (Wed, 05 Oct 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for #12362 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 9ceb237dd6779e58047d112d051ab28b1002eb92 https://github.com/phpmyadmin/phpmyadmin/commit/9ceb237dd6779e58047d112d051… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-05 (Wed, 05 Oct 2016) Changed paths: M tbl_export.php Log Message: ----------- Don't append FROM clause for replacing in UNION statements If global statement has atleast one union, it should not have a FROM. Fix #12619 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 0de5f6099f60544bbd3e5d385f2b3e8072f0ccec https://github.com/phpmyadmin/phpmyadmin/commit/0de5f6099f60544bbd3e5d385f2… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-05 (Wed, 05 Oct 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for #12619 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 5ed544a45e094f422c2ffd40e6e4b836e5d9cff4 https://github.com/phpmyadmin/phpmyadmin/commit/5ed544a45e094f422c2ffd40e6e… Author: Ihab Mardoud <ihab.mardoud(a)gmail.com> Date: 2016-10-08 (Sat, 08 Oct 2016) Changed paths: M po/ar.po Log Message: ----------- Translated using Weblate (Arabic) Currently translated at 34.0% (1093 of 3206 strings) [CI skip] Commit: 68bebc00ea9dc766372c3616883211960821bf5b https://github.com/phpmyadmin/phpmyadmin/commit/68bebc00ea9dc766372c3616883… Author: SDSkyKlouD <koongchi135(a)gmail.com> Date: 2016-10-08 (Sat, 08 Oct 2016) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 78.6% (2521 of 3206 strings) [CI skip] Commit: 08b496f1d9d1d5e2f30f8072c0a68b9c6d203082 https://github.com/phpmyadmin/phpmyadmin/commit/08b496f1d9d1d5e2f30f8072c0a… Author: Weblate <noreply(a)weblate.org> Date: 2016-10-08 (Sat, 08 Oct 2016) Changed paths: M libraries/Table.php M test/classes/TableTest.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: 4f023ac86a7272ce7d31ae28d35bd152629f7878 https://github.com/phpmyadmin/phpmyadmin/commit/4f023ac86a7272ce7d31ae28d35… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-08 (Sat, 08 Oct 2016) Changed paths: M libraries/Table.php Log Message: ----------- Allow for precision specification in TIMESTAMP datatype while editing/adding a column Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 0b355b744627ef7d271ae35e3d3537d78a1cbb53 https://github.com/phpmyadmin/phpmyadmin/commit/0b355b744627ef7d271ae35e3d3… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-08 (Sat, 08 Oct 2016) Changed paths: M test/classes/TableTest.php Log Message: ----------- Add tests for generation of Field spec with TIMESTAMP with precision Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: fd31ed27e073fefe870f1c6793aefe38bacd18fc https://github.com/phpmyadmin/phpmyadmin/commit/fd31ed27e073fefe870f1c6793a… Author: Ranja Hseen <ranjahseen2(a)gmail.com> Date: 2016-10-09 (Sun, 09 Oct 2016) Changed paths: M po/ckb.po Log Message: ----------- Translated using Weblate (Kurdish Sorani) Currently translated at 18.0% (580 of 3206 strings) [CI skip] Commit: afa6e3b85eb2d83e8ff0c71fca635f0624b3b46b https://github.com/phpmyadmin/phpmyadmin/commit/afa6e3b85eb2d83e8ff0c71fca6… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-10 (Mon, 10 Oct 2016) Changed paths: M js/tbl_change.js Log Message: ----------- Initialize newly added Textareas with default values Actually default values for textareas are blanks. Fix #12624 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: c455a5cf8f48b1ce351969d5d6204500fd7d482e https://github.com/phpmyadmin/phpmyadmin/commit/c455a5cf8f48b1ce351969d5d62… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-10 (Mon, 10 Oct 2016) Changed paths: M po/ar.po M po/ckb.po M po/ko.po Log Message: ----------- Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 Commit: ba50cbb91cdd6b9f06f2386b4ff5b1a46c0d644d https://github.com/phpmyadmin/phpmyadmin/commit/ba50cbb91cdd6b9f06f2386b4ff… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2016-10-10 (Mon, 10 Oct 2016) Changed paths: M libraries/DisplayResults.php M libraries/Table.php Log Message: ----------- Fix bug #12234 No page indicator in view Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: e394ca84a40c2c84509ac15d0fd487c373751404 https://github.com/phpmyadmin/phpmyadmin/commit/e394ca84a40c2c84509ac15d0fd… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-10 (Mon, 10 Oct 2016) Changed paths: M po/da.po Log Message: ----------- Translated using Weblate (Danish) Currently translated at 92.0% (2952 of 3206 strings) [CI skip] Commit: f31699970f281af7f3e1c767aa29ef29f32baa60 https://github.com/phpmyadmin/phpmyadmin/commit/f31699970f281af7f3e1c767aa2… Author: Arie Kurniawan <hubungi.aja(a)gmail.com> Date: 2016-10-10 (Mon, 10 Oct 2016) Changed paths: M po/id.po Log Message: ----------- Translated using Weblate (Indonesian) Currently translated at 69.5% (2231 of 3206 strings) [CI skip] Correcting translate Commit: 521e087cec73a0878ed381d178564fc1301fb278 https://github.com/phpmyadmin/phpmyadmin/commit/521e087cec73a0878ed381d1785… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-10 (Mon, 10 Oct 2016) Changed paths: M po/ckb.po Log Message: ----------- Translated using Weblate (Kurdish Sorani) Currently translated at 31.7% (1017 of 3206 strings) [CI skip] Commit: 2fa52f06b9e8bbaf89acaea98d67878a0cf8fb52 https://github.com/phpmyadmin/phpmyadmin/commit/2fa52f06b9e8bbaf89acaea98d6… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-10 (Mon, 10 Oct 2016) Changed paths: M po/pt.po Log Message: ----------- Translated using Weblate (Portuguese) Currently translated at 53.7% (1724 of 3206 strings) [CI skip] Commit: cf4a1a9ee24c34649dba11fe37fe60e93bcdd69b https://github.com/phpmyadmin/phpmyadmin/commit/cf4a1a9ee24c34649dba11fe37f… Author: Bogdan Ciobaca <ciobaca190(a)hotmail.com> Date: 2016-10-10 (Mon, 10 Oct 2016) Changed paths: M po/ro.po Log Message: ----------- Translated using Weblate (Romanian) Currently translated at 53.8% (1727 of 3206 strings) [CI skip] Commit: 489e3b5a9a24d3131187f8ca529ad951c9459f63 https://github.com/phpmyadmin/phpmyadmin/commit/489e3b5a9a24d3131187f8ca529… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-10 (Mon, 10 Oct 2016) Changed paths: M po/ta.po Log Message: ----------- Translated using Weblate (Tamil) Currently translated at 34.2% (1098 of 3206 strings) [CI skip] Commit: 5ded636281d5a2c95a61ced55a59e3446229f9de https://github.com/phpmyadmin/phpmyadmin/commit/5ded636281d5a2c95a61ced55a5… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-10 (Mon, 10 Oct 2016) Changed paths: M po/vi.po Log Message: ----------- Translated using Weblate (Vietnamese) Currently translated at 86.3% (2768 of 3206 strings) [CI skip] Commit: 3b8fc504d2a3c1da692cfe703d43d6d81cdc5778 https://github.com/phpmyadmin/phpmyadmin/commit/3b8fc504d2a3c1da692cfe703d4… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-11 (Tue, 11 Oct 2016) Changed paths: M libraries/tracking.lib.php Log Message: ----------- Manage new-lines and extra whitespaces properly Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: d74714c45ec246d179aa4b19d81c30903cdff876 https://github.com/phpmyadmin/phpmyadmin/commit/d74714c45ec246d179aa4b19d81… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-11 (Tue, 11 Oct 2016) Changed paths: M libraries/Tracker.php Log Message: ----------- Manage new-lines and extra whitespaces properly Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 88f0b6c99dfa4ada5a231e3299e8fac8c894fe0a https://github.com/phpmyadmin/phpmyadmin/commit/88f0b6c99dfa4ada5a231e3299e… Author: Giovanni Sora <g.sora(a)tiscali.it> Date: 2016-10-11 (Tue, 11 Oct 2016) Changed paths: M po/ia.po Log Message: ----------- Translated using Weblate (Interlingua) Currently translated at 73.9% (2371 of 3206 strings) [CI skip] Commit: 2fdb15c36ef8a9a6d0622c4f1435104d56cc2dc8 https://github.com/phpmyadmin/phpmyadmin/commit/2fdb15c36ef8a9a6d0622c4f143… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-11 (Tue, 11 Oct 2016) Changed paths: M libraries/replication.inc.php Log Message: ----------- Replace call to an old and unavailable function Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 593cbd271f3e5f78b3bc6e9cf11fbff067032fbe https://github.com/phpmyadmin/phpmyadmin/commit/593cbd271f3e5f78b3bc6e9cf11… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-11 (Tue, 11 Oct 2016) Changed paths: M po/ckb.po M po/da.po M po/id.po M po/pt.po M po/ro.po M po/ta.po M po/vi.po Log Message: ----------- Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 Commit: 5fa394b12b166c4eae9fb09195bf8c61e6eb40f9 https://github.com/phpmyadmin/phpmyadmin/commit/5fa394b12b166c4eae9fb09195b… Author: Weblate <noreply(a)weblate.org> Date: 2016-10-11 (Tue, 11 Oct 2016) Changed paths: M libraries/replication.inc.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: 3166e8c0f2bcaf881a5ea626e4ba6f8844e7ff7f https://github.com/phpmyadmin/phpmyadmin/commit/3166e8c0f2bcaf881a5ea626e4b… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-11 (Tue, 11 Oct 2016) Changed paths: M server_replication.php Log Message: ----------- Use values from request parameter url_param only if it is an array Fix #12350 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: d5028e445ad1dfeda5b130332fed5375edfade4e https://github.com/phpmyadmin/phpmyadmin/commit/d5028e445ad1dfeda5b130332fe… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-11 (Tue, 11 Oct 2016) Changed paths: M README.rst Log Message: ----------- Remove non working todofy badge Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 088d2c36f63a32b318caffd33e240b4d7496127f https://github.com/phpmyadmin/phpmyadmin/commit/088d2c36f63a32b318caffd33e2… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2016-10-12 (Wed, 12 Oct 2016) Changed paths: M libraries/DisplayResults.php Log Message: ----------- Fix string concatenation Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: e0923d54e2fa95b3f706c7b7d1f20320dda11607 https://github.com/phpmyadmin/phpmyadmin/commit/e0923d54e2fa95b3f706c7b7d1f… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2016-10-12 (Wed, 12 Oct 2016) Changed paths: M README.rst M libraries/replication.inc.php M po/ckb.po M po/da.po M po/ia.po M po/id.po M po/pt.po M po/ro.po M po/ta.po M po/vi.po M server_replication.php Log Message: ----------- Merge branch 'QA_4_6' into bug12234 Commit: eef59d6c487102b8d78f4393096a448c9136bfa1 https://github.com/phpmyadmin/phpmyadmin/commit/eef59d6c487102b8d78f4393096… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-12 (Wed, 12 Oct 2016) Changed paths: M libraries/config/ConfigFile.php M libraries/config/Validator.php Log Message: ----------- Fix order of testing DBConnection with different parameters in Config method In setup, try to follow what the docs say. 'Password login is still tried first, but as fallback, no password method is tried.' Fix #12472 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 5a413ae6df0ad032be2532f2b668e299fd682479 https://github.com/phpmyadmin/phpmyadmin/commit/5a413ae6df0ad032be2532f2b66… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-12 (Wed, 12 Oct 2016) Changed paths: M test/classes/config/ConfigFileTest.php Log Message: ----------- Add tests Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 6b256e89dd4d405b5c74cacdaa1bf11aa53ee6e1 https://github.com/phpmyadmin/phpmyadmin/commit/6b256e89dd4d405b5c74cacdaa1… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-13 (Thu, 13 Oct 2016) Changed paths: M libraries/sql.lib.php Log Message: ----------- Don't set just_one_table to true when JOIN is present in query Fix #12625 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 7bc630bf25c118a41dfa5fef978eda1e3ab4ee39 https://github.com/phpmyadmin/phpmyadmin/commit/7bc630bf25c118a41dfa5fef978… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-13 (Thu, 13 Oct 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for #12625 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 8c357fab12b041b1dd67ce8505e7767c4a7a413e https://github.com/phpmyadmin/phpmyadmin/commit/8c357fab12b041b1dd67ce8505e… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-13 (Thu, 13 Oct 2016) Changed paths: M libraries/sql.lib.php Log Message: ----------- Also unset just_one_table while having subquery or having more than or less than 1 tables selected Issue #12625 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 900a12f870df94d7d37cc043b9ee1e6039f0ce3d https://github.com/phpmyadmin/phpmyadmin/commit/900a12f870df94d7d37cc043b9e… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-13 (Thu, 13 Oct 2016) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Prevent undefined index errors while editing user privs Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: e63635f4566820804fc336e39389da271c89f1b9 https://github.com/phpmyadmin/phpmyadmin/commit/e63635f4566820804fc336e3938… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-14 (Fri, 14 Oct 2016) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Use IDENTIFIED BY 'auth_string' if password check plugin is active This applies to MariaDB only Fix #12366 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 41b07b20092dadddcd336c0922e448b887184acb https://github.com/phpmyadmin/phpmyadmin/commit/41b07b20092dadddcd336c0922e… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-14 (Fri, 14 Oct 2016) Changed paths: M libraries/plugins/export/ExportSql.php Log Message: ----------- Use IF EXISTS with DROP Database to prevent error while importing Fix #12634 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 3accab1764561d5a23e58cb36531ad45d2342db3 https://github.com/phpmyadmin/phpmyadmin/commit/3accab1764561d5a23e58cb3653… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-14 (Fri, 14 Oct 2016) Changed paths: M test/classes/plugin/export/ExportSqlTest.php Log Message: ----------- Adjust tests Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: c00cf34886acdea83d104a0a46d140027c0eeadc https://github.com/phpmyadmin/phpmyadmin/commit/c00cf34886acdea83d104a0a46d… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-14 (Fri, 14 Oct 2016) Changed paths: M libraries/plugins/export/ExportSql.php Log Message: ----------- Use IF EXISTS with DROP Database while exporting to prevent error while importing this dump Fix #12634 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 201ba095ce39e4a8fbd9bf99968eaca15f195eed https://github.com/phpmyadmin/phpmyadmin/commit/201ba095ce39e4a8fbd9bf99968… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-14 (Fri, 14 Oct 2016) Changed paths: M test/classes/plugin/export/ExportSqlTest.php Log Message: ----------- Adjust tests Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 34637a71d8618c7af0cba8c63ddaa3a8ee15d872 https://github.com/phpmyadmin/phpmyadmin/commit/34637a71d8618c7af0cba8c63dd… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-14 (Fri, 14 Oct 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog for #12634 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 5668fa558b43f3e390f0e97ef93d7806a68555e7 https://github.com/phpmyadmin/phpmyadmin/commit/5668fa558b43f3e390f0e97ef93… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-14 (Fri, 14 Oct 2016) Log Message: ----------- Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 Commit: 78dadd42fa17571e5d083b8330ddc83615067871 https://github.com/phpmyadmin/phpmyadmin/commit/78dadd42fa17571e5d083b8330d… Author: SDSkyKlouD <koongchi135(a)gmail.com> Date: 2016-10-15 (Sat, 15 Oct 2016) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 78.6% (2522 of 3206 strings) [CI skip] Commit: b38e22e25fdcfd0aaf0295abb8a3561fabe5e47c https://github.com/phpmyadmin/phpmyadmin/commit/b38e22e25fdcfd0aaf0295abb8a… Author: Vinicius Moreira (Vm Creative) <vinnisao13(a)gmail.com> Date: 2016-10-15 (Sat, 15 Oct 2016) Changed paths: M po/pt_BR.po Log Message: ----------- Translated using Weblate (Portuguese (Brazil)) Currently translated at 93.3% (2993 of 3206 strings) [CI skip] Commit: 38dc43af2fefaa686c9b1347db7eab1cda4a080e https://github.com/phpmyadmin/phpmyadmin/commit/38dc43af2fefaa686c9b1347db7… Author: Weblate <noreply(a)weblate.org> Date: 2016-10-15 (Sat, 15 Oct 2016) Changed paths: M js/pmd/move.js Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: 02b1d17c56bb24036859ceb8d4a45f566b9255a3 https://github.com/phpmyadmin/phpmyadmin/commit/02b1d17c56bb24036859ceb8d4a… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-15 (Sat, 15 Oct 2016) Changed paths: M js/pmd/move.js Log Message: ----------- Reload the current page after adding/deleting a relation in Designer Fix #12338 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: adec50866cc7b3d8c9a1a02dcab8df585f847d73 https://github.com/phpmyadmin/phpmyadmin/commit/adec50866cc7b3d8c9a1a02dcab… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-15 (Sat, 15 Oct 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog for #12338 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 5c600140cc019142fe19bb16c2cc8f17f3c76d3a https://github.com/phpmyadmin/phpmyadmin/commit/5c600140cc019142fe19bb16c2c… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-15 (Sat, 15 Oct 2016) Changed paths: M po/ko.po M po/pt_BR.po Log Message: ----------- Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 Commit: 96b40611db914f2e4f09fa1b94059ee49fb245fc https://github.com/phpmyadmin/phpmyadmin/commit/96b40611db914f2e4f09fa1b940… Author: SDSkyKlouD <koongchi135(a)gmail.com> Date: 2016-10-15 (Sat, 15 Oct 2016) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 78.9% (2530 of 3206 strings) [CI skip] Commit: 1aaedb32ca85f633992fcec1eb5f386d55e8ccf9 https://github.com/phpmyadmin/phpmyadmin/commit/1aaedb32ca85f633992fcec1eb5… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-15 (Sat, 15 Oct 2016) Changed paths: M libraries/sql.lib.php Log Message: ----------- Don't output edit/delete row links when table is not set Issue #12625 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 55b3366d6493b740a3b108a44e04de0b375f2b8b https://github.com/phpmyadmin/phpmyadmin/commit/55b3366d6493b740a3b108a44e0… Author: Weblate <noreply(a)weblate.org> Date: 2016-10-15 (Sat, 15 Oct 2016) Changed paths: M libraries/sql.lib.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: 1824f33650d4da98559e4877eeba3731ff17fb85 https://github.com/phpmyadmin/phpmyadmin/commit/1824f33650d4da98559e4877eeb… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-15 (Sat, 15 Oct 2016) Changed paths: M libraries/sql.lib.php Log Message: ----------- Use justBrowsing only if outputting the results from a single table The issue #12533 happens because we use countRecords on the parent table since it is incorrectly set, while actually we should be looking at SQL_CALC_FOUND_ROWS instead. Fix #12533 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: dc5c7b0c6764261839940ea7cade2f0f2b006075 https://github.com/phpmyadmin/phpmyadmin/commit/dc5c7b0c6764261839940ea7cad… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-16 (Sun, 16 Oct 2016) Changed paths: M js/pmd/move.js Log Message: ----------- Fix submission of Save page form using Enter keypress Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 61ec405c16c41d17c9b62bd4d9921ce9fd196562 https://github.com/phpmyadmin/phpmyadmin/commit/61ec405c16c41d17c9b62bd4d99… Author: Zulfikar <zulfikar97(a)gmail.com> Date: 2016-10-17 (Mon, 17 Oct 2016) Changed paths: M po/id.po Log Message: ----------- Translated using Weblate (Indonesian) Currently translated at 69.6% (2232 of 3206 strings) [CI skip] Commit: d37af63415732ca6e0503a0fa7938b77f957c222 https://github.com/phpmyadmin/phpmyadmin/commit/d37af63415732ca6e0503a0fa79… Author: Weblate <noreply(a)weblate.org> Date: 2016-10-17 (Mon, 17 Oct 2016) Changed paths: M js/console.js Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: 334910216e62ac32bc6ccbead9a2a6c7966506a2 https://github.com/phpmyadmin/phpmyadmin/commit/334910216e62ac32bc6ccbead9a… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-17 (Mon, 17 Oct 2016) Changed paths: M js/console.js Log Message: ----------- Check if the function actually has arguments or not Fix #12639 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: f9ed7a5054ba25532911d05ad8b75ef0846a29da https://github.com/phpmyadmin/phpmyadmin/commit/f9ed7a5054ba25532911d05ad8b… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-17 (Mon, 17 Oct 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog for #12639 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 25ee53c183dd989a09d65c08e7d7f823db4a314f https://github.com/phpmyadmin/phpmyadmin/commit/25ee53c183dd989a09d65c08e7d… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-17 (Mon, 17 Oct 2016) Changed paths: M po/id.po Log Message: ----------- Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 Commit: 57451f31c8ef8ba0d9dd695dd9004dbdaec2e10c https://github.com/phpmyadmin/phpmyadmin/commit/57451f31c8ef8ba0d9dd695dd90… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-17 (Mon, 17 Oct 2016) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Merge pull request #12632 from devenbansod/fix_12366 Use IDENTIFIED BY 'auth_string' if password check plugin is active Commit: eebe1471b70194ba7a78cfa4e30419788da41d8f https://github.com/phpmyadmin/phpmyadmin/commit/eebe1471b70194ba7a78cfa4e30… Author: SDSkyKlouD <koongchi135(a)gmail.com> Date: 2016-10-17 (Mon, 17 Oct 2016) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 79.7% (2558 of 3206 strings) [CI skip] Commit: 0b59c6283eb688d74360e4971313566a7a753545 https://github.com/phpmyadmin/phpmyadmin/commit/0b59c6283eb688d74360e497131… Author: Weblate <noreply(a)weblate.org> Date: 2016-10-17 (Mon, 17 Oct 2016) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: d6680545ff4c35b2187268d9816b1a3e0b1c13fe https://github.com/phpmyadmin/phpmyadmin/commit/d6680545ff4c35b2187268d9816… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-17 (Mon, 17 Oct 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for #12632 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: d47956461f375baf6d9ef99989c8c8fdf47af553 https://github.com/phpmyadmin/phpmyadmin/commit/d47956461f375baf6d9ef99989c… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-17 (Mon, 17 Oct 2016) Changed paths: M ChangeLog M index.php M libraries/common.inc.php Log Message: ----------- Merge remote-tracking branch 'origin/pull/12616' into QA_4_6 Commit: 6a4cf7b1ec65e9cb3ff976d55e11f91fffe510dc https://github.com/phpmyadmin/phpmyadmin/commit/6a4cf7b1ec65e9cb3ff976d55e1… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-17 (Mon, 17 Oct 2016) Changed paths: M libraries/config/ConfigFile.php M libraries/config/Validator.php M test/classes/config/ConfigFileTest.php Log Message: ----------- Merge pull request #12631 from devenbansod/fix_12472 Fix order of testing DBConnection with different parameters in Config method Commit: 307dd633543e2298a8041b054e842422a645f570 https://github.com/phpmyadmin/phpmyadmin/commit/307dd633543e2298a8041b054e8… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-17 (Mon, 17 Oct 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for #12472 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 9880f573441fcac53e61ee17eeaf690c1e06ecb0 https://github.com/phpmyadmin/phpmyadmin/commit/9880f573441fcac53e61ee17eea… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-18 (Tue, 18 Oct 2016) Changed paths: M libraries/relation.lib.php Log Message: ----------- Fix incorrect clause generation in getting ForeignData if LIMIT provided Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: c7aa10e2667d5df24b8da18ad2083c679e082d41 https://github.com/phpmyadmin/phpmyadmin/commit/c7aa10e2667d5df24b8da18ad20… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-18 (Tue, 18 Oct 2016) Changed paths: M ChangeLog M index.php M libraries/common.inc.php M libraries/config/ConfigFile.php M libraries/config/Validator.php M libraries/server_privileges.lib.php M po/ko.po M test/classes/config/ConfigFileTest.php Log Message: ----------- Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 Commit: 10a2eedeb26b3d65390203d081cbae966b216f4c https://github.com/phpmyadmin/phpmyadmin/commit/10a2eedeb26b3d65390203d081c… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-18 (Tue, 18 Oct 2016) Changed paths: M libraries/sql.lib.php Log Message: ----------- Merge pull request #12647 from devenbansod/fix_12533 Use justBrowsing only if outputting the results from a single table Commit: 9de117ffed01877d35f8953100437ac3eb9f68a0 https://github.com/phpmyadmin/phpmyadmin/commit/9de117ffed01877d35f89531004… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-18 (Tue, 18 Oct 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #12647 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 4d4d31774dd13bd3d07d28184143d0d11ae2ed5d https://github.com/phpmyadmin/phpmyadmin/commit/4d4d31774dd13bd3d07d2818414… Author: SDSkyKlouD <koongchi135(a)gmail.com> Date: 2016-10-18 (Tue, 18 Oct 2016) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 79.8% (2561 of 3206 strings) [CI skip] Commit: 191bbd9575603405d05277c1928fe6a6e9a7a3ad https://github.com/phpmyadmin/phpmyadmin/commit/191bbd9575603405d05277c1928… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-18 (Tue, 18 Oct 2016) Changed paths: M doc/setup.rst Log Message: ----------- Adjust documentation to match current Docker container Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 203dd987973e6c940c910434eba89c9d70f0e3cd https://github.com/phpmyadmin/phpmyadmin/commit/203dd987973e6c940c910434eba… Author: Paul Polidoro <leedshs(a)gmail.com> Date: 2016-10-18 (Tue, 18 Oct 2016) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 80.0% (2565 of 3206 strings) [CI skip] Commit: bf5052c60e25310a6be0634fd4f7506b9d96354d https://github.com/phpmyadmin/phpmyadmin/commit/bf5052c60e25310a6be0634fd4f… Author: Paul Polidoro <leedshs(a)gmail.com> Date: 2016-10-18 (Tue, 18 Oct 2016) Changed paths: M po/pt_BR.po Log Message: ----------- Translated using Weblate (Portuguese (Brazil)) Currently translated at 93.3% (2993 of 3206 strings) [CI skip] Commit: 238dbc4df6b4b419e360273914382846acb90578 https://github.com/phpmyadmin/phpmyadmin/commit/238dbc4df6b4b419e3602739143… Author: Weblate <noreply(a)weblate.org> Date: 2016-10-18 (Tue, 18 Oct 2016) Changed paths: M doc/setup.rst Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: f05a8006ee7e00952054b326eee38cd0e511a782 https://github.com/phpmyadmin/phpmyadmin/commit/f05a8006ee7e00952054b326eee… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-18 (Tue, 18 Oct 2016) Changed paths: M doc/setup.rst Log Message: ----------- Document Docker volumes Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: f093e34c6cab1407cbded466503ba150a68dc2cf https://github.com/phpmyadmin/phpmyadmin/commit/f093e34c6cab1407cbded466503… Author: Giovanni Sora <g.sora(a)tiscali.it> Date: 2016-10-18 (Tue, 18 Oct 2016) Changed paths: M po/ia.po Log Message: ----------- Translated using Weblate (Interlingua) Currently translated at 73.9% (2372 of 3206 strings) [CI skip] Commit: 5b316001fe7617d2d5687297322aadc5d443fa1b https://github.com/phpmyadmin/phpmyadmin/commit/5b316001fe7617d2d5687297322… Author: Weblate <noreply(a)weblate.org> Date: 2016-10-18 (Tue, 18 Oct 2016) Changed paths: M doc/setup.rst Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: 4c52592fe36f9af84579af60559f30b83d5b47fb https://github.com/phpmyadmin/phpmyadmin/commit/4c52592fe36f9af84579af60559… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-18 (Tue, 18 Oct 2016) Changed paths: M libraries/Advisor.php Log Message: ----------- Correctly localize message Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 8318d99fbc9f10bbfe274984145fdd6e84c728ca https://github.com/phpmyadmin/phpmyadmin/commit/8318d99fbc9f10bbfe274984145… Author: Giovanni Sora <g.sora(a)tiscali.it> Date: 2016-10-18 (Tue, 18 Oct 2016) Changed paths: M po/ia.po Log Message: ----------- Translated using Weblate (Interlingua) Currently translated at 74.5% (2390 of 3206 strings) [CI skip] Commit: 27e7993ff3515a499b9688a2df75e6708044b146 https://github.com/phpmyadmin/phpmyadmin/commit/27e7993ff3515a499b9688a2df7… Author: SDSkyKlouD <koongchi135(a)gmail.com> Date: 2016-10-18 (Tue, 18 Oct 2016) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 80.0% (2565 of 3206 strings) [CI skip] Commit: b28aba3ef542693591ffb0f30c2f582f797fc0a6 https://github.com/phpmyadmin/phpmyadmin/commit/b28aba3ef542693591ffb0f30c2… Author: Weblate <noreply(a)weblate.org> Date: 2016-10-18 (Tue, 18 Oct 2016) Changed paths: M libraries/Advisor.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: 610cec5495b826db273668ab08c9847708fe7c6f https://github.com/phpmyadmin/phpmyadmin/commit/610cec5495b826db273668ab08c… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-18 (Tue, 18 Oct 2016) Changed paths: M po/af.po M po/ar.po M po/az.po M po/be.po M po/be(a)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(a)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(a)latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po Log Message: ----------- Update po files [CI skip] Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: c35072dc71cbbfbd7f79a131755fb456ca0747f7 https://github.com/phpmyadmin/phpmyadmin/commit/c35072dc71cbbfbd7f79a131755… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-18 (Tue, 18 Oct 2016) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 79.9% (2564 of 3206 strings) [CI skip] Commit: 34ca139578c00b0643dca6699e69f978fc51304e https://github.com/phpmyadmin/phpmyadmin/commit/34ca139578c00b0643dca6699e6… Author: SDSkyKlouD <koongchi135(a)gmail.com> Date: 2016-10-18 (Tue, 18 Oct 2016) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 80.0% (2565 of 3206 strings) [CI skip] Commit: 9e5a1e95fe2f4d8c7a520cf157c0b60559b1c7b1 https://github.com/phpmyadmin/phpmyadmin/commit/9e5a1e95fe2f4d8c7a520cf157c… Author: SDSkyKlouD <koongchi135(a)gmail.com> Date: 2016-10-18 (Tue, 18 Oct 2016) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 79.8% (2561 of 3206 strings) [CI skip] Deleted wrong language translation ;( Commit: 587309a4b2b72f8b68ea4041b0da276e8db7fc14 https://github.com/phpmyadmin/phpmyadmin/commit/587309a4b2b72f8b68ea4041b0d… Author: Παναγιώτης Παπάζογλου <papaz_p(a)yahoo.com> Date: 2016-10-18 (Tue, 18 Oct 2016) Changed paths: M po/el.po Log Message: ----------- Translated using Weblate (Greek) Currently translated at 100.0% (3218 of 3218 strings) [CI skip] Commit: 1eac9c5ec23d03feb164c4729ceeb0eda4ca0cda https://github.com/phpmyadmin/phpmyadmin/commit/1eac9c5ec23d03feb164c4729ce… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-19 (Wed, 19 Oct 2016) Changed paths: M libraries/Table.php M tbl_operations.php Log Message: ----------- Proper initialization of $_message variable according to value of $result While calling getDisplay, $_message should be an instance of PMA\libraries\Message. Fix #12650 Also, spaces at the beginning of a table name are allowed if used inside backquotes. Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 7d0e0b3163b713ecdbfa6977fd6c447f859f8f0f https://github.com/phpmyadmin/phpmyadmin/commit/7d0e0b3163b713ecdbfa6977fd6… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-19 (Wed, 19 Oct 2016) Changed paths: M test/classes/TableTest.php Log Message: ----------- Add tests for validation of tablenames Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 3ae571bf6e47b9ba6cbfbcec2d8c645daebd71cb https://github.com/phpmyadmin/phpmyadmin/commit/3ae571bf6e47b9ba6cbfbcec2d8… Author: Giovanni Sora <g.sora(a)tiscali.it> Date: 2016-10-19 (Wed, 19 Oct 2016) Changed paths: M po/ia.po Log Message: ----------- Translated using Weblate (Interlingua) Currently translated at 74.3% (2394 of 3218 strings) [CI skip] Commit: a315fceb20b156aafb1a5642ed43169113d6640a https://github.com/phpmyadmin/phpmyadmin/commit/a315fceb20b156aafb1a5642ed4… Author: virusyoon <virusyoon(a)gmail.com> Date: 2016-10-19 (Wed, 19 Oct 2016) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 79.8% (2561 of 3206 strings) [CI skip] Commit: e71ea994c02a14123b5593b8a9366bb0325d4a18 https://github.com/phpmyadmin/phpmyadmin/commit/e71ea994c02a14123b5593b8a93… Author: Erik Sundin <esundin(a)miman.biz> Date: 2016-10-19 (Wed, 19 Oct 2016) Changed paths: M po/sv.po Log Message: ----------- Translated using Weblate (Swedish) Currently translated at 97.9% (3153 of 3218 strings) [CI skip] Commit: 5dbc286cd81d8c46ac5acbc77f435acc84685af2 https://github.com/phpmyadmin/phpmyadmin/commit/5dbc286cd81d8c46ac5acbc77f4… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-19 (Wed, 19 Oct 2016) Changed paths: M doc/setup.rst M libraries/Advisor.php M po/af.po M po/ar.po M po/az.po M po/be.po M po/be(a)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(a)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(a)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' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 Commit: 48cd299dca59fcd8194bde9f5a7494e4f6752b63 https://github.com/phpmyadmin/phpmyadmin/commit/48cd299dca59fcd8194bde9f5a7… Author: Weblate <noreply(a)weblate.org> Date: 2016-10-19 (Wed, 19 Oct 2016) Changed paths: M libraries/Table.php M tbl_operations.php M test/classes/TableTest.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: 6169fef7557259c9fa59adf6feacc850e9c92ca1 https://github.com/phpmyadmin/phpmyadmin/commit/6169fef7557259c9fa59adf6fea… Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: 2016-10-19 (Wed, 19 Oct 2016) Changed paths: M po/tr.po Log Message: ----------- Translated using Weblate (Turkish) Currently translated at 100.0% (3218 of 3218 strings) [CI skip] Commit: 9aa081f46e0b45a6daed4215b52c2ae967baa5d3 https://github.com/phpmyadmin/phpmyadmin/commit/9aa081f46e0b45a6daed4215b52… Author: Stefano Martinelli <stefano.ste.martinelli(a)gmail.com> Date: 2016-10-19 (Wed, 19 Oct 2016) Changed paths: M po/it.po Log Message: ----------- Translated using Weblate (Italian) Currently translated at 100.0% (3218 of 3218 strings) [CI skip] Commit: c367f93aa8655f9a4be9874f74f7ff8a306f810f https://github.com/phpmyadmin/phpmyadmin/commit/c367f93aa8655f9a4be9874f74f… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-20 (Thu, 20 Oct 2016) Changed paths: M js/functions.js M js/messages.php M js/tbl_change.js Log Message: ----------- Allow for all MySQL values of TIME data type We show slider only for occasionally used times from 00:00:00 to 23:59:59, but allow for other times when entered by inputting directly in the textbox. Fix #12637 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: c32dda730553a5662fd8275a959cbe0d402adb59 https://github.com/phpmyadmin/phpmyadmin/commit/c32dda730553a5662fd8275a959… Author: dingo thirteen <dingo13(a)gmail.com> Date: 2016-10-21 (Fri, 21 Oct 2016) Changed paths: M po/nl.po Log Message: ----------- Translated using Weblate (Dutch) Currently translated at 100.0% (3218 of 3218 strings) [CI skip] Commit: 0c1a5132765f8c1bcb56f9c177d3de988e485621 https://github.com/phpmyadmin/phpmyadmin/commit/0c1a5132765f8c1bcb56f9c177d… Author: Reksa Suhud Tri Atmojo <reksasuhud(a)yahoo.co.id> Date: 2016-10-22 (Sat, 22 Oct 2016) Changed paths: M po/id.po Log Message: ----------- Translated using Weblate (Indonesian) Currently translated at 69.3% (2233 of 3218 strings) [CI skip] Commit: 0e6a6122e484af67e50c271f81cc79544e4844b9 https://github.com/phpmyadmin/phpmyadmin/commit/0e6a6122e484af67e50c271f81c… Author: SDSkyKlouD <koongchi135(a)gmail.com> Date: 2016-10-22 (Sat, 22 Oct 2016) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 80.2% (2572 of 3206 strings) [CI skip] Commit: ef6a76abe8a92428f480b02ddd4e482d08e617ee https://github.com/phpmyadmin/phpmyadmin/commit/ef6a76abe8a92428f480b02ddd4… Author: Артем <artem_ibatullin(a)mail.ru> Date: 2016-10-22 (Sat, 22 Oct 2016) Changed paths: M po/ru.po Log Message: ----------- Translated using Weblate (Russian) Currently translated at 97.7% (3145 of 3218 strings) [CI skip] Commit: b2605dfcbf93040971dca7bdd5f554c66ee99716 https://github.com/phpmyadmin/phpmyadmin/commit/b2605dfcbf93040971dca7bdd5f… Author: Raphaël Barman <raphdu57(a)gmail.com> Date: 2016-10-24 (Mon, 24 Oct 2016) Changed paths: M po/fr.po Log Message: ----------- Translated using Weblate (French) Currently translated at 99.3% (3198 of 3218 strings) [CI skip] Commit: 47078395c2aea3d63f1b72d2d26afbd85e2f12f5 https://github.com/phpmyadmin/phpmyadmin/commit/47078395c2aea3d63f1b72d2d26… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-24 (Mon, 24 Oct 2016) Changed paths: M ChangeLog M README.rst M doc/setup.rst M index.php M js/console.js M js/pmd/move.js M js/tbl_change.js M libraries/Advisor.php M libraries/Table.php M libraries/common.inc.php M libraries/config/ConfigFile.php M libraries/config/Validator.php M libraries/plugins/export/ExportSql.php M libraries/relation.lib.php M libraries/replication.inc.php M libraries/server_privileges.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(a)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(a)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(a)latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po M prefs_manage.php M server_replication.php M tbl_export.php M tbl_operations.php M test/classes/TableTest.php M test/classes/config/ConfigFileTest.php M test/classes/plugin/export/ExportSqlTest.php Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: 694d846b6423f27ccf95616d9bdf5aa95e16bf02 https://github.com/phpmyadmin/phpmyadmin/commit/694d846b6423f27ccf95616d9bd… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-24 (Mon, 24 Oct 2016) Changed paths: M js/console.js Log Message: ----------- ajaxOptions.dataType can also return multiple space-separated values Ref : http://api.jquery.com/jQuery.ajax/#jQuery-ajax-settings Fix error in d344a8f Fix #12454 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 8250f8e030c66658ecf1b567017a363230df6d7f https://github.com/phpmyadmin/phpmyadmin/commit/8250f8e030c66658ecf1b567017… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-24 (Mon, 24 Oct 2016) Changed paths: M ChangeLog Log Message: ----------- Fix typo in ChangeLog Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 32db2e418c60f7f861b235ff2e871efc6842a92a https://github.com/phpmyadmin/phpmyadmin/commit/32db2e418c60f7f861b235ff2e8… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-24 (Mon, 24 Oct 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog for #12454 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 25baf8dd85793f5a3659d6307448afe99399d63d https://github.com/phpmyadmin/phpmyadmin/commit/25baf8dd85793f5a3659d630744… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-24 (Mon, 24 Oct 2016) Changed paths: M po/fr.po Log Message: ----------- Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 Commit: 1ec99a431b3d67efc2a0c90a8621b204ab9e6da0 https://github.com/phpmyadmin/phpmyadmin/commit/1ec99a431b3d67efc2a0c90a862… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-25 (Tue, 25 Oct 2016) Changed paths: M ChangeLog M libraries/sql-parser/src/Components/CreateDefinition.php M libraries/sql-parser/src/Components/Expression.php M libraries/sql-parser/src/Components/JoinKeyword.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/Lexer.php M libraries/sql-parser/src/Parser.php M libraries/sql-parser/src/Statements/SelectStatement.php M libraries/sql-parser/src/Token.php Log Message: ----------- Update SQL parser to 3.4.11 - issue #12344 Fixed parsing of labels in loop - issue #12228 Fixed parsing of BEGIN labels Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 1793a4547b1da1e6ae043851d384f97025e0a540 https://github.com/phpmyadmin/phpmyadmin/commit/1793a4547b1da1e6ae043851d38… Author: Domen <mitenem(a)outlook.com> Date: 2016-10-25 (Tue, 25 Oct 2016) Changed paths: M po/sl.po Log Message: ----------- Translated using Weblate (Slovenian) Currently translated at 99.6% (3207 of 3218 strings) [CI skip] Commit: 10ef1af71ef73168ebb1671dcb0dfe8e330ebdee https://github.com/phpmyadmin/phpmyadmin/commit/10ef1af71ef73168ebb1671dcb0… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-25 (Tue, 25 Oct 2016) Changed paths: M po/sl.po Log Message: ----------- Translated using Weblate (Slovenian) Currently translated at 99.6% (3218 of 3218 strings) [CI skip] Commit: 83c0873570a4ddb5dd5342e3ef60ef831738b511 https://github.com/phpmyadmin/phpmyadmin/commit/83c0873570a4ddb5dd5342e3ef6… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-25 (Tue, 25 Oct 2016) Changed paths: M js/functions.js M js/messages.php M js/tbl_change.js Log Message: ----------- Merge pull request #12654 from devenbansod/fix_12637 Allow for all MySQL values of TIME data type Commit: cefb072fea955b56e492c55fec673460e01cc21a https://github.com/phpmyadmin/phpmyadmin/commit/cefb072fea955b56e492c55fec6… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-25 (Tue, 25 Oct 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #12654 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 287cd624970d68a083309523939891450f94646c https://github.com/phpmyadmin/phpmyadmin/commit/287cd624970d68a083309523939… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-25 (Tue, 25 Oct 2016) Changed paths: M js/pmd/move.js Log Message: ----------- Merge pull request #12648 from devenbansod/fix_12622 Fix submission of 'Save page' form using Enter keypress Commit: 0983ff058663e5f7aec1f635d5a9ed9f8785a822 https://github.com/phpmyadmin/phpmyadmin/commit/0983ff058663e5f7aec1f635d5a… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-25 (Tue, 25 Oct 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #12648 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 2c91327374674061f43fd0b2feb335c251d8a9fc https://github.com/phpmyadmin/phpmyadmin/commit/2c91327374674061f43fd0b2feb… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-25 (Tue, 25 Oct 2016) Changed paths: M libraries/DisplayResults.php M libraries/Table.php Log Message: ----------- Merge pull request #12626 from madhuracj/bug12234 Fix bug #12234 No page indicator in view Commit: a33693bb8e6fd03faceeb2218821a181ed46a313 https://github.com/phpmyadmin/phpmyadmin/commit/a33693bb8e6fd03faceeb221882… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-25 (Tue, 25 Oct 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #12334 and #12626 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: a6dd27897ee819155625a3a17262298f6de45335 https://github.com/phpmyadmin/phpmyadmin/commit/a6dd27897ee819155625a3a1726… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-25 (Tue, 25 Oct 2016) Changed paths: R phpdox.xml Log Message: ----------- Remove no longer used file The docs is now generated using ApiGen. See also phpmyadmin/docker#78 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: b31c304459c5da18db59f55d1a2c8c77fed74d1f https://github.com/phpmyadmin/phpmyadmin/commit/b31c304459c5da18db59f55d1a2… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-25 (Tue, 25 Oct 2016) Changed paths: M ChangeLog M js/console.js M js/functions.js M js/messages.php M js/pmd/move.js M js/tbl_change.js M libraries/DisplayResults.php M libraries/Table.php M libraries/sql-parser/src/Components/CreateDefinition.php M libraries/sql-parser/src/Components/Expression.php M libraries/sql-parser/src/Components/JoinKeyword.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/Lexer.php M libraries/sql-parser/src/Parser.php M libraries/sql-parser/src/Statements/SelectStatement.php M libraries/sql-parser/src/Token.php R phpdox.xml M po/sl.po Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: 9e0e8a4bf1e770d7221a991e6c4e4219cff807af https://github.com/phpmyadmin/phpmyadmin/commit/9e0e8a4bf1e770d7221a991e6c4… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-25 (Tue, 25 Oct 2016) Changed paths: M po/af.po M po/ar.po M po/az.po M po/be.po M po/be(a)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(a)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(a)latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po Log Message: ----------- Update po files [CI skip] Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: cc50e75e31fbcbabcbc68b9ace6d3a1ed4a60a4c https://github.com/phpmyadmin/phpmyadmin/commit/cc50e75e31fbcbabcbc68b9ace6… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-26 (Wed, 26 Oct 2016) Changed paths: M js/tbl_change.js Log Message: ----------- Allow for partial dates on Insert page and while editing a row (via Edit Row link) Issue #12651 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: c2f7f82a98cdb8e54b3a2bf9a06c12f4b1b9963c https://github.com/phpmyadmin/phpmyadmin/commit/c2f7f82a98cdb8e54b3a2bf9a06… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-26 (Wed, 26 Oct 2016) Changed paths: M js/functions.js M js/makegrid.js Log Message: ----------- If date is invalid acc to datePicker plugin, close the UI There are partial dates like '0000-00-00', '2016-00-00' etc. which are rejected by the Datetimepicker JQuery plugin, but can be accepted by MySQL server Fix #12651 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 11575ad95973f8bd0b0f6d82e5829e540424f02d https://github.com/phpmyadmin/phpmyadmin/commit/11575ad95973f8bd0b0f6d82e58… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-26 (Wed, 26 Oct 2016) Changed paths: M js/functions.js M js/messages.php Log Message: ----------- Add tooltip for acceptance of additional values Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 95c23da6e01c54749d0942c90ecde2354bd23a8b https://github.com/phpmyadmin/phpmyadmin/commit/95c23da6e01c54749d0942c90ec… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-27 (Thu, 27 Oct 2016) Changed paths: M js/functions.js Log Message: ----------- Close the UI for invalid 'time' values too Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: e7e8c9a5b470567cd1ee7acc5165745a84801979 https://github.com/phpmyadmin/phpmyadmin/commit/e7e8c9a5b470567cd1ee7acc516… Author: Παναγιώτης Παπάζογλου <papaz_p(a)yahoo.com> Date: 2016-10-27 (Thu, 27 Oct 2016) Changed paths: M po/el.po Log Message: ----------- Translated using Weblate (Greek) Currently translated at 100.0% (3219 of 3219 strings) [CI skip] Commit: d44caac678404e5ff8b0020a350a84f0d8d711cd https://github.com/phpmyadmin/phpmyadmin/commit/d44caac678404e5ff8b0020a350… Author: Weblate <noreply(a)weblate.org> Date: 2016-10-27 (Thu, 27 Oct 2016) Changed paths: M ChangeLog Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: 74db20cc9e292ae8725f7b34681ecdfb59beed19 https://github.com/phpmyadmin/phpmyadmin/commit/74db20cc9e292ae8725f7b34681… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-27 (Thu, 27 Oct 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog for #12610 Fix #12610 , with updating of SQL Parser to 3.4.11 in 1ec99a Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: b249cdbc9554908fd709fcbd811c584c5b36939c https://github.com/phpmyadmin/phpmyadmin/commit/b249cdbc9554908fd709fcbd811… Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: 2016-10-27 (Thu, 27 Oct 2016) Changed paths: M po/tr.po Log Message: ----------- Translated using Weblate (Turkish) Currently translated at 100.0% (3219 of 3219 strings) [CI skip] Commit: 8f29910c035a99892d84ff395e5bcdb96ef30f8b https://github.com/phpmyadmin/phpmyadmin/commit/8f29910c035a99892d84ff395e5… Author: dingo thirteen <dingo13(a)gmail.com> Date: 2016-10-27 (Thu, 27 Oct 2016) Changed paths: M po/nl.po Log Message: ----------- Translated using Weblate (Dutch) Currently translated at 100.0% (3219 of 3219 strings) [CI skip] Commit: e0195f1928486d99a3321710f47bc4f37e5e24c4 https://github.com/phpmyadmin/phpmyadmin/commit/e0195f1928486d99a3321710f47… Author: Stefano Martinelli <stefano.ste.martinelli(a)gmail.com> Date: 2016-10-27 (Thu, 27 Oct 2016) Changed paths: M po/it.po Log Message: ----------- Translated using Weblate (Italian) Currently translated at 100.0% (3219 of 3219 strings) [CI skip] Commit: 077a79b5ce1b85518d4348830bc2e5a7cd41ef03 https://github.com/phpmyadmin/phpmyadmin/commit/077a79b5ce1b85518d4348830bc… Author: Stefano Martinelli <stefano.ste.martinelli(a)gmail.com> Date: 2016-10-27 (Thu, 27 Oct 2016) Changed paths: M po/it.po Log Message: ----------- Translated using Weblate (Italian) Currently translated at 100.0% (3219 of 3219 strings) [CI skip] Commit: e4fe53217eb023c7d98ed0d512fd13b0ab9ec201 https://github.com/phpmyadmin/phpmyadmin/commit/e4fe53217eb023c7d98ed0d512f… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-27 (Thu, 27 Oct 2016) Changed paths: M libraries/Footer.php Log Message: ----------- Try adding query to history only if Database links are available Fix #12661 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: c5d3b0bbb0c4bd21c9af601a0f623e0c2fb00691 https://github.com/phpmyadmin/phpmyadmin/commit/c5d3b0bbb0c4bd21c9af601a0f6… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-27 (Thu, 27 Oct 2016) Changed paths: M po/el.po M po/it.po M po/nl.po M po/tr.po Log Message: ----------- Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 Commit: 368b74bad68b054946ed7044c5e5d783ed5a8cea https://github.com/phpmyadmin/phpmyadmin/commit/368b74bad68b054946ed7044c5e… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-27 (Thu, 27 Oct 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog for #12661 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 3e9c30a5617b76ced1d25c7c046cb419ff504f37 https://github.com/phpmyadmin/phpmyadmin/commit/3e9c30a5617b76ced1d25c7c046… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-28 (Fri, 28 Oct 2016) Changed paths: M doc/faq.rst Log Message: ----------- Document prevention of errors with import of ROW_FORMAT=fixed in newer MySQL versions See https://github.com/phpmyadmin/phpmyadmin/issues/12195#issuecomment-256849353 Fix #12195 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 2fbf09ba2d7b8e75744b4cac2a7325bc68da126a https://github.com/phpmyadmin/phpmyadmin/commit/2fbf09ba2d7b8e75744b4cac2a7… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-28 (Fri, 28 Oct 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog for #12195 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: f14cffdbe700a80b2b1e49f51da8867ac6246a6e https://github.com/phpmyadmin/phpmyadmin/commit/f14cffdbe700a80b2b1e49f51da… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-29 (Sat, 29 Oct 2016) Changed paths: M db_operations.php M db_tracking.php M import.php M libraries/DatabaseInterface.php M libraries/DbSearch.php M libraries/DisplayResults.php M libraries/Menu.php M libraries/Partition.php M libraries/RecentFavoriteTable.php M libraries/SavedSearches.php M libraries/SystemDatabase.php M libraries/Table.php M libraries/Tracker.php M libraries/Util.php M libraries/bookmark.lib.php M libraries/central_columns.lib.php M libraries/common.inc.php M libraries/controllers/server/ServerVariablesController.php M libraries/controllers/table/TableSearchController.php M libraries/controllers/table/TableStructureController.php M libraries/create_addfield.lib.php M libraries/db_designer.lib.php M libraries/db_table_exists.lib.php M libraries/dbi/DBIDummy.php M libraries/dbi/DBIExtension.php M libraries/dbi/DBIMysql.php M libraries/dbi/DBIMysqli.php M libraries/display_export.lib.php M libraries/export.lib.php M libraries/import.lib.php M libraries/insert_edit.lib.php M libraries/mysql_charsets.lib.php M libraries/navigation/Navigation.php M libraries/navigation/NavigationTree.php M libraries/navigation/nodes/Node.php M libraries/navigation/nodes/NodeDatabase.php M libraries/navigation/nodes/NodeTable.php M libraries/operations.lib.php M libraries/plugins/export/ExportSql.php M libraries/plugins/export/ExportXml.php M libraries/plugins/import/ImportCsv.php M libraries/plugins/import/ImportLdi.php M libraries/plugins/schema/pdf/Pdf.php M libraries/pmd_common.php M libraries/relation.lib.php M libraries/relation_cleanup.lib.php M libraries/replication.inc.php M libraries/replication_gui.lib.php M libraries/rte/rte_events.lib.php M libraries/rte/rte_routines.lib.php M libraries/rte/rte_triggers.lib.php M libraries/server_privileges.lib.php M libraries/server_status_monitor.lib.php M libraries/server_user_groups.lib.php M libraries/sql.lib.php M libraries/tracking.lib.php M libraries/transformations.lib.php M libraries/user_preferences.lib.php M test/classes/plugin/import/ImportLdiTest.php M test/libraries/PMA_server_privileges_test.php M user_password.php Log Message: ----------- Properly escape strings in MySQL statement values Use *_real_escape string functions provided by connectors to escape strings while exporting Fix #12453 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Conflicts: libraries/server_privileges.lib.php Commit: d5c9a193f48026b21cd5ff77c130300b3fbc568e https://github.com/phpmyadmin/phpmyadmin/commit/d5c9a193f48026b21cd5ff77c13… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-29 (Sat, 29 Oct 2016) Changed paths: M phpunit.xml.dist M test/classes/TableTest.php M test/classes/ThemeManagerTest.php M test/classes/TrackerTest.php Log Message: ----------- Fix tests for Table, ThemeManager, Tracker classes Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: bd449f740512ce10de9ac00a9970d6ee80d85ab4 https://github.com/phpmyadmin/phpmyadmin/commit/bd449f740512ce10de9ac00a997… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-29 (Sat, 29 Oct 2016) Changed paths: M test/classes/controllers/TableSearchControllerTest.php M test/classes/navigation/NavigationTest.php Log Message: ----------- Fix tests in Navigation, TableSearchController Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 1475c0e8117f4b07a69740924c0bcf4d2802732f https://github.com/phpmyadmin/phpmyadmin/commit/1475c0e8117f4b07a69740924c0… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-30 (Sun, 30 Oct 2016) Changed paths: M templates/table/relation/common_form.phtml M templates/table/relation/foreign_key_row.phtml Log Message: ----------- Allow Foreign keys to be added on non-indexed columns, if it's an InnoDB table InnoDB automatically creates an index over the column, which can be replaced by defining a new index over the same column. Fix #12665 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 8556b5d4bf9dc2f2740d5fba81fbc64e2718f111 https://github.com/phpmyadmin/phpmyadmin/commit/8556b5d4bf9dc2f2740d5fba81f… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-30 (Sun, 30 Oct 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog for #12665 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 9be7c55bd090da99c5c6747d0bf6f530e66893e9 https://github.com/phpmyadmin/phpmyadmin/commit/9be7c55bd090da99c5c6747d0bf… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-01 (Tue, 01 Nov 2016) Changed paths: M libraries/Table.php M test/classes/TableTest.php Log Message: ----------- Allow for proper MySQL-allowed strings as identifiers Fix #12674 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 956f3179cbb6a75b1bc5e5768684e377275e5ece https://github.com/phpmyadmin/phpmyadmin/commit/956f3179cbb6a75b1bc5e576868… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-04 (Fri, 04 Nov 2016) Changed paths: M libraries/DatabaseInterface.php M libraries/DbSearch.php M libraries/db_table_exists.lib.php M phpunit.xml.dist M test/classes/DbSearchTest.php M test/classes/navigation/NavigationTest.php M test/classes/plugin/export/ExportHtmlwordTest.php M test/classes/plugin/export/ExportOdtTest.php M test/classes/plugin/export/ExportSqlTest.php M test/classes/plugin/export/ExportTexytextTest.php Log Message: ----------- Fix Navigation tests and Export tests Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 00bfc9d45de0f73e0db16056edad0e9e3b1c95ef https://github.com/phpmyadmin/phpmyadmin/commit/00bfc9d45de0f73e0db16056eda… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-04 (Fri, 04 Nov 2016) Changed paths: M phpunit.xml.dist Log Message: ----------- Fixed regressive change in phpunit config file Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 6a79e7c0c05dea6a0f0f90daba5dcc5be116c22d https://github.com/phpmyadmin/phpmyadmin/commit/6a79e7c0c05dea6a0f0f90daba5… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-04 (Fri, 04 Nov 2016) Changed paths: M test/classes/navigation/NodeTest.php M test/classes/plugin/export/ExportXmlTest.php M test/classes/plugin/import/ImportOdsTest.php Log Message: ----------- Fixed some tests in Export, Import and Node Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 46d3f940d7960d40d018179d659453d0630002e7 https://github.com/phpmyadmin/phpmyadmin/commit/46d3f940d7960d40d018179d659… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-04 (Fri, 04 Nov 2016) Changed paths: M test/libraries/PMA_PMD_common_test.php Log Message: ----------- Fixed test errors in PMD_Common tests Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: fe71fbda566eb5e22c82032214061f129c8b66bf https://github.com/phpmyadmin/phpmyadmin/commit/fe71fbda566eb5e22c820322140… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-04 (Fri, 04 Nov 2016) Changed paths: M test/libraries/PMA_central_columns_test.php Log Message: ----------- Fixed tests in Central Columns Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 675186ee003e5ed480db9b962149e94a52a28274 https://github.com/phpmyadmin/phpmyadmin/commit/675186ee003e5ed480db9b96214… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-04 (Fri, 04 Nov 2016) Changed paths: M test/classes/plugin/export/ExportXmlTest.php M test/libraries/PMA_designer_test.php M test/libraries/PMA_insert_edit_test.php M test/libraries/PMA_server_user_groups_test.php M test/libraries/PMA_user_preferences_test.php Log Message: ----------- Fixed tests in Designer, Insert edit for, UserGroups, User preferences Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 02dcfc81982f97e0e41d5326ea7028ab35154d97 https://github.com/phpmyadmin/phpmyadmin/commit/02dcfc81982f97e0e41d5326ea7… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-04 (Fri, 04 Nov 2016) Changed paths: M test/classes/TrackerTest.php M test/classes/plugin/export/ExportLatexTest.php M test/classes/plugin/export/ExportXmlTest.php M test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php Log Message: ----------- Fix errors with TrackerTest Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 8b6e102cf77a53bb4fffd2a59a04afbc616aac16 https://github.com/phpmyadmin/phpmyadmin/commit/8b6e102cf77a53bb4fffd2a59a0… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-04 (Fri, 04 Nov 2016) Changed paths: M phpunit.xml.dist M test/classes/plugin/export/ExportXmlTest.php Log Message: ----------- Fixed small error in XML test Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 8fbff5f19ecf959461b031e4c843ab2f426a3920 https://github.com/phpmyadmin/phpmyadmin/commit/8fbff5f19ecf959461b031e4c84… Author: Jørgen Thomsen <opensource(a)jth.net> Date: 2016-11-04 (Fri, 04 Nov 2016) Changed paths: M po/da.po Log Message: ----------- Translated using Weblate (Danish) Currently translated at 96.0% (3092 of 3219 strings) [CI skip] Commit: 3f48d9cb5f2059d25b750332d9388d6be764dd9d https://github.com/phpmyadmin/phpmyadmin/commit/3f48d9cb5f2059d25b750332d93… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-05 (Sat, 05 Nov 2016) Changed paths: M test/classes/TrackerTest.php M test/classes/plugin/export/ExportOdsTest.php M test/libraries/PMA_server_privileges_test.php Log Message: ----------- Fixed some more test errors Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 8badbe371a313e9b729bf9e492fa3890b1e11bcc https://github.com/phpmyadmin/phpmyadmin/commit/8badbe371a313e9b729bf9e492f… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-05 (Sat, 05 Nov 2016) Changed paths: M libraries/pmd_common.php Log Message: ----------- Don't urlencode the table and database names If used in encoded form, they are shown to be non-existent Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 5795f3d15a0df3435f64b4f170dda6d5e57be324 https://github.com/phpmyadmin/phpmyadmin/commit/5795f3d15a0df3435f64b4f170d… Author: Lee Joon Haeng <calmnoia(a)gmail.com> Date: 2016-11-06 (Sun, 06 Nov 2016) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 80.3% (2585 of 3219 strings) [CI skip] Commit: 0d03c97ce6fb2a6187a6d5c4fdcce6590376eb3e https://github.com/phpmyadmin/phpmyadmin/commit/0d03c97ce6fb2a6187a6d5c4fdc… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-06 (Sun, 06 Nov 2016) Changed paths: M test/classes/plugin/export/ExportOdsTest.php M test/classes/plugin/export/ExportSqlTest.php Log Message: ----------- Fix more test errors Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 28a658fda035d87faf5600f94bc8346e51a5208e https://github.com/phpmyadmin/phpmyadmin/commit/28a658fda035d87faf5600f94bc… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-07 (Mon, 07 Nov 2016) Changed paths: M test/classes/plugin/export/ExportSqlTest.php Log Message: ----------- Fix more tests Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 67501106e0fa6699c95eba039d2688d72ae219ce https://github.com/phpmyadmin/phpmyadmin/commit/67501106e0fa6699c95eba039d2… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-07 (Mon, 07 Nov 2016) Changed paths: M test/classes/plugin/export/ExportSqlTest.php M test/libraries/PMA_server_privileges_test.php Log Message: ----------- clear some more tests Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 14317c77347d54da1ad2454a19c083598b65555f https://github.com/phpmyadmin/phpmyadmin/commit/14317c77347d54da1ad2454a19c… Author: popinha13 <apolonio.serafim(a)hotmail.com> Date: 2016-11-07 (Mon, 07 Nov 2016) Changed paths: M po/pt_BR.po Log Message: ----------- Translated using Weblate (Portuguese (Brazil)) Currently translated at 93.1% (2998 of 3219 strings) [CI skip] Commit: eb5fa46b0ce010541c3a2996d10ddde7640c4c39 https://github.com/phpmyadmin/phpmyadmin/commit/eb5fa46b0ce010541c3a2996d10… Author: Guilherme Rocha <guilherme(a)candiba.net> Date: 2016-11-07 (Mon, 07 Nov 2016) Changed paths: M po/pt_BR.po Log Message: ----------- Translated using Weblate (Portuguese (Brazil)) Currently translated at 93.1% (2999 of 3219 strings) [CI skip] Commit: 06e9b62a2572da393db464896c7c7fd054350fae https://github.com/phpmyadmin/phpmyadmin/commit/06e9b62a2572da393db464896c7… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-07 (Mon, 07 Nov 2016) Changed paths: M test/classes/plugin/export/ExportSqlTest.php M test/libraries/PMA_server_privileges_test.php Log Message: ----------- Remove tests against unsupported versions Remove duplicate test, fix other tests Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 1f439a4dcc133f7f87846f983c980145c16d65ca https://github.com/phpmyadmin/phpmyadmin/commit/1f439a4dcc133f7f87846f983c9… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-07 (Mon, 07 Nov 2016) Changed paths: M libraries/Table.php M libraries/relation.lib.php M test/classes/TableTest.php Log Message: ----------- Use a work around for testing if numRecords at least N Fix #12257 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 39abc62b3715531823047cb68fa607914bf88808 https://github.com/phpmyadmin/phpmyadmin/commit/39abc62b3715531823047cb68fa… Author: Prasna Lukito <prasnakuxing(a)gmail.com> Date: 2016-11-08 (Tue, 08 Nov 2016) Changed paths: M po/id.po Log Message: ----------- Translated using Weblate (Indonesian) Currently translated at 69.9% (2252 of 3219 strings) [CI skip] Commit: 8119464150081bcc18641281d62991bdff5feff7 https://github.com/phpmyadmin/phpmyadmin/commit/8119464150081bcc18641281d62… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-08 (Tue, 08 Nov 2016) Changed paths: M libraries/core.lib.php M test/libraries/core/PMA_sanitizeMySQLHost_test.php Log Message: ----------- Handle multiple `:p` while sanitizing MySQL hosts Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 1503912dc14ba189138460329b85cd0fdd5638e6 https://github.com/phpmyadmin/phpmyadmin/commit/1503912dc14ba189138460329b8… Author: Nils Van Zuijlen <nilsdu29(a)gmail.com> Date: 2016-11-08 (Tue, 08 Nov 2016) Changed paths: M po/br.po Log Message: ----------- Translated using Weblate (Breton) Currently translated at 16.9% (547 of 3219 strings) [CI skip] Commit: dec24a713e9c3404456eddffedb4506a9a63a1cb https://github.com/phpmyadmin/phpmyadmin/commit/dec24a713e9c3404456eddffedb… Author: Nils Van Zuijlen <nilsdu29(a)gmail.com> Date: 2016-11-08 (Tue, 08 Nov 2016) Changed paths: M po/fr.po Log Message: ----------- Translated using Weblate (French) Currently translated at 99.5% (3205 of 3219 strings) [CI skip] Commit: 1fcfdb99637d83166c7beffa72286307daf58451 https://github.com/phpmyadmin/phpmyadmin/commit/1fcfdb99637d83166c7beffa722… Author: Lee Joon Haeng <calmnoia(a)gmail.com> Date: 2016-11-08 (Tue, 08 Nov 2016) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 80.5% (2592 of 3219 strings) [CI skip] Commit: 80ad2da2b844a7a565aaf8956fe9aae1633546ae https://github.com/phpmyadmin/phpmyadmin/commit/80ad2da2b844a7a565aaf8956fe… Author: popinha13 <apolonio.serafim(a)hotmail.com> Date: 2016-11-08 (Tue, 08 Nov 2016) Changed paths: M po/pt_BR.po Log Message: ----------- Translated using Weblate (Portuguese (Brazil)) Currently translated at 93.2% (3001 of 3219 strings) [CI skip] Commit: ff3dd9017246529e4fc73ec408ec3075d2046dab https://github.com/phpmyadmin/phpmyadmin/commit/ff3dd9017246529e4fc73ec408e… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-08 (Tue, 08 Nov 2016) Changed paths: M libraries/pmd_common.php Log Message: ----------- Remove unused deubgging calls Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 7b4f4a1bff0cc186e2fb46fe91e29d29405d73f6 https://github.com/phpmyadmin/phpmyadmin/commit/7b4f4a1bff0cc186e2fb46fe91e… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-08 (Tue, 08 Nov 2016) Changed paths: M po/id.po Log Message: ----------- Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 Commit: 303da921a2dbcdb035dcef06cc56285064123de2 https://github.com/phpmyadmin/phpmyadmin/commit/303da921a2dbcdb035dcef06cc5… Author: Weblate <noreply(a)weblate.org> Date: 2016-11-08 (Tue, 08 Nov 2016) Changed paths: M libraries/pmd_common.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: 38a804edde4b6f2b06c137eeef03d31958d6cace https://github.com/phpmyadmin/phpmyadmin/commit/38a804edde4b6f2b06c137eeef0… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-08 (Tue, 08 Nov 2016) Changed paths: M libraries/Table.php M test/classes/TableTest.php Log Message: ----------- Merge remote-tracking branch 'origin/pull/12678' into QA_4_6 Commit: af73f564ddc8fb160ea62f2c13911afc4ed45a1e https://github.com/phpmyadmin/phpmyadmin/commit/af73f564ddc8fb160ea62f2c139… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-08 (Tue, 08 Nov 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #12678 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 9df6c8258cb33c9834f8adbf6578f4f98ddd94a6 https://github.com/phpmyadmin/phpmyadmin/commit/9df6c8258cb33c9834f8adbf657… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-08 (Tue, 08 Nov 2016) Changed paths: M js/functions.js M js/makegrid.js M js/messages.php M js/tbl_change.js Log Message: ----------- Merge remote-tracking branch 'origin/pull/12666' into QA_4_6 Commit: 164176cbbe616027ca61fac66434a78064e90732 https://github.com/phpmyadmin/phpmyadmin/commit/164176cbbe616027ca61fac6643… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-08 (Tue, 08 Nov 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #12666 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 8babc66201f4f1e9c2a2852691a50f9b6389997d https://github.com/phpmyadmin/phpmyadmin/commit/8babc66201f4f1e9c2a2852691a… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-08 (Tue, 08 Nov 2016) Changed paths: M libraries/pmd_common.php Log Message: ----------- Merge remote-tracking branch 'origin/pull/12683' into QA_4_6 Commit: 583304a1321646d0f2fa67d156beef75832487e3 https://github.com/phpmyadmin/phpmyadmin/commit/583304a1321646d0f2fa67d156b… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-08 (Tue, 08 Nov 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #12683 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 636a38cf8a3572219c84e893ca5061eafffad7c5 https://github.com/phpmyadmin/phpmyadmin/commit/636a38cf8a3572219c84e893ca5… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-08 (Tue, 08 Nov 2016) Changed paths: M ChangeLog M doc/faq.rst M js/functions.js M js/makegrid.js M js/messages.php M js/tbl_change.js M libraries/Footer.php M libraries/Table.php M libraries/pmd_common.php M po/af.po M po/ar.po M po/az.po M po/be.po M po/be(a)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(a)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(a)latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po M templates/table/relation/common_form.phtml M templates/table/relation/foreign_key_row.phtml M test/classes/TableTest.php Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: cb7abad0b55fcbc991c223c7925a6d3f729d0939 https://github.com/phpmyadmin/phpmyadmin/commit/cb7abad0b55fcbc991c223c7925… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-09 (Wed, 09 Nov 2016) Changed paths: M libraries/DatabaseInterface.php M libraries/Util.php M libraries/rte/rte_list.lib.php M libraries/rte/rte_routines.lib.php M test/libraries/common/PMA_quoting_slashing_test.php M test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php Log Message: ----------- Remove call to old methods, fix tests Remove definition of old method. Remove related tests Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 2309ef57d2065277339513590b24b02d4115cc39 https://github.com/phpmyadmin/phpmyadmin/commit/2309ef57d2065277339513590b2… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-09 (Wed, 09 Nov 2016) Changed paths: M js/pmd/history.js M libraries/pmd_common.php Log Message: ----------- Add LEFT JOIN for different constraints If there are two or more columns in the same constraint (foreign key), we should use AND to concatenate the conditions on LEFT JOIN for both the columns Fix #12652 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 94ef1a4f7cdd46bb181719ed0d6deb9375e54043 https://github.com/phpmyadmin/phpmyadmin/commit/94ef1a4f7cdd46bb181719ed0d6… Author: Sevdimali İsa <sevdimaliisayev(a)mail.ru> Date: 2016-11-09 (Wed, 09 Nov 2016) Changed paths: M po/az.po Log Message: ----------- Translated using Weblate (Azerbaijani) Currently translated at 53.3% (1717 of 3219 strings) [CI skip] Commit: 9fb7293eef3a5c07a58a12ea571e3de0830ca9a9 https://github.com/phpmyadmin/phpmyadmin/commit/9fb7293eef3a5c07a58a12ea571… Author: Marc Delisle <marc(a)infomarc.info> Date: 2016-11-09 (Wed, 09 Nov 2016) Changed paths: M po/fr.po Log Message: ----------- Translated using Weblate (French) Currently translated at 99.7% (3211 of 3219 strings) [CI skip] Commit: 0404f09aceadd6df6be069f46336d293a271ada2 https://github.com/phpmyadmin/phpmyadmin/commit/0404f09aceadd6df6be069f4633… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-09 (Wed, 09 Nov 2016) Changed paths: M libraries/sql-parser/src/Components/CreateDefinition.php M libraries/sql-parser/src/Parser.php M libraries/sql-parser/src/Statement.php M libraries/sql-parser/src/Utils/Query.php Log Message: ----------- Update SQL parser to 3.4.12 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 2c90167a8aef20fcf36765fbcef42a612fc8f2e5 https://github.com/phpmyadmin/phpmyadmin/commit/2c90167a8aef20fcf36765fbcef… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-09 (Wed, 09 Nov 2016) Changed paths: M js/pmd/history.js M libraries/pmd_common.php Log Message: ----------- Merge remote-tracking branch 'origin/pull/12689' into QA_4_6 Commit: 3debbdd09b3b176bfb1686252ffc221de98e1eb4 https://github.com/phpmyadmin/phpmyadmin/commit/3debbdd09b3b176bfb1686252ff… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-09 (Wed, 09 Nov 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for 12689 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 7270a0c79547c9d6800373aa0aa6c4dbb54342d5 https://github.com/phpmyadmin/phpmyadmin/commit/7270a0c79547c9d6800373aa0aa… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-09 (Wed, 09 Nov 2016) Changed paths: M libraries/rte/rte_words.lib.php Log Message: ----------- Add missing punctionation See PR #12686 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 14ccebbd4b45f5f2962e853e0b185cf807034684 https://github.com/phpmyadmin/phpmyadmin/commit/14ccebbd4b45f5f2962e853e0b1… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-09 (Wed, 09 Nov 2016) Changed paths: M libraries/Table.php M libraries/relation.lib.php M test/classes/TableTest.php Log Message: ----------- Merge remote-tracking branch 'origin/pull/12685' into QA_4_6 Commit: 9b8758512e86b43029afec42683ec1a13052ef00 https://github.com/phpmyadmin/phpmyadmin/commit/9b8758512e86b43029afec42683… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-09 (Wed, 09 Nov 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #12685 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: ec08844246b19263feecd01b21b2aa61dac73701 https://github.com/phpmyadmin/phpmyadmin/commit/ec08844246b19263feecd01b21b… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M browse_foreigners.php M libraries/relation.lib.php Log Message: ----------- Use a forcing parameter to get $the_total records for a foreign key column Required at some specific places for ex. browse_foreigners.php (reqd for pagination) This is in continuation of original fix for #12257 (in #12685) Also fixed an error in an old commit 9880f573441fcac53e61ee17eeaf690c1e06ecb0 related to LIMIT clause generation Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 683c2dc291d2bcadf33423fccc7a097f83ba5f88 https://github.com/phpmyadmin/phpmyadmin/commit/683c2dc291d2bcadf33423fccc7… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M po/af.po M po/ar.po M po/az.po M po/be.po M po/be(a)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(a)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(a)latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po Log Message: ----------- Update po files [CI skip] Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 32a381d0a595ae03fde6e16a0dfabbe671fb85b2 https://github.com/phpmyadmin/phpmyadmin/commit/32a381d0a595ae03fde6e16a0df… Author: Roger Walt <roger.walt(a)gmail.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M libraries/Util.php M libraries/insert_edit.lib.php Log Message: ----------- Fixes #12322, no default function selected for foreignkey fields Signed-off-by: Roger Walt <roger.walt(a)gmail.com> Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 08840559ba6de7e16b89ae863816b45c7df8939f https://github.com/phpmyadmin/phpmyadmin/commit/08840559ba6de7e16b89ae86381… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M libraries/Util.php M libraries/rte/rte_routines.lib.php M test/libraries/PMA_insert_edit_test.php Log Message: ----------- Adjust code to changes in #12372 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 4cd1814469653510a36b52a4f7c20c35bc2fa686 https://github.com/phpmyadmin/phpmyadmin/commit/4cd1814469653510a36b52a4f7c… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #12372 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: c9348b682e5c002b293d36818d5035d0a5eb2f9f https://github.com/phpmyadmin/phpmyadmin/commit/c9348b682e5c002b293d36818d5… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M db_operations.php M db_tracking.php M import.php M libraries/DatabaseInterface.php M libraries/DbSearch.php M libraries/DisplayResults.php M libraries/Menu.php M libraries/Partition.php M libraries/RecentFavoriteTable.php M libraries/SavedSearches.php M libraries/SystemDatabase.php M libraries/Table.php M libraries/Tracker.php M libraries/Util.php M libraries/bookmark.lib.php M libraries/central_columns.lib.php M libraries/common.inc.php M libraries/controllers/server/ServerVariablesController.php M libraries/controllers/table/TableSearchController.php M libraries/controllers/table/TableStructureController.php M libraries/create_addfield.lib.php M libraries/db_designer.lib.php M libraries/db_table_exists.lib.php M libraries/dbi/DBIDummy.php M libraries/dbi/DBIExtension.php M libraries/dbi/DBIMysql.php M libraries/dbi/DBIMysqli.php M libraries/display_export.lib.php M libraries/export.lib.php M libraries/import.lib.php M libraries/insert_edit.lib.php M libraries/mysql_charsets.lib.php M libraries/navigation/Navigation.php M libraries/navigation/NavigationTree.php M libraries/navigation/nodes/Node.php M libraries/navigation/nodes/NodeDatabase.php M libraries/navigation/nodes/NodeTable.php M libraries/operations.lib.php M libraries/plugins/export/ExportSql.php M libraries/plugins/export/ExportXml.php M libraries/plugins/import/ImportCsv.php M libraries/plugins/import/ImportLdi.php M libraries/plugins/schema/pdf/Pdf.php M libraries/pmd_common.php M libraries/relation.lib.php M libraries/relation_cleanup.lib.php M libraries/replication.inc.php M libraries/replication_gui.lib.php M libraries/rte/rte_events.lib.php M libraries/rte/rte_list.lib.php M libraries/rte/rte_routines.lib.php M libraries/rte/rte_triggers.lib.php M libraries/server_privileges.lib.php M libraries/server_status_monitor.lib.php M libraries/server_user_groups.lib.php M libraries/sql.lib.php M libraries/tracking.lib.php M libraries/transformations.lib.php M libraries/user_preferences.lib.php M phpunit.xml.dist M test/classes/DbSearchTest.php M test/classes/TableTest.php M test/classes/ThemeManagerTest.php M test/classes/TrackerTest.php M test/classes/controllers/TableSearchControllerTest.php M test/classes/navigation/NavigationTest.php M test/classes/navigation/NodeTest.php M test/classes/plugin/export/ExportHtmlwordTest.php M test/classes/plugin/export/ExportLatexTest.php M test/classes/plugin/export/ExportOdsTest.php M test/classes/plugin/export/ExportOdtTest.php M test/classes/plugin/export/ExportSqlTest.php M test/classes/plugin/export/ExportTexytextTest.php M test/classes/plugin/export/ExportXmlTest.php M test/classes/plugin/import/ImportLdiTest.php M test/classes/plugin/import/ImportOdsTest.php M test/libraries/PMA_PMD_common_test.php M test/libraries/PMA_central_columns_test.php M test/libraries/PMA_designer_test.php M test/libraries/PMA_insert_edit_test.php M test/libraries/PMA_server_privileges_test.php M test/libraries/PMA_server_user_groups_test.php M test/libraries/PMA_user_preferences_test.php M test/libraries/common/PMA_quoting_slashing_test.php M test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php M test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php M user_password.php Log Message: ----------- Merge remote-tracking branch 'origin/pull/12564' into QA_4_6 Commit: ef0f08e7d311c106bea54c221b6b15e5d306914b https://github.com/phpmyadmin/phpmyadmin/commit/ef0f08e7d311c106bea54c221b6… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #12564 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: dd828ebce0e3a3f1af1a493c320178ff6f30d0c5 https://github.com/phpmyadmin/phpmyadmin/commit/dd828ebce0e3a3f1af1a493c320… Author: Stefano Martinelli <stefano.ste.martinelli(a)gmail.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M po/it.po Log Message: ----------- Translated using Weblate (Italian) Currently translated at 100.0% (3222 of 3222 strings) [CI skip] Commit: f4c0331202450d69ba63975e7216887666d29172 https://github.com/phpmyadmin/phpmyadmin/commit/f4c0331202450d69ba63975e721… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M po/it.po Log Message: ----------- Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 Commit: 970de0ac7abe8a4d81333dac3329720f4263654a https://github.com/phpmyadmin/phpmyadmin/commit/970de0ac7abe8a4d81333dac332… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M ChangeLog M browse_foreigners.php M db_operations.php M db_tracking.php M import.php M js/pmd/history.js M libraries/DatabaseInterface.php M libraries/DbSearch.php M libraries/DisplayResults.php M libraries/Menu.php M libraries/Partition.php M libraries/RecentFavoriteTable.php M libraries/SavedSearches.php M libraries/SystemDatabase.php M libraries/Table.php M libraries/Tracker.php M libraries/Util.php M libraries/bookmark.lib.php M libraries/central_columns.lib.php M libraries/common.inc.php M libraries/controllers/server/ServerVariablesController.php M libraries/controllers/table/TableSearchController.php M libraries/controllers/table/TableStructureController.php M libraries/create_addfield.lib.php M libraries/db_designer.lib.php M libraries/db_table_exists.lib.php M libraries/dbi/DBIDummy.php M libraries/dbi/DBIExtension.php M libraries/dbi/DBIMysql.php M libraries/dbi/DBIMysqli.php M libraries/display_export.lib.php M libraries/export.lib.php M libraries/import.lib.php M libraries/insert_edit.lib.php M libraries/mysql_charsets.lib.php M libraries/navigation/Navigation.php M libraries/navigation/NavigationTree.php M libraries/navigation/nodes/Node.php M libraries/navigation/nodes/NodeDatabase.php M libraries/navigation/nodes/NodeTable.php M libraries/operations.lib.php M libraries/plugins/export/ExportSql.php M libraries/plugins/export/ExportXml.php M libraries/plugins/import/ImportCsv.php M libraries/plugins/import/ImportLdi.php M libraries/plugins/schema/pdf/Pdf.php M libraries/pmd_common.php M libraries/relation.lib.php M libraries/relation_cleanup.lib.php M libraries/replication.inc.php M libraries/replication_gui.lib.php M libraries/rte/rte_events.lib.php M libraries/rte/rte_list.lib.php M libraries/rte/rte_routines.lib.php M libraries/rte/rte_triggers.lib.php M libraries/rte/rte_words.lib.php M libraries/server_privileges.lib.php M libraries/server_status_monitor.lib.php M libraries/server_user_groups.lib.php M libraries/sql-parser/src/Components/CreateDefinition.php M libraries/sql-parser/src/Parser.php M libraries/sql-parser/src/Statement.php M libraries/sql-parser/src/Utils/Query.php M libraries/sql.lib.php M libraries/tracking.lib.php M libraries/transformations.lib.php M libraries/user_preferences.lib.php M phpunit.xml.dist M po/af.po M po/ar.po M po/az.po M po/be.po M po/be(a)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(a)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(a)latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po M test/classes/DbSearchTest.php M test/classes/TableTest.php M test/classes/ThemeManagerTest.php M test/classes/TrackerTest.php M test/classes/controllers/TableSearchControllerTest.php M test/classes/navigation/NavigationTest.php M test/classes/navigation/NodeTest.php M test/classes/plugin/export/ExportHtmlwordTest.php M test/classes/plugin/export/ExportLatexTest.php M test/classes/plugin/export/ExportOdsTest.php M test/classes/plugin/export/ExportOdtTest.php M test/classes/plugin/export/ExportSqlTest.php M test/classes/plugin/export/ExportTexytextTest.php M test/classes/plugin/export/ExportXmlTest.php M test/classes/plugin/import/ImportLdiTest.php M test/classes/plugin/import/ImportOdsTest.php M test/libraries/PMA_PMD_common_test.php M test/libraries/PMA_central_columns_test.php M test/libraries/PMA_designer_test.php M test/libraries/PMA_insert_edit_test.php M test/libraries/PMA_server_privileges_test.php M test/libraries/PMA_server_user_groups_test.php M test/libraries/PMA_user_preferences_test.php M test/libraries/common/PMA_quoting_slashing_test.php M test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php M test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php M user_password.php Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: b83b71d5a555857299b50a097155307028915941 https://github.com/phpmyadmin/phpmyadmin/commit/b83b71d5a555857299b50a09715… Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M po/tr.po Log Message: ----------- Translated using Weblate (Turkish) Currently translated at 100.0% (3222 of 3222 strings) [CI skip] Commit: 35c7c8039fbfc5680584f01f596d5ea47294369c https://github.com/phpmyadmin/phpmyadmin/commit/35c7c8039fbfc5680584f01f596… Author: Παναγιώτης Παπάζογλου <papaz_p(a)yahoo.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M po/el.po Log Message: ----------- Translated using Weblate (Greek) Currently translated at 100.0% (3222 of 3222 strings) [CI skip] Commit: f7c8cd72a2611745f0bb3f44cced234c3c8414e8 https://github.com/phpmyadmin/phpmyadmin/commit/f7c8cd72a2611745f0bb3f44cce… Author: dingo thirteen <dingo13(a)gmail.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M po/nl.po Log Message: ----------- Translated using Weblate (Dutch) Currently translated at 100.0% (3222 of 3222 strings) [CI skip] Commit: f80140c46e7e3df31dd5450b60136518b8ac1f0a https://github.com/phpmyadmin/phpmyadmin/commit/f80140c46e7e3df31dd5450b601… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-11 (Fri, 11 Nov 2016) Changed paths: M libraries/server_privileges.lib.php M test/libraries/PMA_server_privileges_test.php Log Message: ----------- Fix function parameters in b12411cc2466639e7684c8414e65e19b8d170cc7 Fix #12542 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: dd45b97264c7273bef4cd026809b04a03ce726b6 https://github.com/phpmyadmin/phpmyadmin/commit/dd45b97264c7273bef4cd026809… Author: Giovanni Sora <g.sora(a)tiscali.it> Date: 2016-11-11 (Fri, 11 Nov 2016) Changed paths: M po/ia.po Log Message: ----------- Translated using Weblate (Interlingua) Currently translated at 74.6% (2406 of 3222 strings) [CI skip] Commit: fcc4537d932321f3ad6c78754210b9bdf1f498eb https://github.com/phpmyadmin/phpmyadmin/commit/fcc4537d932321f3ad6c7875421… Author: Domen <mitenem(a)outlook.com> Date: 2016-11-11 (Fri, 11 Nov 2016) Changed paths: M po/sl.po Log Message: ----------- Translated using Weblate (Slovenian) Currently translated at 99.9% (3220 of 3222 strings) [CI skip] Commit: 48650f9403c8140188bf59ec756e72761e1c5b8f https://github.com/phpmyadmin/phpmyadmin/commit/48650f9403c8140188bf59ec756… Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: 2016-11-11 (Fri, 11 Nov 2016) Changed paths: M po/tr.po Log Message: ----------- Translated using Weblate (Turkish) Currently translated at 100.0% (3222 of 3222 strings) [CI skip] Commit: d4377e40d8a9a541b1508b4065c80c69ed62b346 https://github.com/phpmyadmin/phpmyadmin/commit/d4377e40d8a9a541b1508b4065c… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-11 (Fri, 11 Nov 2016) Changed paths: M libraries/server_privileges.lib.php M test/libraries/PMA_server_privileges_test.php Log Message: ----------- Merge branch 'rpv-tomsk-fix-HtmlHeaderForUserProperties' into QA_4_6 Commit: d580bb3b51543b626eacc29f862364683ba5c779 https://github.com/phpmyadmin/phpmyadmin/commit/d580bb3b51543b626eacc29f862… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-11 (Fri, 11 Nov 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog for #12542 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: a9048b0b5c51e96b2f81c0da24d0eea580cbb92b https://github.com/phpmyadmin/phpmyadmin/commit/a9048b0b5c51e96b2f81c0da24d… Author: Weblate <noreply(a)weblate.org> Date: 2016-11-11 (Fri, 11 Nov 2016) Changed paths: M ChangeLog M libraries/server_privileges.lib.php M test/libraries/PMA_server_privileges_test.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: 81fe5fe9bf279f8374a957ec568160dbcdfe7c21 https://github.com/phpmyadmin/phpmyadmin/commit/81fe5fe9bf279f8374a957ec568… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-11 (Fri, 11 Nov 2016) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Fix incorrect calls to escapeString Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 9b76fccb27294883249ff68c9a5b0ffc8c37236d https://github.com/phpmyadmin/phpmyadmin/commit/9b76fccb27294883249ff68c9a5… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-13 (Sun, 13 Nov 2016) Changed paths: M libraries/plugin_interface.lib.php Log Message: ----------- Remove unnecessary call to ksort on empty list Fix #12691 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 1aeb705b3fea05537ad56b3f205cdb2dcdc083ac https://github.com/phpmyadmin/phpmyadmin/commit/1aeb705b3fea05537ad56b3f205… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-13 (Sun, 13 Nov 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog for #12691 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: ea1e3e3a6f9073b51fed5351197e893617a0984d https://github.com/phpmyadmin/phpmyadmin/commit/ea1e3e3a6f9073b51fed5351197… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-14 (Mon, 14 Nov 2016) Changed paths: M libraries/plugins/export/ExportXml.php M libraries/rte/rte_events.lib.php Log Message: ----------- Remove old sqlAddslashes call Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: a3f52751bd06d74e3f565300ca15186c8f084903 https://github.com/phpmyadmin/phpmyadmin/commit/a3f52751bd06d74e3f565300ca1… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-14 (Mon, 14 Nov 2016) Changed paths: M js/db_search.js M js/messages.php M libraries/DbSearch.php Log Message: ----------- Change get ajax request to post to avoid long request URIs Also, move HTML-embedded JS function calls into JQuery event handlers Fix #12299 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 3b8f9a55f6349637264aa82f096c7955859081b4 https://github.com/phpmyadmin/phpmyadmin/commit/3b8f9a55f6349637264aa82f096… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-14 (Mon, 14 Nov 2016) Changed paths: M js/db_search.js M libraries/DbSearch.php M test/classes/DbSearchTest.php Log Message: ----------- Fix tests related to DBSearch Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 46eaa53ddd5b6f8810410e1713a1fce70a2c6187 https://github.com/phpmyadmin/phpmyadmin/commit/46eaa53ddd5b6f8810410e1713a… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-15 (Tue, 15 Nov 2016) Changed paths: M ChangeLog M db_export.php Log Message: ----------- Check parameter type before processing Fixes #12443 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 5e354b9439a4186acbd1c1f1f6162c60c17eeff2 https://github.com/phpmyadmin/phpmyadmin/commit/5e354b9439a4186acbd1c1f1f61… Author: Marc Delisle <marc(a)infomarc.info> Date: 2016-11-15 (Tue, 15 Nov 2016) Changed paths: M po/fr.po Log Message: ----------- Translated using Weblate (French) Currently translated at 99.4% (3204 of 3222 strings) [CI skip] Commit: 0b638d735c5d314a2c29def669127e859223fbe0 https://github.com/phpmyadmin/phpmyadmin/commit/0b638d735c5d314a2c29def6691… Author: Hendrik Michaelsen <weblate(a)cryck.me> Date: 2016-11-15 (Tue, 15 Nov 2016) Changed paths: M po/de.po Log Message: ----------- Translated using Weblate (German) Currently translated at 99.4% (3203 of 3222 strings) [CI skip] Commit: f3ab8cd00b8841406664d0057790c42e537f8362 https://github.com/phpmyadmin/phpmyadmin/commit/f3ab8cd00b8841406664d005779… Author: Weblate <noreply(a)weblate.org> Date: 2016-11-15 (Tue, 15 Nov 2016) Changed paths: M ChangeLog M db_export.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: 89dfff786868618dcd222be6f8f4c4f9a91c2ecd https://github.com/phpmyadmin/phpmyadmin/commit/89dfff786868618dcd222be6f8f… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-15 (Tue, 15 Nov 2016) Changed paths: M js/db_search.js M libraries/DbSearch.php Log Message: ----------- Change to using HTML5 data-* attributes to allow easy access in JQuery Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 8d4ea7bad2bbc264b3e1644ea54a26e6568fefd8 https://github.com/phpmyadmin/phpmyadmin/commit/8d4ea7bad2bbc264b3e1644ea54… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-15 (Tue, 15 Nov 2016) Changed paths: 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/Parser.php M libraries/sql-parser/src/Statement.php M libraries/sql-parser/src/Statements/SelectStatement.php Log Message: ----------- Update SQL parser to 3.4.13 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: abe50c61293d27960fb749479137e90f02779f01 https://github.com/phpmyadmin/phpmyadmin/commit/abe50c61293d27960fb74947913… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-15 (Tue, 15 Nov 2016) Changed paths: M po/de.po M po/fr.po Log Message: ----------- Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 Commit: 21093b22e4c1904a523a29e0bf9f4e3870b704ce https://github.com/phpmyadmin/phpmyadmin/commit/21093b22e4c1904a523a29e0bf9… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-15 (Tue, 15 Nov 2016) Changed paths: M libraries/DbSearch.php Log Message: ----------- Escape tablenames, dbnames and properly render html-specific elements/chars Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: aef7f9288a81e83b676e2f22cabd8eff3475de3a https://github.com/phpmyadmin/phpmyadmin/commit/aef7f9288a81e83b676e2f22cab… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-15 (Tue, 15 Nov 2016) Changed paths: M js/db_search.js M js/messages.php M libraries/DbSearch.php M test/classes/DbSearchTest.php Log Message: ----------- Merge pull request #12696 from devenbansod/fix_12299 Fix #12299: Change to POST request to avoid possibly very long URIs Commit: 51c7739526a7610a12662170b2e09b7f24a4072e https://github.com/phpmyadmin/phpmyadmin/commit/51c7739526a7610a12662170b2e… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-15 (Tue, 15 Nov 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #12696 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 59b2c5a63ac6568d47494b256e3531ebc38e44d4 https://github.com/phpmyadmin/phpmyadmin/commit/59b2c5a63ac6568d47494b256e3… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-15 (Tue, 15 Nov 2016) Changed paths: M libraries/DbSearch.php M test/classes/DbSearchTest.php Log Message: ----------- Fix markup and tests Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: f4f49172307ccd73b948770dab9bc47cd9d1b0ee https://github.com/phpmyadmin/phpmyadmin/commit/f4f49172307ccd73b948770dab9… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-16 (Wed, 16 Nov 2016) Changed paths: M libraries/DatabaseInterface.php Log Message: ----------- Remove debugging calls Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 74fd7986eb1421455ccb273f25c13dfaf03b5a5a https://github.com/phpmyadmin/phpmyadmin/commit/74fd7986eb1421455ccb273f25c… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-16 (Wed, 16 Nov 2016) Changed paths: M libraries/DatabaseInterface.php Log Message: ----------- Remove debugging calls Fix #12706 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 0c36e5fd85367d09ccfb13c271ec0c748a1a0818 https://github.com/phpmyadmin/phpmyadmin/commit/0c36e5fd85367d09ccfb13c271e… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-16 (Wed, 16 Nov 2016) Log Message: ----------- Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 Commit: b69311e460bd52eebc4402a165c012e63121ef03 https://github.com/phpmyadmin/phpmyadmin/commit/b69311e460bd52eebc4402a165c… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-16 (Wed, 16 Nov 2016) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Fix self-injection in Table specific privileges Don't manually add backticks (`) rather use the Util function, since escaping of backticks inside the column_name has to be handled too. Fix #12361 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 88b284816cdcbb3783685785f887faa061d0bd07 https://github.com/phpmyadmin/phpmyadmin/commit/88b284816cdcbb3783685785f88… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-16 (Wed, 16 Nov 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog for #12361 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Conflicts: ChangeLog Commit: 80d1bc7c2b6c29b29fe6653ae54d34f8bbb828d4 https://github.com/phpmyadmin/phpmyadmin/commit/80d1bc7c2b6c29b29fe6653ae54… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-16 (Wed, 16 Nov 2016) Changed paths: M ChangeLog M libraries/server_privileges.lib.php Log Message: ----------- Merge pull request #12711 from devenbansod/fix_12361 Fix #12361 : Fix self SQL injection in table-specific privileges Commit: 050e9ebf61d051cc45a57fd3eacee7b6669319ed https://github.com/phpmyadmin/phpmyadmin/commit/050e9ebf61d051cc45a57fd3eac… Author: Marc Delisle <marc(a)infomarc.info> Date: 2016-11-16 (Wed, 16 Nov 2016) Changed paths: M po/fr.po Log Message: ----------- Translated using Weblate (French) Currently translated at 99.4% (3205 of 3222 strings) [CI skip] Commit: e7b19f2a2ccc2848ee28b5c0171fd3370bc33e22 https://github.com/phpmyadmin/phpmyadmin/commit/e7b19f2a2ccc2848ee28b5c0171… Author: Weblate <noreply(a)weblate.org> Date: 2016-11-16 (Wed, 16 Nov 2016) Changed paths: M ChangeLog M libraries/server_privileges.lib.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: fab13653a8adb5fbf6f399924e3517a2e23de1be https://github.com/phpmyadmin/phpmyadmin/commit/fab13653a8adb5fbf6f399924e3… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-16 (Wed, 16 Nov 2016) Changed paths: M ChangeLog M js/functions.js Log Message: ----------- Add link to release notes and download on new version notification Fixes #12698 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 3bced0d02fa2d79cfca83630ceac99da9bcf24da https://github.com/phpmyadmin/phpmyadmin/commit/3bced0d02fa2d79cfca83630cea… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-17 (Thu, 17 Nov 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog for #12712 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: cc961340d9feb7a675b24da1a6667bb6d1673439 https://github.com/phpmyadmin/phpmyadmin/commit/cc961340d9feb7a675b24da1a66… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-18 (Fri, 18 Nov 2016) Changed paths: M libraries/LanguageManager.php Log Message: ----------- Remove check for < in Accept-Language header It is no longer needed since we do match language against existing ones. Issue #12710 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 53f07e717975aba39efd45e1c2856feaee92bacc https://github.com/phpmyadmin/phpmyadmin/commit/53f07e717975aba39efd45e1c28… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-18 (Fri, 18 Nov 2016) Changed paths: M libraries/plugins/auth/AuthenticationHttp.php Log Message: ----------- Remove protection against < in HTTP Authorization header It really doesn't make sense here as the username can potentionally contain < anyway and we need to deal with it later (and we do). Fixes #12710 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: a747af078dd0a1d3b8550f062910ac484e2ff454 https://github.com/phpmyadmin/phpmyadmin/commit/a747af078dd0a1d3b8550f06291… Author: Boussaid Mustafa <bousali(a)gmail.com> Date: 2016-11-18 (Fri, 18 Nov 2016) Changed paths: M po/ar.po Log Message: ----------- Translated using Weblate (Arabic) Currently translated at 34.0% (1096 of 3222 strings) [CI skip] Commit: aca19c4396d694fce993a13971713797fb9437e9 https://github.com/phpmyadmin/phpmyadmin/commit/aca19c4396d694fce993a139717… Author: Liška <nicefox1(a)gmail.com> Date: 2016-11-18 (Fri, 18 Nov 2016) Changed paths: M po/cs.po Log Message: ----------- Translated using Weblate (Czech) Currently translated at 93.2% (3003 of 3222 strings) [CI skip] Commit: 32755b40ce99d83366b98a2aeffcccbfacd60a60 https://github.com/phpmyadmin/phpmyadmin/commit/32755b40ce99d83366b98a2aeff… Author: Nebojsa Tausanov <n.tausanov(a)gmail.com> Date: 2016-11-18 (Fri, 18 Nov 2016) Changed paths: M po/mk.po Log Message: ----------- Translated using Weblate (Macedonian) Currently translated at 17.3% (559 of 3222 strings) [CI skip] Commit: 002240af4e56651464c8047fd84ff61e29304ce1 https://github.com/phpmyadmin/phpmyadmin/commit/002240af4e56651464c8047fd84… Author: Weblate <noreply(a)weblate.org> Date: 2016-11-18 (Fri, 18 Nov 2016) Changed paths: M libraries/LanguageManager.php M libraries/plugins/auth/AuthenticationHttp.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: 2e3416b2bf2786a6a2935fdc203888cf9cafb820 https://github.com/phpmyadmin/phpmyadmin/commit/2e3416b2bf2786a6a2935fdc203… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-18 (Fri, 18 Nov 2016) Changed paths: M js/pmd/move.js Log Message: ----------- Remove unnecessary debug statements Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: e75e67cf34f47b0fe0514131dfde645074cc716a https://github.com/phpmyadmin/phpmyadmin/commit/e75e67cf34f47b0fe0514131dfd… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-18 (Fri, 18 Nov 2016) Changed paths: M po/sv.po Log Message: ----------- Translated using Weblate (Swedish) Currently translated at 97.6% (3147 of 3222 strings) [CI skip] Commit: 500824194182f2b24baefaf23b392ac58d72ee9a https://github.com/phpmyadmin/phpmyadmin/commit/500824194182f2b24baefaf23b3… Author: Weblate <noreply(a)weblate.org> Date: 2016-11-18 (Fri, 18 Nov 2016) Changed paths: M js/pmd/move.js Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: 80087a021544bb0b1cf4fe6c35ca6edbe2d55189 https://github.com/phpmyadmin/phpmyadmin/commit/80087a021544bb0b1cf4fe6c35c… Author: Marc Delisle <marc(a)infomarc.info> Date: 2016-11-21 (Mon, 21 Nov 2016) Changed paths: M po/fr.po Log Message: ----------- Translated using Weblate (French) Currently translated at 99.5% (3207 of 3222 strings) [CI skip] Commit: 1a27a8eeff3501964a77d248ed02e4d90ad64f50 https://github.com/phpmyadmin/phpmyadmin/commit/1a27a8eeff3501964a77d248ed0… Author: Marc Delisle <marc(a)infomarc.info> Date: 2016-11-24 (Thu, 24 Nov 2016) Changed paths: M po/fr.po Log Message: ----------- Translated using Weblate (French) Currently translated at 99.6% (3210 of 3222 strings) [CI skip] Commit: 637d55bb4459ffceae9a5d0be36ab022ac583e10 https://github.com/phpmyadmin/phpmyadmin/commit/637d55bb4459ffceae9a5d0be36… Author: Carlos Ferreira <c.ferreira(a)acsiiweb.com> Date: 2016-11-24 (Thu, 24 Nov 2016) Changed paths: M po/fr.po Log Message: ----------- Translated using Weblate (French) Currently translated at 100.0% (3222 of 3222 strings) [CI skip] Commit: 5daee71272efd87a24fe58f90303e82a5b6caf6d https://github.com/phpmyadmin/phpmyadmin/commit/5daee71272efd87a24fe58f9030… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2016-11-24 (Thu, 24 Nov 2016) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.php Log Message: ----------- 4.6.5 release and ChangeLog Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com> Commit: 253894e2995ae4175f4429bf5cdaedfb6a722988 https://github.com/phpmyadmin/phpmyadmin/commit/253894e2995ae4175f4429bf5cd… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2016-11-24 (Thu, 24 Nov 2016) Changed paths: M ChangeLog M README M doc/conf.py M import.php M index.php M js/config.js M js/microhistory.js M libraries/Config.php M libraries/DbQbe.php M libraries/Error.php M libraries/ErrorHandler.php M libraries/Message.php M libraries/SavedSearches.php M libraries/Tracker.php M libraries/VersionInformation.php M libraries/core.lib.php M libraries/export.lib.php M libraries/ip_allow_deny.lib.php M libraries/plugins/AuthenticationPlugin.php M libraries/plugins/auth/AuthenticationConfig.php M libraries/plugins/auth/AuthenticationCookie.php M libraries/plugins/auth/AuthenticationHttp.php M libraries/tbl_partition_definition.inc.php M libraries/tracking.lib.php M prefs_manage.php M test/classes/ErrorTest.php M test/classes/MessageTest.php M test/libraries/core/PMA_isAllowedDomain_test.php M test/libraries/core/PMA_safeUnserialize_test.php M test/libraries/core/PMA_sanitizeMySQLHost_test.php Log Message: ----------- Resolve merge conflicts with ChangeLog Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com> Commit: 50c3f125fe2e09fc623087f78872d50cbc55eddd https://github.com/phpmyadmin/phpmyadmin/commit/50c3f125fe2e09fc623087f7887… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2016-11-24 (Thu, 24 Nov 2016) Changed paths: M .gitignore M ChangeLog M README M README.rst M browse_foreigners.php M db_export.php M db_operations.php M db_tracking.php M doc/conf.py M doc/config.rst M doc/faq.rst M doc/setup.rst M doc/transformations.rst M import.php M index.php M js/codemirror/addon/lint/sql-lint.js M js/common.js M js/config.js M js/console.js M js/db_search.js M js/export.js M js/functions.js M js/get_image.js.php M js/get_scripts.js.php M js/makegrid.js M js/messages.php M js/microhistory.js M js/navigation.js M js/pmd/history.js M js/pmd/move.js M js/rte.js M js/sql.js M js/tbl_change.js M js/tbl_structure.js M js/whitelist.php M libraries/Advisor.php M libraries/Config.php M libraries/DatabaseInterface.php M libraries/DbQbe.php M libraries/DbSearch.php M libraries/DisplayResults.php M libraries/Error.php M libraries/ErrorHandler.php M libraries/Footer.php M libraries/LanguageManager.php M libraries/Linter.php M libraries/Menu.php M libraries/Message.php M libraries/Partition.php M libraries/RecentFavoriteTable.php M libraries/SavedSearches.php M libraries/SystemDatabase.php M libraries/Table.php M libraries/Tracker.php M libraries/Util.php M libraries/VersionInformation.php M libraries/bookmark.lib.php M libraries/central_columns.lib.php M libraries/common.inc.php M libraries/config.default.php M libraries/config/ConfigFile.php M libraries/config/Validator.php M libraries/controllers/server/ServerVariablesController.php M libraries/controllers/table/TableSearchController.php M libraries/controllers/table/TableStructureController.php M libraries/core.lib.php M libraries/create_addfield.lib.php M libraries/db_designer.lib.php M libraries/db_table_exists.lib.php M libraries/dbi/DBIDummy.php M libraries/dbi/DBIExtension.php M libraries/dbi/DBIMysql.php M libraries/dbi/DBIMysqli.php M libraries/display_export.lib.php M libraries/export.lib.php M libraries/import.lib.php M libraries/insert_edit.lib.php M libraries/ip_allow_deny.lib.php M libraries/mysql_charsets.lib.php M libraries/navigation/Navigation.php M libraries/navigation/NavigationHeader.php M libraries/navigation/NavigationTree.php M libraries/navigation/nodes/Node.php M libraries/navigation/nodes/NodeDatabase.php M libraries/navigation/nodes/NodeTable.php M libraries/operations.lib.php M libraries/plugin_interface.lib.php M libraries/plugins/AuthenticationPlugin.php M libraries/plugins/auth/AuthenticationConfig.php M libraries/plugins/auth/AuthenticationCookie.php M libraries/plugins/auth/AuthenticationHttp.php M libraries/plugins/export/ExportSql.php M libraries/plugins/export/ExportXml.php M libraries/plugins/import/ImportCsv.php M libraries/plugins/import/ImportLdi.php M libraries/plugins/schema/pdf/Pdf.php M libraries/plugins/transformations/abs/TextImageLinkTransformationsPlugin.php M libraries/plugins/transformations/abs/TextLinkTransformationsPlugin.php M libraries/pmd_common.php M libraries/relation.lib.php M libraries/relation_cleanup.lib.php M libraries/replication.inc.php M libraries/replication_gui.lib.php M libraries/rte/rte_events.lib.php M libraries/rte/rte_export.lib.php M libraries/rte/rte_list.lib.php M libraries/rte/rte_routines.lib.php M libraries/rte/rte_triggers.lib.php M libraries/rte/rte_words.lib.php M libraries/sanitizing.lib.php M libraries/server_privileges.lib.php M libraries/server_status_monitor.lib.php M libraries/server_user_groups.lib.php M libraries/session.inc.php M libraries/special_schema_links.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 A 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.lib.php M libraries/tbl_info.inc.php M libraries/tbl_partition_definition.inc.php R libraries/tcpdf/include/sRGB.icc M libraries/tracking.lib.php M libraries/transformations.lib.php M libraries/user_preferences.lib.php R phpdox.xml M phpunit.xml.dist M po/af.po M po/ar.po M po/az.po M po/be.po M po/be(a)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(a)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(a)latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po M prefs_manage.php R scripts/remove_control_m.sh R scripts/revision-info M server_privileges.php M server_replication.php M setup/lib/ConfigGenerator.php M show_config_errors.php M tbl_export.php M tbl_operations.php M templates/columns_definitions/column_definitions_form.phtml M templates/columns_definitions/partitions.phtml M templates/columns_definitions/transformation_option.phtml M templates/table/relation/common_form.phtml M templates/table/relation/foreign_key_row.phtml M templates/table/structure/display_partitions.phtml M templates/table/structure/display_structure.phtml M test/.htaccess M test/bootstrap-dist.php M test/classes/AdvisorTest.php M test/classes/ConfigTest.php M test/classes/DbSearchTest.php M test/classes/DisplayResultsTest.php M test/classes/ErrorTest.php M test/classes/FooterTest.php M test/classes/MessageTest.php M test/classes/TableTest.php M test/classes/ThemeManagerTest.php M test/classes/TrackerTest.php M test/classes/config/ConfigFileTest.php M test/classes/controllers/TableSearchControllerTest.php M test/classes/navigation/NavigationTest.php M test/classes/navigation/NodeTest.php M test/classes/plugin/auth/AuthenticationCookieTest.php M test/classes/plugin/export/ExportHtmlwordTest.php M test/classes/plugin/export/ExportLatexTest.php M test/classes/plugin/export/ExportOdsTest.php M test/classes/plugin/export/ExportOdtTest.php M test/classes/plugin/export/ExportSqlTest.php M test/classes/plugin/export/ExportTexytextTest.php M test/classes/plugin/export/ExportXmlTest.php M test/classes/plugin/import/ImportLdiTest.php M test/classes/plugin/import/ImportOdsTest.php M test/libraries/PMA_PMD_common_test.php M test/libraries/PMA_central_columns_test.php M test/libraries/PMA_designer_test.php M test/libraries/PMA_export_test.php M test/libraries/PMA_insert_edit_test.php M test/libraries/PMA_server_privileges_test.php M test/libraries/PMA_server_user_groups_test.php M test/libraries/PMA_sql_test.php M test/libraries/PMA_user_preferences_test.php M test/libraries/common/PMA_formatNumberByteDown_test.php M test/libraries/common/PMA_quoting_slashing_test.php M test/libraries/core/PMA_isAllowedDomain_test.php M test/libraries/core/PMA_safeUnserialize_test.php M test/libraries/core/PMA_sanitizeMySQLHost_test.php M test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php M test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php M themes.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php M user_password.php Log Message: ----------- Merge branch 'QA_4_6' into STABLE Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4880b801989f...50c3f125fe2e

1 0

[phpmyadmin/phpmyadmin]
by ibennetch 25 Nov '16

25 Nov '16

Branch: refs/tags/RELEASE_4_6_5 Home: https://github.com/phpmyadmin/phpmyadmin

1 0

[phpmyadmin/phpmyadmin]
by ibennetch 25 Nov '16

25 Nov '16

Branch: refs/tags/RELEASE_4_0_10_18 Home: https://github.com/phpmyadmin/phpmyadmin

1 0

[phpmyadmin/phpmyadmin]
by ibennetch 25 Nov '16

25 Nov '16

Branch: refs/tags/RELEASE_4_4_15_9 Home: https://github.com/phpmyadmin/phpmyadmin

1 0

[phpmyadmin/phpmyadmin] 9dbe52: Strip null bytes from MySQL username
by Isaac Bennetch 25 Nov '16

25 Nov '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9dbe520e905344597554b06931bd966ce195b9dc https://github.com/phpmyadmin/phpmyadmin/commit/9dbe520e905344597554b06931b… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M libraries/core.lib.php M libraries/plugins/auth/AuthenticationCookie.php M libraries/plugins/auth/AuthenticationHttp.php Log Message: ----------- Strip null bytes from MySQL username In old PHP versions this could lead to allow/deny rules bypass. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: b2ea7205fbc22bdf030ccf0bc1c79fa761d44aa1 https://github.com/phpmyadmin/phpmyadmin/commit/b2ea7205fbc22bdf030ccf0bc1c… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M libraries/core.lib.php M libraries/plugins/auth/AuthenticationCookie.php M libraries/plugins/auth/AuthenticationHttp.php Log Message: ----------- Merge branch 'QA_4_6-security' into master-security Commit: 2de86f02af17f49e22d6474542770d72dd4723b3 https://github.com/phpmyadmin/phpmyadmin/commit/2de86f02af17f49e22d64745427… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M libraries/ip_allow_deny.lib.php Log Message: ----------- Use hash_equals for comparing username in allow/deny rules The comparison should happen in constant time to avoid possible leak of usernames in rules. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: c83b2b0872c035d2625f631a341cb2009ceb9d22 https://github.com/phpmyadmin/phpmyadmin/commit/c83b2b0872c035d2625f631a341… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M libraries/plugins/auth/AuthenticationCookie.php M libraries/plugins/auth/AuthenticationHttp.php Log Message: ----------- Use hash_equals for checking username This makes the comparison happen in constant time and makes it impossible to use it to guess stored usernames. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 61976131350eca8cbba74270a44ea7baa708259f https://github.com/phpmyadmin/phpmyadmin/commit/61976131350eca8cbba74270a44… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M libraries/VersionInformation.php Log Message: ----------- Silent errors when getting remote file - both curl and fopen wrappers can emmit errors in cases where remote site is not accessible - do not pass false value to json_decode Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 9816dc66af7326b65371f7d1e383b00b1b838d36 https://github.com/phpmyadmin/phpmyadmin/commit/9816dc66af7326b65371f7d1e38… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M libraries/VersionInformation.php M libraries/ip_allow_deny.lib.php M libraries/plugins/auth/AuthenticationCookie.php M libraries/plugins/auth/AuthenticationHttp.php Log Message: ----------- Merge branch 'QA_4_6-security' into master-security Commit: cf83d6afbe4383e7668c1207be6d5bee0646be04 https://github.com/phpmyadmin/phpmyadmin/commit/cf83d6afbe4383e7668c1207be6… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M libraries/export.lib.php Log Message: ----------- Remove debugging code Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: a0ca9394a214afd15a4b883f8953b7b32f3caf04 https://github.com/phpmyadmin/phpmyadmin/commit/a0ca9394a214afd15a4b883f895… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M libraries/Error.php M test/classes/ErrorTest.php Log Message: ----------- Strip path even if openbasedir restrictions apply This really should not be the case here as what we get here is code executed by PHP, so it should have already passed openbasedir restrictions. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 97cfc1ebc345b1971ede90aabcceb0f7fb12a478 https://github.com/phpmyadmin/phpmyadmin/commit/97cfc1ebc345b1971ede90aabcc… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M libraries/Error.php M libraries/export.lib.php M test/classes/ErrorTest.php Log Message: ----------- Merge branch 'QA_4_6-security' into master-security Commit: 6e3282e15856192d484f2c56a7ae83796bf2e716 https://github.com/phpmyadmin/phpmyadmin/commit/6e3282e15856192d484f2c56a7a… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M js/microhistory.js Log Message: ----------- Store copy of hash instead of working on live object This avoids possible race conditions when doing the checks. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 5c78f678d00767e5c060bd1b6f1d4c220e8c38ec https://github.com/phpmyadmin/phpmyadmin/commit/5c78f678d00767e5c060bd1b6f1… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M js/microhistory.js Log Message: ----------- Merge branch 'QA_4_6-security' into master-security Commit: b63bd9977c436f6ad564d429e663bb580bb4e730 https://github.com/phpmyadmin/phpmyadmin/commit/b63bd9977c436f6ad564d429e66… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M libraries/navigation/NavigationHeader.php Log Message: ----------- Stricter validation of NavigationLogoLink It now has to be URL including scheme. Otherwise it's not really possible to validate it for being just http/https. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 584d5c1726ceaedf9c264837cd8d4aa8957d7dea https://github.com/phpmyadmin/phpmyadmin/commit/584d5c1726ceaedf9c264837cd8… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M libraries/navigation/NavigationHeader.php Log Message: ----------- Merge branch 'QA_4_6-security' into master-security Commit: 3ef6201bd6d43eed7f360bb2ead22ef7c484381e https://github.com/phpmyadmin/phpmyadmin/commit/3ef6201bd6d43eed7f360bb2ead… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M js/config.js Log Message: ----------- Fix hash validation - use copy of hash to avoid race condition - stricter regex to match whole string Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: a141028add8bb8ac2392edde82e8bc187b3cdd7c https://github.com/phpmyadmin/phpmyadmin/commit/a141028add8bb8ac2392edde82e… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M js/config.js Log Message: ----------- Merge branch 'QA_4_6-security' into master-security Commit: 45e33d63a252011b02b55b74432c4a90484eaa5e https://github.com/phpmyadmin/phpmyadmin/commit/45e33d63a252011b02b55b74432… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M libraries/DbQbe.php M libraries/SavedSearches.php Log Message: ----------- Limit maximal number of rows in QBE User would be lost in them anyway by that count and it prevents DOS. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: d62494cd8c99185077f516be76093f4cb4a32837 https://github.com/phpmyadmin/phpmyadmin/commit/d62494cd8c99185077f516be760… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M ChangeLog M libraries/core.lib.php M po/sl.po M setup/lib/ConfigGenerator.php M show_config_errors.php Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: 16da93378b69e0613dff3ba9c11872892e60811b https://github.com/phpmyadmin/phpmyadmin/commit/16da93378b69e0613dff3ba9c11… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M ChangeLog M libraries/core.lib.php M po/pl.po M po/sl.po M setup/lib/ConfigGenerator.php M show_config_errors.php M test/classes/navigation/NavigationTest.php M test/classes/navigation/NodeDatabaseChildTest.php Log Message: ----------- Merge branch 'master' into master-security Commit: d3e4faded49ad73394f4d02de13b7c8583c6acd1 https://github.com/phpmyadmin/phpmyadmin/commit/d3e4faded49ad73394f4d02de13… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M libraries/DbQbe.php M libraries/SavedSearches.php Log Message: ----------- Merge branch 'QA_4_6-security' into master-security Commit: ba82f0000c7837bd3b834b24660325652ec27675 https://github.com/phpmyadmin/phpmyadmin/commit/ba82f0000c7837bd3b834b24660… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M index.php M js/functions.js M libraries/Advisor.php M libraries/Footer.php M libraries/Util.php M libraries/navigation/NavigationHeader.php M libraries/plugins/auth/AuthenticationCookie.php M test/classes/AdvisorTest.php M test/classes/FooterTest.php M themes.php Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: 860ff02b07eb1332cad6c920fe5c4394280058f2 https://github.com/phpmyadmin/phpmyadmin/commit/860ff02b07eb1332cad6c920fe5… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M index.php M js/functions.js M libraries/Advisor.php M libraries/Footer.php M libraries/Util.php M libraries/navigation/NavigationHeader.php M libraries/plugins/auth/AuthenticationCookie.php M test/classes/AdvisorTest.php M test/classes/FooterTest.php M themes.php Log Message: ----------- Merge branch 'master' into master-security Commit: 895bca9a565cde0326e4caa3ab058973466a2ebb https://github.com/phpmyadmin/phpmyadmin/commit/895bca9a565cde0326e4caa3ab0… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-18 (Thu, 18 Aug 2016) Log Message: ----------- Merge branch 'QA_4_6-security' into master-security Commit: d5c6801a8580f221fc64471016b06cc4dae9ffba https://github.com/phpmyadmin/phpmyadmin/commit/d5c6801a8580f221fc64471016b… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-24 (Wed, 24 Aug 2016) Changed paths: M ChangeLog M libraries/DisplayResults.php M libraries/navigation/NavigationHeader.php M libraries/plugins/transformations/abs/TextImageLinkTransformationsPlugin.php M libraries/plugins/transformations/abs/TextLinkTransformationsPlugin.php M libraries/sanitizing.lib.php M libraries/special_schema_links.lib.php M po/el.po M po/ia.po M po/pa.po M po/pt_BR.po M po/sl.po M po/uk.po M test/classes/DisplayResultsTest.php Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: 17fee760187181980cb7d3796f749db03627c006 https://github.com/phpmyadmin/phpmyadmin/commit/17fee760187181980cb7d3796f7… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-24 (Wed, 24 Aug 2016) Changed paths: M ChangeLog M libraries/DisplayResults.php M libraries/Sanitize.php M libraries/navigation/NavigationHeader.php M libraries/plugins/transformations/abs/TextImageLinkTransformationsPlugin.php M libraries/plugins/transformations/abs/TextLinkTransformationsPlugin.php M libraries/special_schema_links.lib.php M po/el.po M po/ia.po M po/pa.po M po/pt_BR.po M po/sl.po M po/uk.po M scripts/create-release.sh M test/classes/DisplayResultsTest.php Log Message: ----------- Merge branch 'master' into master-security Commit: 1b92280a4442dcc54e337bf82c6cc0f29761532c https://github.com/phpmyadmin/phpmyadmin/commit/1b92280a4442dcc54e337bf82c6… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-24 (Wed, 24 Aug 2016) Log Message: ----------- Merge branch 'QA_4_6-security' into master-security Commit: c4714b003c21948e13eb0162c5c951d5e84a1c75 https://github.com/phpmyadmin/phpmyadmin/commit/c4714b003c21948e13eb0162c5c… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-24 (Wed, 24 Aug 2016) Changed paths: M ChangeLog M index.php Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: 683f78cb194dd574f1ecdebbac16ee002c5777ef https://github.com/phpmyadmin/phpmyadmin/commit/683f78cb194dd574f1ecdebbac1… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-24 (Wed, 24 Aug 2016) Changed paths: M ChangeLog M index.php Log Message: ----------- Merge branch 'master' into master-security Commit: 26d3202de9cf4844efb399530e9de6387ecd3ae8 https://github.com/phpmyadmin/phpmyadmin/commit/26d3202de9cf4844efb399530e9… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-24 (Wed, 24 Aug 2016) Log Message: ----------- Merge branch 'QA_4_6-security' into master-security Commit: 0a20356ec4110e682b5bbb219f5f08db10bc418c https://github.com/phpmyadmin/phpmyadmin/commit/0a20356ec4110e682b5bbb219f5… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-25 (Thu, 25 Aug 2016) Changed paths: M ChangeLog M js/get_image.js.php M js/get_scripts.js.php M js/whitelist.php M libraries/Config.php M libraries/Table.php M po/pt.po Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: 34f42cda69f419313024f28ab508f9a2460c25a4 https://github.com/phpmyadmin/phpmyadmin/commit/34f42cda69f419313024f28ab50… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-25 (Thu, 25 Aug 2016) Changed paths: M ChangeLog M js/get_image.js.php M js/get_scripts.js.php M js/whitelist.php M libraries/Config.php M libraries/Table.php M po/pt.po Log Message: ----------- Merge branch 'master' into master-security Commit: 3171e75f72810dec5e39c96a21d7e9c8902cb7d0 https://github.com/phpmyadmin/phpmyadmin/commit/3171e75f72810dec5e39c96a21d… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-08-25 (Thu, 25 Aug 2016) Log Message: ----------- Merge branch 'QA_4_6-security' into master-security Commit: 283f5d10ce65e0656f98335bd1f2767fba3be6db https://github.com/phpmyadmin/phpmyadmin/commit/283f5d10ce65e0656f98335bd1f… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M import.php Log Message: ----------- Fix possible DOS on too big skip value - loop only as long as long we have data to skip - convert skip parameter to integer Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: dcc9f8585c49ce2258d40aea511b524488bbce05 https://github.com/phpmyadmin/phpmyadmin/commit/dcc9f8585c49ce2258d40aea511… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M .gitignore M ChangeLog M js/functions.js M js/sql.js M libraries/Advisor.php M libraries/Linter.php M libraries/Util.php M libraries/common.inc.php M libraries/dbi/DBIMysqli.php M libraries/navigation/nodes/Node.php M libraries/sanitizing.lib.php M po/pt_BR.po M templates/columns_definitions/transformation_option.phtml M test/bootstrap-dist.php M test/libraries/common/PMA_formatNumberByteDown_test.php Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: 34479a9cdb7e80b5bf87bd26fa36df1b896f2db4 https://github.com/phpmyadmin/phpmyadmin/commit/34479a9cdb7e80b5bf87bd26fa3… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M .gitignore M ChangeLog M doc/setup.rst M js/db_central_columns.js M js/db_operations.js M js/db_search.js M js/db_structure.js M js/db_tracking.js M js/functions.js M js/indexes.js M js/navigation.js M js/replication.js M js/rte.js M js/server_status_monitor.js M js/server_variables.js M js/sql.js M js/tbl_operations.js M js/tbl_relation.js M js/tbl_select.js M js/tbl_structure.js M js/tbl_tracking.js M libraries/Advisor.php M libraries/Config.php M libraries/LanguageManager.php M libraries/Linter.php M libraries/Sanitize.php M libraries/Util.php M libraries/VersionInformation.php M libraries/cleanup.lib.php M libraries/common.inc.php M libraries/dbi/DBIMysqli.php M libraries/error_report.lib.php M libraries/navigation/nodes/Node.php M logout.php A po/ig.po M po/pt_BR.po M po/ru.po M po/sk.po M templates/columns_definitions/transformation_option.phtml M test/bootstrap-dist.php M test/classes/ConfigTest.php M test/classes/SanitizeTest.php M test/classes/UtilTest.php M test/libraries/common/PMA_formatNumberByteDown_test.php M view_create.php Log Message: ----------- Merge branch 'master' into master-security Commit: c3328c743abd7b1ea8cbfc3b7c0ebd502a4e4100 https://github.com/phpmyadmin/phpmyadmin/commit/c3328c743abd7b1ea8cbfc3b7c0… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M libraries/Util.php Log Message: ----------- Silent errors when getting remote file - both curl and fopen wrappers can emmit errors in cases where remote site is not accessible Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: ce278cd3eb1ea042bb90dbd49c0c8d5927f1c193 https://github.com/phpmyadmin/phpmyadmin/commit/ce278cd3eb1ea042bb90dbd49c0… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M import.php Log Message: ----------- Merge branch 'QA_4_6-security' into master-security Commit: 7ddcbc0de6283f42fc0592901d88ee53b457bee9 https://github.com/phpmyadmin/phpmyadmin/commit/7ddcbc0de6283f42fc0592901d8… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M libraries/tbl_partition_definition.inc.php Log Message: ----------- Validate (sub)partion count from request before use Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: e43170902bf69e9f73304aef10fdc422ba65161b https://github.com/phpmyadmin/phpmyadmin/commit/e43170902bf69e9f73304aef10f… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M libraries/tbl_partition_definition.inc.php Log Message: ----------- Merge branch 'QA_4_6-security' into master-security Commit: 733a5d582193d32c5435bd6324316c9da1b01678 https://github.com/phpmyadmin/phpmyadmin/commit/733a5d582193d32c5435bd63243… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M libraries/ErrorHandler.php M libraries/Message.php M libraries/plugins/AuthenticationPlugin.php Log Message: ----------- Avoid rendering BB code when showing PHP/MySQL errors Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: d01c078b7d48c8f7d4f0784cb4b04ae933a6d23b https://github.com/phpmyadmin/phpmyadmin/commit/d01c078b7d48c8f7d4f0784cb4b… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M libraries/DatabaseInterface.php M libraries/Error.php M libraries/ErrorHandler.php M libraries/session.inc.php Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: 4c34f140779711e1511c721a262028a929a81f91 https://github.com/phpmyadmin/phpmyadmin/commit/4c34f140779711e1511c721a262… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M libraries/DatabaseInterface.php M libraries/Error.php Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: 50f48aa629a63d4fba81d625b179919d7093422b https://github.com/phpmyadmin/phpmyadmin/commit/50f48aa629a63d4fba81d625b17… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M libraries/DatabaseInterface.php M libraries/Error.php M libraries/ErrorHandler.php M libraries/core.lib.php M libraries/session.inc.php Log Message: ----------- Merge branch 'master' into master-security Commit: 3ba11212a3558f112d82d42d6cf305db6ef6912f https://github.com/phpmyadmin/phpmyadmin/commit/3ba11212a3558f112d82d42d6cf… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M libraries/ErrorHandler.php M libraries/Message.php M libraries/plugins/AuthenticationPlugin.php Log Message: ----------- Merge branch 'QA_4_6-security' into master-security Commit: dac36c3cd889f87165ae776e3929fe9f946f67ad https://github.com/phpmyadmin/phpmyadmin/commit/dac36c3cd889f87165ae776e392… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M index.php M libraries/core.lib.php M test/libraries/core/PMA_isAllowedDomain_test.php Log Message: ----------- Stricter URL validation - do not use empty() as empty('0') is true - do not lowercase the strings, use them as they are - lowercase all domains in our codebase - do not allow to specify port Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 9f0c4c37f3067abcaa7a40b9ef907e343ee62de4 https://github.com/phpmyadmin/phpmyadmin/commit/9f0c4c37f3067abcaa7a40b9ef9… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M test/classes/MessageTest.php Log Message: ----------- Fix test failures with recent changes to Message class Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 5ee95b3615e2224eddb3cc24c77b00fddb06a4b8 https://github.com/phpmyadmin/phpmyadmin/commit/5ee95b3615e2224eddb3cc24c77… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M index.php M libraries/core.lib.php M test/classes/MessageTest.php M test/libraries/core/PMA_isAllowedDomain_test.php Log Message: ----------- Merge branch 'QA_4_6-security' into master-security Commit: 2f2e3565ba1e85072d2c1a1f0a06b84bebce8f9f https://github.com/phpmyadmin/phpmyadmin/commit/2f2e3565ba1e85072d2c1a1f0a0… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M libraries/ip_allow_deny.lib.php Log Message: ----------- Use hash_equals when comparing IPv6 allow rules Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 0318a7e00265ff3b495534d21b3c8948f4407ba9 https://github.com/phpmyadmin/phpmyadmin/commit/0318a7e00265ff3b495534d21b3… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M libraries/ip_allow_deny.lib.php Log Message: ----------- Merge branch 'QA_4_6-security' into master-security Commit: c4613745f398f0fdd8bb238ce7f02eea58d7125d https://github.com/phpmyadmin/phpmyadmin/commit/c4613745f398f0fdd8bb238ce7f… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M po/ru.po M po/sk.po Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: 7b0f8df58e3dbce621cf0f5285fd4cba00ad77c8 https://github.com/phpmyadmin/phpmyadmin/commit/7b0f8df58e3dbce621cf0f5285f… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M ChangeLog M js/functions.js M libraries/common.inc.php M libraries/navigation/NavigationHeader.php Log Message: ----------- Merge branch 'master' into master-security Commit: 1aa0256c940b6d155cd2a4218b553135094223e2 https://github.com/phpmyadmin/phpmyadmin/commit/1aa0256c940b6d155cd2a4218b5… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Log Message: ----------- Merge branch 'QA_4_6-security' into master-security Commit: 3d99185919cdca3ea31caafc7421c507086bdb9c https://github.com/phpmyadmin/phpmyadmin/commit/3d99185919cdca3ea31caafc742… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M ChangeLog M libraries/Util.php Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: 9ffbb90ec060177660e528e4ae7b385ff7d99166 https://github.com/phpmyadmin/phpmyadmin/commit/9ffbb90ec060177660e528e4ae7… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M ChangeLog M libraries/Util.php Log Message: ----------- Merge branch 'master' into master-security Commit: a9f6bd1a8b9661a3a99a05b7db81426a1ae0dd3a https://github.com/phpmyadmin/phpmyadmin/commit/a9f6bd1a8b9661a3a99a05b7db8… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Log Message: ----------- Merge branch 'QA_4_6-security' into master-security Commit: 2559dc3a62a416eba8284542303173127feeb767 https://github.com/phpmyadmin/phpmyadmin/commit/2559dc3a62a416eba8284542303… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M ChangeLog M import.php M js/config.js M js/functions.js M js/messages.php M js/tbl_structure.js M libraries/DatabaseInterface.php M libraries/VersionInformation.php M libraries/dbi/DBIDummy.php M libraries/import.lib.php M libraries/sanitizing.lib.php M libraries/server_user_groups.lib.php M libraries/sql-parser/src/Components/AlterOperation.php M libraries/sql-parser/src/Components/CreateDefinition.php M libraries/sql-parser/src/Components/IntoKeyword.php M libraries/sql-parser/src/Components/OptionsArray.php M libraries/sql-parser/src/Components/PartitionDefinition.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/Statement.php M libraries/sql-parser/src/Statements/CreateStatement.php M libraries/sql-parser/src/Statements/InsertStatement.php M libraries/sql-parser/src/Statements/ReplaceStatement.php M libraries/sql-parser/src/Statements/SetStatement.php M libraries/sql-parser/src/Utils/CLI.php M libraries/sql-parser/src/Utils/Formatter.php M libraries/sql.lib.php M po/az.po M po/hu.po M po/id.po M po/ja.po M po/sk.po M po/zh_CN.po M test/libraries/PMA_sql_test.php Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: 809a75eb92adb62a4f90448bb750d703a14c901a https://github.com/phpmyadmin/phpmyadmin/commit/809a75eb92adb62a4f90448bb75… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M .travis.yml M ChangeLog M doc/transformations.rst M import.php M js/config.js M js/functions.js M js/messages.php M js/tbl_structure.js M libraries/Sanitize.php M libraries/SysInfoLinux.php M libraries/Util.php M libraries/common.inc.php M libraries/dbi/DBIDummy.php M libraries/import.lib.php M libraries/plugins/schema/svg/Svg.php M libraries/plugins/schema/svg/SvgRelationSchema.php M libraries/server_user_groups.lib.php M libraries/sql.lib.php M po/az.po M po/hu.po M po/id.po M po/ja.po M po/sk.po M po/zh_CN.po 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 M test/libraries/PMA_sql_test.php M test/libraries/common/PMA_formatNumberByteDown_test.php Log Message: ----------- Merge branch 'master' into master-security Commit: 19c24a8c6cd2b454e5185dda373c52fab53a5c8f https://github.com/phpmyadmin/phpmyadmin/commit/19c24a8c6cd2b454e5185dda373… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M db_operations.php M export.php M import.php M import_status.php M libraries/Bookmark.php M libraries/Config.php M libraries/DbQbe.php M libraries/DbSearch.php M libraries/DisplayResults.php M libraries/Header.php M libraries/Index.php M libraries/ListDatabase.php M libraries/Menu.php M libraries/Message.php M libraries/Response.php M libraries/Table.php M libraries/URL.php M libraries/Util.php M libraries/controllers/server/ServerDatabasesController.php M libraries/controllers/table/TableChartController.php M libraries/controllers/table/TableSearchController.php M libraries/controllers/table/TableStructureController.php M libraries/core.lib.php M libraries/db_common.inc.php M libraries/db_table_exists.inc.php M libraries/display_export.lib.php M libraries/export.lib.php M libraries/insert_edit.lib.php M libraries/mult_submits.inc.php M libraries/operations.lib.php M libraries/plugins/ImportPlugin.php M libraries/plugins/auth/AuthenticationCookie.php M libraries/plugins/export/ExportXml.php M libraries/plugins/export/TableProperty.php M libraries/plugins/import/ImportCsv.php M libraries/plugins/import/ImportShp.php M libraries/plugins/schema/pdf/Pdf.php M libraries/relation.lib.php M libraries/replication_gui.lib.php M libraries/rte/rte_main.inc.php M libraries/server_privileges.lib.php M libraries/server_status_monitor.lib.php M libraries/server_status_processes.lib.php M libraries/sql.lib.php M libraries/sql_query_form.lib.php M libraries/tbl_info.inc.php M libraries/transformations.lib.php M sql.php M tbl_addfield.php M tbl_change.php M tbl_create.php M templates/database/structure/structure_table_row.phtml Log Message: ----------- Merge branch 'master' into master-security Commit: 161e408ab760e9be8a58bfdf7ce26881a0570798 https://github.com/phpmyadmin/phpmyadmin/commit/161e408ab760e9be8a58bfdf7ce… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M ChangeLog M doc/setup.rst M doc/transformations.rst M js/common.js M js/export.js M js/functions.js M js/messages.php M js/rte.js M js/tbl_change.js M libraries/DatabaseInterface.php M libraries/Table.php M libraries/export.lib.php M libraries/insert_edit.lib.php M libraries/rte/rte_export.lib.php M libraries/rte/rte_list.lib.php M libraries/rte/rte_routines.lib.php M libraries/rte/rte_words.lib.php M libraries/server_privileges.lib.php M libraries/tbl_info.inc.php M po/de.po M po/nl.po M tbl_operations.php M test/classes/TableTest.php M test/libraries/PMA_export_test.php M test/libraries/PMA_insert_edit_test.php M test/libraries/PMA_server_privileges_test.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: 07b846f94b67d41b1ced33d8d9db0c927b99cc81 https://github.com/phpmyadmin/phpmyadmin/commit/07b846f94b67d41b1ced33d8d9d… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M ChangeLog M doc/setup.rst M js/common.js M js/export.js M js/functions.js M js/messages.php M js/rte.js M js/tbl_change.js M libraries/DatabaseInterface.php A libraries/OpenDocument.php M libraries/Table.php M libraries/export.lib.php M libraries/insert_edit.lib.php R libraries/opendocument.lib.php M libraries/plugins/export/ExportOds.php M libraries/plugins/export/ExportOdt.php M libraries/rte/rte_export.lib.php M libraries/rte/rte_list.lib.php M libraries/rte/rte_routines.lib.php M libraries/rte/rte_words.lib.php M libraries/server_privileges.lib.php M libraries/tbl_info.inc.php M po/de.po M po/nl.po M scripts/create-release.sh M tbl_operations.php M test/bootstrap-dist.php M test/classes/TableTest.php M test/classes/plugin/export/ExportOdsTest.php M test/classes/plugin/export/ExportOdtTest.php M test/libraries/PMA_export_test.php M test/libraries/PMA_insert_edit_test.php M test/libraries/PMA_server_privileges_test.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php Log Message: ----------- Merge branch 'master' into master-security Commit: c9d953a5ef0d1861711a1f1b0b1d60932dcd0701 https://github.com/phpmyadmin/phpmyadmin/commit/c9d953a5ef0d1861711a1f1b0b1… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Log Message: ----------- Merge branch 'QA_4_6-security' into master-security Commit: fbad6b9b4d175aa82cd35972aa2dcd9ef3ec4346 https://github.com/phpmyadmin/phpmyadmin/commit/fbad6b9b4d175aa82cd35972aa2… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M libraries/plugins/AuthenticationPlugin.php M libraries/plugins/auth/AuthenticationConfig.php M libraries/plugins/auth/AuthenticationCookie.php M libraries/plugins/auth/AuthenticationHttp.php Log Message: ----------- Verify value of access_time to avoid unwanted session extension We need to ansure the access_time parameter is in valid range to avoid possibility of remotely extending session validity. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 5a1854c2b780785ccbddb22d833888ad1780e439 https://github.com/phpmyadmin/phpmyadmin/commit/5a1854c2b780785ccbddb22d833… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M libraries/plugins/AuthenticationPlugin.php M libraries/plugins/auth/AuthenticationConfig.php M libraries/plugins/auth/AuthenticationCookie.php M libraries/plugins/auth/AuthenticationHttp.php Log Message: ----------- Merge branch 'QA_4_6-security' into master-security Commit: 3df5113a8c472567308c913b8a6e68f24a6b1f57 https://github.com/phpmyadmin/phpmyadmin/commit/3df5113a8c472567308c913b8a6… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-26 (Mon, 26 Sep 2016) Changed paths: M ChangeLog M doc/config.rst M js/tbl_structure.js M libraries/Util.php M libraries/config.default.php M libraries/controllers/table/TableSearchController.php M libraries/rte/rte_routines.lib.php M libraries/sql-parser/src/Components/OptionsArray.php M libraries/sql-parser/src/Statements/CreateStatement.php M libraries/sql-parser/src/Statements/InsertStatement.php M libraries/sql-parser/src/Utils/Formatter.php M libraries/sql.lib.php M libraries/tbl_info.inc.php M po/ca.po M po/de.po M po/ja.po M po/ko.po M po/pt_BR.po M po/ru.po M po/sl.po Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: 6f8edef792e17ccb7373b679c6eaf915162925b7 https://github.com/phpmyadmin/phpmyadmin/commit/6f8edef792e17ccb7373b679c6e… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-26 (Mon, 26 Sep 2016) Changed paths: M ChangeLog M doc/config.rst M doc/setup.rst M js/tbl_structure.js M libraries/Util.php M libraries/config.default.php M libraries/controllers/table/TableSearchController.php M libraries/navigation/NavigationTree.php M libraries/navigation/nodes/NodeColumn.php M libraries/navigation/nodes/NodeColumnContainer.php M libraries/navigation/nodes/NodeDatabase.php M libraries/navigation/nodes/NodeDatabaseContainer.php M libraries/navigation/nodes/NodeEvent.php M libraries/navigation/nodes/NodeEventContainer.php M libraries/navigation/nodes/NodeFunction.php M libraries/navigation/nodes/NodeFunctionContainer.php M libraries/navigation/nodes/NodeIndex.php M libraries/navigation/nodes/NodeIndexContainer.php M libraries/navigation/nodes/NodeProcedure.php M libraries/navigation/nodes/NodeProcedureContainer.php M libraries/navigation/nodes/NodeTable.php M libraries/navigation/nodes/NodeTableContainer.php M libraries/navigation/nodes/NodeTrigger.php M libraries/navigation/nodes/NodeTriggerContainer.php M libraries/navigation/nodes/NodeView.php M libraries/navigation/nodes/NodeViewContainer.php M libraries/plugins/import/ImportShp.php M libraries/rte/rte_routines.lib.php M libraries/server_privileges.lib.php M libraries/sql.lib.php M libraries/tbl_info.inc.php M po/ca.po M po/de.po M po/ja.po M po/ko.po M po/pt_BR.po M po/ru.po M po/sl.po Log Message: ----------- Merge branch 'master' into master-security Commit: 26bf244264a3c5af8cdd6c7a53e2fc80c1c9cda1 https://github.com/phpmyadmin/phpmyadmin/commit/26bf244264a3c5af8cdd6c7a53e… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-26 (Mon, 26 Sep 2016) Log Message: ----------- Merge branch 'QA_4_6-security' into master-security Commit: f87358dff730e7a5ada13922108151a9eee107cf https://github.com/phpmyadmin/phpmyadmin/commit/f87358dff730e7a5ada13922108… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-02 (Sun, 02 Oct 2016) Changed paths: M prefs_manage.php Log Message: ----------- Don't assume the default arg_separator in URL Respect the value for arg_separator.input too. Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 17b34be04f5cc2a5f83d73eba7cd41cbc3ebb7b2 https://github.com/phpmyadmin/phpmyadmin/commit/17b34be04f5cc2a5f83d73eba7c… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-04 (Tue, 04 Oct 2016) Changed paths: M libraries/core.lib.php M test/libraries/core/PMA_safeUnserialize_test.php Log Message: ----------- Correctly parse string length when checking serialized data Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: ad39140c8691cdaee2607b593d2b8755298dff1e https://github.com/phpmyadmin/phpmyadmin/commit/ad39140c8691cdaee2607b593d2… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-04 (Tue, 04 Oct 2016) Changed paths: M libraries/core.lib.php M test/libraries/core/PMA_safeUnserialize_test.php Log Message: ----------- Merge branch 'QA_4_6-security' into master-security Commit: a7a541347b5f5037207a01a2a20a8c13076efce8 https://github.com/phpmyadmin/phpmyadmin/commit/a7a541347b5f5037207a01a2a20… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-04 (Tue, 04 Oct 2016) Changed paths: M prefs_manage.php Log Message: ----------- Merge branch 'QA_4_6-security' of github.com:phpmyadmin/phpmyadmin-security into QA_4_6-security Commit: 69951525318b246193d82ad7e101748a24a18e93 https://github.com/phpmyadmin/phpmyadmin/commit/69951525318b246193d82ad7e10… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-04 (Tue, 04 Oct 2016) Changed paths: M ChangeLog M doc/config.rst M import.php M js/codemirror/addon/lint/sql-lint.js M libraries/Config.php M libraries/Util.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 A 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.lib.php M po/id.po M po/mk.po M po/sk.po M po/zh_CN.po R scripts/remove_control_m.sh R scripts/revision-info M server_privileges.php M tbl_export.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: d753aaaa9b9030c7088e53cb1bbd0c5a2697974a https://github.com/phpmyadmin/phpmyadmin/commit/d753aaaa9b9030c7088e53cb1bb… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-04 (Tue, 04 Oct 2016) Changed paths: M .travis.yml M ChangeLog M doc/config.rst M doc/setup.rst M import.php M js/codemirror/addon/lint/sql-lint.js M libraries/Config.php M libraries/DatabaseInterface.php M libraries/Header.php M libraries/Util.php M libraries/advisor.lib.php M libraries/controllers/server/ServerVariablesController.php M libraries/dbi/DBIDummy.php M libraries/dbi/DBIExtension.php M libraries/dbi/DBIMysql.php M libraries/dbi/DBIMysqli.php M libraries/error.inc.php M libraries/gis/GISPolygon.php M libraries/import.lib.php M libraries/insert_edit.lib.php M libraries/ip_allow_deny.lib.php M libraries/navigation/NavigationTree.php M libraries/server_privileges.lib.php M libraries/sql.lib.php M po/id.po M po/mk.po M po/sk.po M po/zh_CN.po R scripts/remove_control_m.sh R scripts/revision-info M server_privileges.php M tbl_export.php M test/classes/ConfigTest.php R test/libraries/common/PMA_pow_test.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php Log Message: ----------- Merge branch 'master' into master-security Commit: 01f7b3c134ef4728501a363554187c4f83e2e519 https://github.com/phpmyadmin/phpmyadmin/commit/01f7b3c134ef4728501a3635541… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-04 (Tue, 04 Oct 2016) Changed paths: M prefs_manage.php Log Message: ----------- Merge branch 'QA_4_6-security' into master-security Commit: 3b8fc504d2a3c1da692cfe703d43d6d81cdc5778 https://github.com/phpmyadmin/phpmyadmin/commit/3b8fc504d2a3c1da692cfe703d4… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-11 (Tue, 11 Oct 2016) Changed paths: M libraries/tracking.lib.php Log Message: ----------- Manage new-lines and extra whitespaces properly Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: d74714c45ec246d179aa4b19d81c30903cdff876 https://github.com/phpmyadmin/phpmyadmin/commit/d74714c45ec246d179aa4b19d81… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-11 (Tue, 11 Oct 2016) Changed paths: M libraries/Tracker.php Log Message: ----------- Manage new-lines and extra whitespaces properly Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 47078395c2aea3d63f1b72d2d26afbd85e2f12f5 https://github.com/phpmyadmin/phpmyadmin/commit/47078395c2aea3d63f1b72d2d26… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-24 (Mon, 24 Oct 2016) Changed paths: M ChangeLog M README.rst M doc/setup.rst M index.php M js/console.js M js/pmd/move.js M js/tbl_change.js M libraries/Advisor.php M libraries/Table.php M libraries/common.inc.php M libraries/config/ConfigFile.php M libraries/config/Validator.php M libraries/plugins/export/ExportSql.php M libraries/relation.lib.php M libraries/replication.inc.php M libraries/server_privileges.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(a)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(a)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(a)latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po M prefs_manage.php M server_replication.php M tbl_export.php M tbl_operations.php M test/classes/TableTest.php M test/classes/config/ConfigFileTest.php M test/classes/plugin/export/ExportSqlTest.php Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: 2ed64c3c6a02cc2d72d7d4e27be8b8b07cc92c13 https://github.com/phpmyadmin/phpmyadmin/commit/2ed64c3c6a02cc2d72d7d4e27be… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-24 (Mon, 24 Oct 2016) Changed paths: M .travis.yml M ChangeLog M README.rst M composer.json M doc/_ext/configext.py M doc/charts.rst M doc/config.rst M doc/faq.rst M doc/glossary.rst M doc/require.rst M doc/setup.rst M doc/transformations.rst M index.php M js/console.js M js/pmd/move.js M js/tbl_change.js M libraries/Advisor.php M libraries/DbList.php M libraries/Table.php M libraries/Theme.php M libraries/Util.php M libraries/common.inc.php M libraries/config.default.php M libraries/config/ConfigFile.php M libraries/config/Validator.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/core.lib.php M libraries/error.inc.php M libraries/ip_allow_deny.lib.php M libraries/plugins/export/ExportPhparray.php M libraries/plugins/export/ExportSql.php M libraries/plugins/schema/dia/Dia.php M libraries/plugins/schema/eps/Eps.php M libraries/plugins/schema/svg/Svg.php M libraries/plugins/transformations/TEMPLATE_ABSTRACT M libraries/relation.lib.php M libraries/select_server.lib.php M libraries/server_privileges.lib.php M libraries/session.inc.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(a)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(a)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(a)latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po M prefs_manage.php M scripts/create-release.sh M server_replication.php M tbl_export.php M tbl_operations.php M test/bootstrap-dist.php A test/ci-docs A test/ci-install-docs M test/ci-install-selenium M test/ci-install-test M test/classes/TableTest.php M test/classes/config/ConfigFileTest.php M test/classes/plugin/export/ExportSqlTest.php M test/install-runkit M test/libraries/common/PMA_showPHPDocu_test.php M test/libraries/core/PMA_getLinks_test.php R themes/sprites.css.php Log Message: ----------- Merge branch 'master' into master-security Commit: fa45c8191e0d5507e32a8a6eab53e77a59759a75 https://github.com/phpmyadmin/phpmyadmin/commit/fa45c8191e0d5507e32a8a6eab5… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-24 (Mon, 24 Oct 2016) Changed paths: M libraries/Tracker.php M libraries/tracking.lib.php Log Message: ----------- Merge branch 'QA_4_6-security' into master-security Commit: b31c304459c5da18db59f55d1a2c8c77fed74d1f https://github.com/phpmyadmin/phpmyadmin/commit/b31c304459c5da18db59f55d1a2… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-25 (Tue, 25 Oct 2016) Changed paths: M ChangeLog M js/console.js M js/functions.js M js/messages.php M js/pmd/move.js M js/tbl_change.js M libraries/DisplayResults.php M libraries/Table.php M libraries/sql-parser/src/Components/CreateDefinition.php M libraries/sql-parser/src/Components/Expression.php M libraries/sql-parser/src/Components/JoinKeyword.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/Lexer.php M libraries/sql-parser/src/Parser.php M libraries/sql-parser/src/Statements/SelectStatement.php M libraries/sql-parser/src/Token.php R phpdox.xml M po/sl.po Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: ed640a4f2cb32e84548d69a82784f09d206b4f08 https://github.com/phpmyadmin/phpmyadmin/commit/ed640a4f2cb32e84548d69a8278… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-25 (Tue, 25 Oct 2016) Changed paths: M ChangeLog M js/console.js M js/functions.js M js/messages.php M js/pmd/move.js M js/tbl_change.js M libraries/DisplayResults.php M libraries/Table.php R phpdox.xml M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php Log Message: ----------- Merge branch 'master' into master-security Commit: a8119c4db14a8190aa2d879b31f3a9558516bcb4 https://github.com/phpmyadmin/phpmyadmin/commit/a8119c4db14a8190aa2d879b31f… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-10-25 (Tue, 25 Oct 2016) Log Message: ----------- Merge branch 'QA_4_6-security' into master-security Commit: 8119464150081bcc18641281d62991bdff5feff7 https://github.com/phpmyadmin/phpmyadmin/commit/8119464150081bcc18641281d62… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-08 (Tue, 08 Nov 2016) Changed paths: M libraries/core.lib.php M test/libraries/core/PMA_sanitizeMySQLHost_test.php Log Message: ----------- Handle multiple `:p` while sanitizing MySQL hosts Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: cad75c95c43f9f4b7fd607abc65a68d2134d756d https://github.com/phpmyadmin/phpmyadmin/commit/cad75c95c43f9f4b7fd607abc65… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-08 (Tue, 08 Nov 2016) Changed paths: M libraries/core.lib.php M test/libraries/core/PMA_sanitizeMySQLHost_test.php Log Message: ----------- Merge branch 'QA_4_6-security' into master-security Commit: 636a38cf8a3572219c84e893ca5061eafffad7c5 https://github.com/phpmyadmin/phpmyadmin/commit/636a38cf8a3572219c84e893ca5… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-08 (Tue, 08 Nov 2016) Changed paths: M ChangeLog M doc/faq.rst M js/functions.js M js/makegrid.js M js/messages.php M js/tbl_change.js M libraries/Footer.php M libraries/Table.php M libraries/pmd_common.php M po/af.po M po/ar.po M po/az.po M po/be.po M po/be(a)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(a)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(a)latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po M templates/table/relation/common_form.phtml M templates/table/relation/foreign_key_row.phtml M test/classes/TableTest.php Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: daae30499fbd0d9581304e4b4cdf2fd2c36ce84b https://github.com/phpmyadmin/phpmyadmin/commit/daae30499fbd0d9581304e4b4cd… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-08 (Tue, 08 Nov 2016) Changed paths: M ChangeLog M doc/faq.rst M import.php M index.php M js/functions.js M js/makegrid.js M js/messages.php M js/tbl_change.js M libraries/Footer.php M libraries/LanguageManager.php M libraries/Table.php R libraries/cleanup.lib.php R libraries/display_select_lang.lib.php M libraries/plugins/auth/AuthenticationCookie.php M libraries/pmd_common.php M po/af.po M po/ar.po M po/az.po M po/be.po M po/be(a)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(a)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(a)latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po A templates/select_lang.phtml M templates/table/relation/common_form.phtml M templates/table/relation/foreign_key_row.phtml M test/classes/TableTest.php Log Message: ----------- Merge branch 'master' into master-security Commit: e169fb86e0d69d4f86e0461d4280ecd0343cbb1c https://github.com/phpmyadmin/phpmyadmin/commit/e169fb86e0d69d4f86e0461d428… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-08 (Tue, 08 Nov 2016) Log Message: ----------- Merge branch 'QA_4_6-security' into master-security Commit: 970de0ac7abe8a4d81333dac3329720f4263654a https://github.com/phpmyadmin/phpmyadmin/commit/970de0ac7abe8a4d81333dac332… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M ChangeLog M browse_foreigners.php M db_operations.php M db_tracking.php M import.php M js/pmd/history.js M libraries/DatabaseInterface.php M libraries/DbSearch.php M libraries/DisplayResults.php M libraries/Menu.php M libraries/Partition.php M libraries/RecentFavoriteTable.php M libraries/SavedSearches.php M libraries/SystemDatabase.php M libraries/Table.php M libraries/Tracker.php M libraries/Util.php M libraries/bookmark.lib.php M libraries/central_columns.lib.php M libraries/common.inc.php M libraries/controllers/server/ServerVariablesController.php M libraries/controllers/table/TableSearchController.php M libraries/controllers/table/TableStructureController.php M libraries/create_addfield.lib.php M libraries/db_designer.lib.php M libraries/db_table_exists.lib.php M libraries/dbi/DBIDummy.php M libraries/dbi/DBIExtension.php M libraries/dbi/DBIMysql.php M libraries/dbi/DBIMysqli.php M libraries/display_export.lib.php M libraries/export.lib.php M libraries/import.lib.php M libraries/insert_edit.lib.php M libraries/mysql_charsets.lib.php M libraries/navigation/Navigation.php M libraries/navigation/NavigationTree.php M libraries/navigation/nodes/Node.php M libraries/navigation/nodes/NodeDatabase.php M libraries/navigation/nodes/NodeTable.php M libraries/operations.lib.php M libraries/plugins/export/ExportSql.php M libraries/plugins/export/ExportXml.php M libraries/plugins/import/ImportCsv.php M libraries/plugins/import/ImportLdi.php M libraries/plugins/schema/pdf/Pdf.php M libraries/pmd_common.php M libraries/relation.lib.php M libraries/relation_cleanup.lib.php M libraries/replication.inc.php M libraries/replication_gui.lib.php M libraries/rte/rte_events.lib.php M libraries/rte/rte_list.lib.php M libraries/rte/rte_routines.lib.php M libraries/rte/rte_triggers.lib.php M libraries/rte/rte_words.lib.php M libraries/server_privileges.lib.php M libraries/server_status_monitor.lib.php M libraries/server_user_groups.lib.php M libraries/sql-parser/src/Components/CreateDefinition.php M libraries/sql-parser/src/Parser.php M libraries/sql-parser/src/Statement.php M libraries/sql-parser/src/Utils/Query.php M libraries/sql.lib.php M libraries/tracking.lib.php M libraries/transformations.lib.php M libraries/user_preferences.lib.php M phpunit.xml.dist M po/af.po M po/ar.po M po/az.po M po/be.po M po/be(a)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(a)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(a)latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po M test/classes/DbSearchTest.php M test/classes/TableTest.php M test/classes/ThemeManagerTest.php M test/classes/TrackerTest.php M test/classes/controllers/TableSearchControllerTest.php M test/classes/navigation/NavigationTest.php M test/classes/navigation/NodeTest.php M test/classes/plugin/export/ExportHtmlwordTest.php M test/classes/plugin/export/ExportLatexTest.php M test/classes/plugin/export/ExportOdsTest.php M test/classes/plugin/export/ExportOdtTest.php M test/classes/plugin/export/ExportSqlTest.php M test/classes/plugin/export/ExportTexytextTest.php M test/classes/plugin/export/ExportXmlTest.php M test/classes/plugin/import/ImportLdiTest.php M test/classes/plugin/import/ImportOdsTest.php M test/libraries/PMA_PMD_common_test.php M test/libraries/PMA_central_columns_test.php M test/libraries/PMA_designer_test.php M test/libraries/PMA_insert_edit_test.php M test/libraries/PMA_server_privileges_test.php M test/libraries/PMA_server_user_groups_test.php M test/libraries/PMA_user_preferences_test.php M test/libraries/common/PMA_quoting_slashing_test.php M test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php M test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php M user_password.php Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security Commit: df0d8a06d3b74056f0c25d776aef3e8040c730d4 https://github.com/phpmyadmin/phpmyadmin/commit/df0d8a06d3b74056f0c25d776ae… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M ChangeLog M browse_foreigners.php M db_operations.php M db_tracking.php M doc/setup.rst M import.php M js/functions.js M js/messages.php M js/pmd/history.js M js/server_privileges.js A js/zxcvbn.js M libraries/Bookmark.php M libraries/DatabaseInterface.php M libraries/DbSearch.php M libraries/DisplayResults.php M libraries/Header.php M libraries/Menu.php M libraries/Partition.php M libraries/RecentFavoriteTable.php M libraries/SavedSearches.php M libraries/SystemDatabase.php M libraries/Table.php M libraries/Tracker.php M libraries/Util.php M libraries/central_columns.lib.php M libraries/common.inc.php M libraries/controllers/server/ServerVariablesController.php M libraries/controllers/table/TableSearchController.php M libraries/controllers/table/TableStructureController.php M libraries/create_addfield.lib.php M libraries/db_designer.lib.php M libraries/db_table_exists.inc.php M libraries/dbi/DBIDummy.php M libraries/dbi/DBIExtension.php M libraries/dbi/DBIMysql.php M libraries/dbi/DBIMysqli.php M libraries/display_change_password.lib.php M libraries/display_export.lib.php M libraries/export.lib.php M libraries/import.lib.php M libraries/insert_edit.lib.php M libraries/navigation/Navigation.php M libraries/navigation/NavigationTree.php M libraries/navigation/nodes/Node.php M libraries/navigation/nodes/NodeDatabase.php M libraries/navigation/nodes/NodeTable.php M libraries/operations.lib.php M libraries/plugins/export/ExportSql.php M libraries/plugins/export/ExportXml.php M libraries/plugins/import/ImportCsv.php M libraries/plugins/import/ImportLdi.php M libraries/plugins/schema/pdf/Pdf.php M libraries/pmd_common.php M libraries/relation.lib.php M libraries/relation_cleanup.lib.php M libraries/replication.inc.php M libraries/replication_gui.lib.php M libraries/rte/rte_events.lib.php M libraries/rte/rte_list.lib.php M libraries/rte/rte_routines.lib.php M libraries/rte/rte_triggers.lib.php M libraries/rte/rte_words.lib.php M libraries/server_privileges.lib.php M libraries/server_status_monitor.lib.php M libraries/server_user_groups.lib.php M libraries/tracking.lib.php M libraries/transformations.lib.php M libraries/user_preferences.lib.php M phpunit.xml.dist M po/af.po M po/ar.po M po/az.po M po/be.po M po/be(a)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(a)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(a)latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po M server_privileges.php M sql/create_tables.sql A sql/upgrade_tables_4_7_0+.sql M templates/table/search/rows_normal.phtml M templates/table/search/rows_zoom.phtml M test/classes/DbSearchTest.php M test/classes/TableTest.php M test/classes/ThemeManagerTest.php M test/classes/TrackerTest.php M test/classes/controllers/TableSearchControllerTest.php M test/classes/navigation/NavigationTest.php M test/classes/navigation/NodeTest.php M test/classes/plugin/export/ExportHtmlwordTest.php M test/classes/plugin/export/ExportLatexTest.php M test/classes/plugin/export/ExportOdsTest.php M test/classes/plugin/export/ExportOdtTest.php M test/classes/plugin/export/ExportSqlTest.php M test/classes/plugin/export/ExportTexytextTest.php M test/classes/plugin/export/ExportXmlTest.php M test/classes/plugin/import/ImportLdiTest.php M test/classes/plugin/import/ImportOdsTest.php M test/libraries/PMA_PMD_common_test.php M test/libraries/PMA_central_columns_test.php M test/libraries/PMA_designer_test.php M test/libraries/PMA_insert_edit_test.php M test/libraries/PMA_server_privileges_test.php M test/libraries/PMA_server_user_groups_test.php M test/libraries/PMA_user_preferences_test.php M test/libraries/common/PMA_quoting_slashing_test.php M test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php M test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php M themes/pmahomme/css/common.css.php M user_password.php Log Message: ----------- Merge branch 'master' into master-security Commit: cf782b9ef321cc6e69f2fa109c1e8551a1a07c1f https://github.com/phpmyadmin/phpmyadmin/commit/cf782b9ef321cc6e69f2fa109c1… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Log Message: ----------- Merge branch 'QA_4_6-security' into master-security Commit: 1f24e5c7556ca3308114d7233d48e5a5851d93cd https://github.com/phpmyadmin/phpmyadmin/commit/1f24e5c7556ca3308114d7233d4… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M import.php M index.php M js/config.js M js/microhistory.js M libraries/DbQbe.php M libraries/Error.php M libraries/ErrorHandler.php M libraries/Message.php M libraries/SavedSearches.php M libraries/Tracker.php M libraries/Util.php M libraries/core.lib.php M libraries/export.lib.php M libraries/ip_allow_deny.lib.php M libraries/plugins/AuthenticationPlugin.php M libraries/plugins/auth/AuthenticationConfig.php M libraries/plugins/auth/AuthenticationCookie.php M libraries/plugins/auth/AuthenticationHttp.php M libraries/tbl_partition_definition.inc.php M libraries/tracking.lib.php M prefs_manage.php M test/classes/ErrorTest.php M test/classes/MessageTest.php M test/libraries/core/PMA_isAllowedDomain_test.php M test/libraries/core/PMA_safeUnserialize_test.php M test/libraries/core/PMA_sanitizeMySQLHost_test.php Log Message: ----------- Merge branch 'master-security' Commit: fb161a7bebe60d902f743227158eca6a9889c472 https://github.com/phpmyadmin/phpmyadmin/commit/fb161a7bebe60d902f743227158… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M libraries/server_privileges.lib.php M po/cs.po M po/fr.po A templates/privileges/add_user_fieldset.phtml A templates/privileges/delete_user_fieldset.phtml Log Message: ----------- Merge remote-tracking branch 'upstream/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/80c0b4fd66f8...fb161a7bebe6

1 0