Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ece9fe84c917780020a0354d0824db9e1d74abda https://github.com/phpmyadmin/phpmyadmin/commit/ece9fe84c917780020a0354d0824... Author: Maurício Meneghini Fauth mauriciofauth@gmail.com Date: 2018-04-06 (Fri, 06 Apr 2018)

Changed paths: M js/functions.js

Log Message: ----------- Revert "Remove redundant else"

This reverts commit 8b04a2b2a7c9ff1117b1f28fa2e014f12c272c53.

Signed-off-by: Maurício Meneghini Fauth mauriciofauth@gmail.com

Commit: 7a6b3cbba871d2a429b235c0d0bffb20c1f16823 https://github.com/phpmyadmin/phpmyadmin/commit/7a6b3cbba871d2a429b235c0d0bf... Author: Maurício Meneghini Fauth mauriciofauth@gmail.com Date: 2018-04-06 (Fri, 06 Apr 2018)

Changed paths: M js/functions.js M js/sql.js

Log Message: ----------- Revert "Cannot read property sql_query of undefined: #14104 issue fix (#14105)"

This reverts commit ad86eab9748176ede865e6b3b80c4fd93523d508.

Signed-off-by: Maurício Meneghini Fauth mauriciofauth@gmail.com

Commit: bec8888e7c394082756f1a163e8cdb29d5d62181 https://github.com/phpmyadmin/phpmyadmin/commit/bec8888e7c394082756f1a163e8c... Author: Maurício Meneghini Fauth mauriciofauth@gmail.com Date: 2018-04-06 (Fri, 06 Apr 2018)

Changed paths: M js/sql.js

Log Message: ----------- Revert "Merge pull request #14046 from shucon/login"

This reverts commit 5a1ceef67d62ba36da970cb33ab8c8095d1327e9, reversing changes made to 063f3806395cdfc884626f9872f85bde8b06561e.

Signed-off-by: Maurício Meneghini Fauth mauriciofauth@gmail.com

Commit: b3795da2c68c142b9f4a74b529d86226b039bb11 https://github.com/phpmyadmin/phpmyadmin/commit/b3795da2c68c142b9f4a74b529d8... Author: Maurício Meneghini Fauth mauriciofauth@gmail.com Date: 2018-04-06 (Fri, 06 Apr 2018)

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ba00b51ad8ab...b3795da2c68c