Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: eb3c00dfcbf78226fece00963cbf424afa408704 https://github.com/phpmyadmin/phpmyadmin/commit/eb3c00dfcbf78226fece00963cbf... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-04-24 (Fri, 24 Apr 2015)

Changed paths: M libraries/tbl_columns_definition_form.lib.php M test/libraries/PMA_tbl_columns_definition_form_test.php

Log Message: ----------- This is a numeric field

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

Commit: f4717b8c3a7e79e08fc6cee471831ec1858045b0 https://github.com/phpmyadmin/phpmyadmin/commit/f4717b8c3a7e79e08fc6cee47183... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-04-24 (Fri, 24 Apr 2015)

Changed paths: M ChangeLog M config.sample.inc.php M examples/signon-script.php M js/get_scripts.js.php M js/whitelist.php M libraries/Advisor.class.php M libraries/bookmark.lib.php M libraries/browse_foreigners.lib.php M libraries/build_html_for_db.lib.php M libraries/tbl_columns_definition_form.lib.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f982adee97a9...f4717b8c3a7e