Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3d3c672545d1c5f58d13741d01b87d99976bbf6b https://github.com/phpmyadmin/phpmyadmin/commit/3d3c672545d1c5f58d13741d01b8... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-02-19 (Thu, 19 Feb 2015)

Changed paths: M ChangeLog A js/transformations/json_editor.js A libraries/plugins/transformations/input/Text_Plain_JsonEditor.class.php

Log Message: ----------- rfe #1275 CodeMirror based JSON editor as an input transformation

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

Commit: f334064cc4df65a4409555461b7457d913eab25f https://github.com/phpmyadmin/phpmyadmin/commit/f334064cc4df65a4409555461b74... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-02-19 (Thu, 19 Feb 2015)

Changed paths: M libraries/plugins/transformations/input/Text_Plain_JsonEditor.class.php

Log Message: ----------- Add javascript mode file

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

Commit: 6a9b787320137a69f5979a20fcf0813c210a2d44 https://github.com/phpmyadmin/phpmyadmin/commit/6a9b787320137a69f5979a20fcf0... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-02-19 (Thu, 19 Feb 2015)

Changed paths: M test/classes/plugin/transformations/Transformation_Plugins_test.php M test/libraries/PMA_transformation_test.php

Log Message: ----------- Update tests

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6ee59b7eecc6...6a9b78732013