Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d093c66f1f8df839afb232303dc0ea0b2ac7079a https://github.com/phpmyadmin/phpmyadmin/commit/d093c66f1f8df839afb232303dc0... Author: Piyush Vijay piyushvijay.1997@gmail.com Date: 2018-03-30 (Fri, 30 Mar 2018)

Changed paths: M js/designer/move.js M js/messages.php

Log Message: ----------- Designer: "Add options" dialog doesn't reset when canceling: #14110 issue fixed (#14117)

* Designer: "Add options" dialog doesn't reset when canceling: Fix #14110 Signed-off-by: Piyush Vijay piyushvijay.1997@gmail.com

* Designer: Add option dialogue error handling needs to be modified Fix #14126 Signed-off-by: Piyush Vijay piyushvijay.1997@gmail.com (cherry picked from commit 6700b2d56fc87315a741ca3c2549fba96a3172df) Signed-off-by: Maurício Meneghini Fauth mauriciofauth@gmail.com

Commit: 4c2511b8c44c2e68e5cc40247f9ddc18ff753903 https://github.com/phpmyadmin/phpmyadmin/commit/4c2511b8c44c2e68e5cc40247f9d... Author: Maurício Meneghini Fauth mauriciofauth@gmail.com Date: 2018-03-30 (Fri, 30 Mar 2018)

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6700b2d56fc8...4c2511b8c44c