Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8bf3cf6578678e0c68ab58c293ad20a04a9ec49c https://github.com/phpmyadmin/phpmyadmin/commit/8bf3cf6578678e0c68ab58c293ad... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-17 (Fri, 17 Jun 2016) Changed paths: M libraries/ServerStatusData.php Log Message: ----------- Use URL::getCommon to construct complete URL Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 325122658ab899fc4277db15b116f7ac83150092 https://github.com/phpmyadmin/phpmyadmin/commit/325122658ab899fc4277db15b116... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-17 (Fri, 17 Jun 2016) Changed paths: M libraries/DisplayResults.php Log Message: ----------- Fix parameter type documentation Signed-off-by: Michal Čihař <michal@cihar.com> Commit: aef5df7e133779a2597655017f77f5c325c7e7e6 https://github.com/phpmyadmin/phpmyadmin/commit/aef5df7e133779a2597655017f77... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-17 (Fri, 17 Jun 2016) Changed paths: M db_central_columns.php Log Message: ----------- Ensure we have integer as position Signed-off-by: Michal Čihař <michal@cihar.com> Commit: d1ec59f05f47b1b18fd26e161bc9c60556d88cb2 https://github.com/phpmyadmin/phpmyadmin/commit/d1ec59f05f47b1b18fd26e161bc9... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-17 (Fri, 17 Jun 2016) Changed paths: M libraries/display_import.lib.php Log Message: ----------- Ensure we have integer as offset Signed-off-by: Michal Čihař <michal@cihar.com> Commit: a5950f9ecdb0445d139ae66a5119261ad2f8e5e0 https://github.com/phpmyadmin/phpmyadmin/commit/a5950f9ecdb0445d139ae66a5119... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-17 (Fri, 17 Jun 2016) Changed paths: M libraries/Util.php Log Message: ----------- Fix link to mariadb explain analyzer - avoid double urlencoding of the query - properly escape html entities Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 84507dfeb6f9ddc2a5a4c7156bebda6001dcbbe3 https://github.com/phpmyadmin/phpmyadmin/commit/84507dfeb6f9ddc2a5a4c7156beb... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-17 (Fri, 17 Jun 2016) Changed paths: M db_central_columns.php M libraries/Util.php M libraries/display_import.lib.php Log Message: ----------- Merge branch 'QA_4_6' Commit: 170c045507bb48285c6a684b684aade51c73117e https://github.com/phpmyadmin/phpmyadmin/commit/170c045507bb48285c6a684b684a... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-17 (Fri, 17 Jun 2016) Changed paths: M libraries/Util.php Log Message: ----------- Simplify code for processing SQL query to display Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 58da9751176e53b61f3992d44435e8c1d52c37f1 https://github.com/phpmyadmin/phpmyadmin/commit/58da9751176e53b61f3992d44435... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-17 (Fri, 17 Jun 2016) Changed paths: M libraries/Util.php Log Message: ----------- Add missing URL encoding Signed-off-by: Michal Čihař <michal@cihar.com> Commit: e531526bc57b2d8deb75fa909e53a89cd78ab17a https://github.com/phpmyadmin/phpmyadmin/commit/e531526bc57b2d8deb75fa909e53... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-17 (Fri, 17 Jun 2016) Changed paths: M libraries/Util.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/dce94f229f34...e531526bc57b