Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: bae477477b7b272d2b8cb5842fc7f28d87f480f0 https://github.com/phpmyadmin/phpmyadmin/commit/bae477477b7b272d2b8cb5842fc7... Author: Manish Bisht manish.bisht490@gmail.com Date: 2017-06-15 (Thu, 15 Jun 2017)

Changed paths: M js/makegrid.js

Log Message: ----------- data shown in JSON format if the data-type is json

Signed-off-by: Manish Bisht manish.bisht490@gmail.com

Commit: 0ded26965b16ddd2fe15b698fcdd07d35bb970d6 https://github.com/phpmyadmin/phpmyadmin/commit/0ded26965b16ddd2fe15b698fcdd... Author: Michal Čihař michal@cihar.com Date: 2017-06-28 (Wed, 28 Jun 2017)

Changed paths: M js/makegrid.js

Log Message: ----------- Merge pull request #13317 from manishbisht/json-editor

JSON data shown in JSON format while editing

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/688143af8ff7...0ded26965b16