Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 928e266e698fa1873dca98c50cddbf82f95b153b https://github.com/phpmyadmin/phpmyadmin/commit/928e266e698fa1873dca98c50cdd... Author: Lukas Bixen <lrb2_@outlook.com> Date: 2021-08-23 (Mon, 08 August 2021) -05:00 Changed paths: M templates/database/qbe/selection_form.twig M templates/database/search/main.twig M templates/server/export/index.twig M templates/server/privileges/privileges_summary.twig M templates/server/privileges/privileges_table.twig M templates/server/replication/database_multibox.twig M templates/sql/query.twig M templates/sql/set_column.twig M templates/table/chart/tbl_chart.twig M templates/table/operations/index.twig M templates/table/search/index.twig M themes/bootstrap/scss/_common.scss M themes/metro/scss/_common.scss M themes/original/scss/_common.scss M themes/pmahomme/scss/_common.scss Log Message: ----------- Fix #16067: Make select multiples resizable: New `resize-vertical` class for elements that may be resized vertically. Signed-off-by: Lukas Bixen <lrb2_@outlook.com> Commit: 02f87d85fccb9124ef448d0ccdeef8b2cbc840cc https://github.com/phpmyadmin/phpmyadmin/commit/02f87d85fccb9124ef448d0ccdee... Author: Lukas Bixen <lrb2_@outlook.com> Date: 2021-08-23 (Mon, 08 August 2021) -05:00 Changed paths: M test/classes/Controllers/SqlControllerTest.php Log Message: ----------- Fix SqlControllerTest after PR #17068 Signed-off-by: Lukas Bixen <lrb2_@outlook.com> Commit: 90018d5626d2b50cf9d5bd98811efba6bf1ecb3d https://github.com/phpmyadmin/phpmyadmin/commit/90018d5626d2b50cf9d5bd98811e... Author: William Desportes <williamdes@wdes.fr> Date: 2021-08-23 (Mon, 08 August 2021) +02:00 Changed paths: M libraries/classes/Plugins/Import/ImportLdi.php Log Message: ----------- Fix #16942 - auto-detection for "LOAD DATA LOCAL INFILE" LOCAL option Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: 84de4a672d7e431a59f539d57c63163be55f456f https://github.com/phpmyadmin/phpmyadmin/commit/84de4a672d7e431a59f539d57c63... Author: William Desportes <williamdes@wdes.fr> Date: 2021-08-23 (Mon, 08 August 2021) +02:00 Changed paths: M libraries/classes/Controllers/ImportController.php M libraries/common.inc.php Log Message: ----------- Fix #16942 - Table Import with CSV using LOAD DATA LOCAL causes error "LOAD DATA LOCAL INFILE is forbidden" Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: 1850efdc039c6a195530109ebf1425776bdcda9e https://github.com/phpmyadmin/phpmyadmin/commit/1850efdc039c6a195530109ebf14... Author: William Desportes <williamdes@wdes.fr> Date: 2021-08-23 (Mon, 08 August 2021) +02:00 Changed paths: M libraries/classes/Display/Results.php Log Message: ----------- Fix coding standard issues Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: 0ddf30bcb8874ad1a637e8ed2c395ce223c97de4 https://github.com/phpmyadmin/phpmyadmin/commit/0ddf30bcb8874ad1a637e8ed2c39... Author: William Desportes <williamdes@wdes.fr> Date: 2021-08-23 (Mon, 08 August 2021) +02:00 Changed paths: M ChangeLog Log Message: ----------- Add a ChangeLog entry for #16942 Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: 2f92bc4f620fce886f38c1cf12654f88fdf86ffe https://github.com/phpmyadmin/phpmyadmin/commit/2f92bc4f620fce886f38c1cf1265... Author: William Desportes <williamdes@wdes.fr> Date: 2021-08-23 (Mon, 08 August 2021) +02:00 Changed paths: M templates/database/qbe/selection_form.twig M templates/database/search/main.twig M templates/server/export/index.twig M templates/server/privileges/privileges_summary.twig M templates/server/privileges/privileges_table.twig M templates/server/replication/database_multibox.twig M templates/sql/query.twig M templates/sql/set_column.twig M templates/table/chart/tbl_chart.twig M templates/table/operations/index.twig M templates/table/search/index.twig M test/classes/Controllers/SqlControllerTest.php M themes/bootstrap/scss/_common.scss M themes/metro/scss/_common.scss M themes/original/scss/_common.scss M themes/pmahomme/scss/_common.scss Log Message: ----------- Merge #17068 - Fix #16067 - Make select elements where multiple items can be selected resizable Pull-request: #17068 Fixes: #16067 Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: 6bc946600a70edcd8187574c980de11b1cfc4973 https://github.com/phpmyadmin/phpmyadmin/commit/6bc946600a70edcd8187574c980d... Author: William Desportes <williamdes@wdes.fr> Date: 2021-08-23 (Mon, 08 August 2021) +02:00 Changed paths: M ChangeLog Log Message: ----------- Add a ChangeLog entry for #16067 Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: b72f94116759300af8aadecaf55d22e437f91153 https://github.com/phpmyadmin/phpmyadmin/commit/b72f94116759300af8aadecaf55d... Author: William Desportes <williamdes@wdes.fr> Date: 2021-08-23 (Mon, 08 August 2021) +02:00 Changed paths: M ChangeLog M libraries/classes/Common.php M libraries/classes/Controllers/ImportController.php M libraries/classes/Plugins/Import/ImportLdi.php M templates/database/qbe/selection_form.twig M templates/database/search/main.twig M templates/server/export/index.twig M templates/server/privileges/privileges_summary.twig M templates/server/privileges/privileges_table.twig M templates/server/replication/database_multibox.twig M templates/sql/query.twig M templates/sql/set_column.twig M templates/table/chart/tbl_chart.twig M templates/table/operations/index.twig M templates/table/search/index.twig M test/classes/Controllers/SqlControllerTest.php M themes/bootstrap/scss/_common.scss M themes/metro/scss/_common.scss M themes/original/scss/_common.scss M themes/pmahomme/scss/_common.scss Log Message: ----------- Merge branch 'QA_5_1' Signed-off-by: William Desportes <williamdes@wdes.fr>