Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1a90f9723184170113e0fbc5e96a23ef897a7451 https://github.com/phpmyadmin/phpmyadmin/commit/1a90f9723184170113e0fbc5e96a... Author: Michal Čihař michal@cihar.com Date: 2017-07-18 (Tue, 18 Jul 2017)

Changed paths: M themes/pmahomme/css/codemirror.css.php

Log Message: ----------- Bring back CSS customization for CodeMirror

Originally it was done by patching upstream sources in 4c24db0, but that was lost when upgrading.

Issue #13489

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 639c2b8c4bad8b36508b6a059632a1c6dce85637 https://github.com/phpmyadmin/phpmyadmin/commit/639c2b8c4bad8b36508b6a059632... Author: Michal Čihař michal@cihar.com Date: 2017-07-18 (Tue, 18 Jul 2017)

Changed paths: M ChangeLog M js/codemirror/addon/lint/lint.js M js/codemirror/addon/lint/sql-lint.js M libraries/Linter.php

Log Message: ----------- Fixed rendering SQL lint errors

- add patch to CodeMirror to render HTML, it's submitted upstream as https://github.com/codemirror/CodeMirror/pull/4861 - properly escape html output of Linter, now when we use full HTML

Fixes #13489

Signed-off-by: Michal Čihař michal@cihar.com

Commit: cc954750bbb36032c3c80882ad1d9b9c3db5b9f9 https://github.com/phpmyadmin/phpmyadmin/commit/cc954750bbb36032c3c80882ad1d... Author: Michal Čihař michal@cihar.com Date: 2017-07-18 (Tue, 18 Jul 2017)

Changed paths: M ChangeLog M js/codemirror/addon/lint/sql-lint.js M js/vendor/codemirror/addon/lint/lint.js M libraries/classes/Linter.php M themes/pmahomme/css/codemirror.css.php

Log Message: ----------- Merge branch 'QA_4_7'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d463309502a2...cc954750bbb3