Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d792bc68a2e274c7b19ae425b19c2989d8fd35f8 https://github.com/phpmyadmin/phpmyadmin/commit/d792bc68a2e274c7b19ae425b19c... Author: Saurabh Srivastava saurabhsrivastava312@gmail.com Date: 2019-03-30 (Sat, 03 March 2019) +05:30

Changed paths: M libraries/classes/Config/Descriptions.php M libraries/classes/Config/FormDisplayTemplate.php

Log Message: ----------- Fix #15119 - Uninterpreted HTML on Settings->Export page

Signed-off-by: Saurabh Srivastava saurabhsrivastava312@gmail.com

Commit: 9c6e2b812d0ba76dee5e92e4bfa0fe2eef523477 https://github.com/phpmyadmin/phpmyadmin/commit/9c6e2b812d0ba76dee5e92e4bfa0... Author: William Desportes williamdes@wdes.fr Date: 2019-04-05 (Fri, 04 April 2019) +02:00

Changed paths: M libraries/classes/Config/Descriptions.php M libraries/classes/Config/FormDisplayTemplate.php

Log Message: ----------- Fix #15119 - Uninterpreted HTML on Settings->Export page

Fixes: #15119 Pull-request: #15132 Closes: #15134 Signed-off-by: William Desportes williamdes@wdes.fr

Commit: ea7dbf33daebeed86b37f96b8f625f5ca6f1e4e9 https://github.com/phpmyadmin/phpmyadmin/commit/ea7dbf33daebeed86b37f96b8f62... Author: William Desportes williamdes@wdes.fr Date: 2019-04-05 (Fri, 04 April 2019) +02:00

Changed paths: M ChangeLog

Log Message: ----------- Add ChangeLog entry for #15119

Signed-off-by: William Desportes williamdes@wdes.fr

Commit: 5b06f7e495c0cf9b9f4e9cf09360d33088489c5b https://github.com/phpmyadmin/phpmyadmin/commit/5b06f7e495c0cf9b9f4e9cf09360... Author: WWWesten wwwesten@gmail.com Date: 2019-04-06 (Sat, 04 April 2019) +02:00

Changed paths: M po/kk.po

Log Message: ----------- Translated using Weblate (Kazakh)

Currently translated at 62.0% (2045 of 3298 strings)

[CI skip]

Translation: phpMyAdmin/4.8 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/kk/ Signed-off-by: WWWesten wwwesten@gmail.com

Commit: 05c0591c2d5ed4ef56429d887b11aa1462f97585 https://github.com/phpmyadmin/phpmyadmin/commit/05c0591c2d5ed4ef56429d887b11... Author: William Desportes williamdes@wdes.fr Date: 2019-04-07 (Sun, 04 April 2019) +02:00

Changed paths: M templates/console/display.twig

Log Message: ----------- Fix #15159 - Missing query time and database in console

Fixes: #15159 Signed-off-by: William Desportes williamdes@wdes.fr

Commit: 91f2c699a0ea5511ae3a818ed855bf1d46607c62 https://github.com/phpmyadmin/phpmyadmin/commit/91f2c699a0ea5511ae3a818ed855... Author: William Desportes williamdes@wdes.fr Date: 2019-04-07 (Sun, 04 April 2019) +02:00

Changed paths: M ChangeLog

Log Message: ----------- Add ChangeLog entry for #15159

Issue-introduced-by: 275baf60bde9d20fe25980ada293d8abd313cc6e Signed-off-by: William Desportes williamdes@wdes.fr

Commit: caa2035cc82ce3b0f887218622071230368ad6e2 https://github.com/phpmyadmin/phpmyadmin/commit/caa2035cc82ce3b0f88721862207... Author: William Desportes williamdes@wdes.fr Date: 2019-04-07 (Sun, 04 April 2019) +02:00

Changed paths: M ChangeLog M libraries/classes/Config/Descriptions.php M libraries/classes/Config/FormDisplayTemplate.php M templates/console/display.twig

Log Message: ----------- Merge branch 'QA_4_8'

Signed-off-by: William Desportes williamdes@wdes.fr