Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8a410119cda3f7340f4953bb31f7a93d66cb536e https://github.com/phpmyadmin/phpmyadmin/commit/8a410119cda3f7340f4953bb31f7... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-10-03 (Fri, 03 Oct 2014)

Changed paths: M ChangeLog M db_designer.php M libraries/pmd_common.php

Log Message: ----------- rfe #1542 Better error reporting in Designer

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: 4518d667be05a5ed55d1c6101dca01e1fb233a78 https://github.com/phpmyadmin/phpmyadmin/commit/4518d667be05a5ed55d1c6101dca... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-10-03 (Fri, 03 Oct 2014)

Changed paths: M ChangeLog M js/ajax.js M js/common.js M js/config.js M js/db_qbe.js M js/db_structure.js M js/functions.js M js/gis_data_editor.js R js/jquery/jquery.sprintf.js M js/normalization.js M js/pmd/move.js M js/server_databases.js M js/server_privileges.js M js/server_status_monitor.js M js/server_user_groups.js A js/sprintf.js M js/sql.js M js/tbl_relation.js M js/tbl_structure.js M libraries/Header.class.php M libraries/display_import.lib.php

Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c70e109bd64f...4518d667be05