Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 477bb0dc0c979b4b44d25af623eeb640afe253ee https://github.com/phpmyadmin/phpmyadmin/commit/477bb0dc0c979b4b44d25af623ee... Author: Hauke Henningsen <sqrt@entless.org> Date: 2015-03-16 (Mon, 16 Mar 2015) Changed paths: M export.php M libraries/config.default.php M libraries/plugins/export/ExportJson.class.php Log Message: ----------- Add option for exporting pretty-printed JSON This adds a single option to the JSON export plugin, which, if available (PHP >= 5.4.0) corresponds to passing `JSON_PRETTY_PRINT` to `json_encode`. Signed-off-by: Hauke Henningsen <sqrt@entless.org> Commit: b350af3c7f1b610ad131bed924a4f649429a2c7a https://github.com/phpmyadmin/phpmyadmin/commit/b350af3c7f1b610ad131bed924a4... Author: Hauke Henningsen <sqrt@entless.org> Date: 2015-03-16 (Mon, 16 Mar 2015) Changed paths: M libraries/plugins/export/ExportJson.class.php Log Message: ----------- Strip trailing spaces Signed-off-by: Hauke Henningsen <sqrt@entless.org> Commit: fa763b18283274c56cfd98a247b2913b2d23734f https://github.com/phpmyadmin/phpmyadmin/commit/fa763b18283274c56cfd98a247b2... Author: Marc Delisle <marc@infomarc.info> Date: 2015-03-25 (Wed, 25 Mar 2015) Changed paths: M export.php M libraries/config.default.php M libraries/plugins/export/ExportJson.class.php Log Message: ----------- Merge pull request #1579 from addaleax/json-pretty-print Add option for exporting pretty-printed JSON Compare: https://github.com/phpmyadmin/phpmyadmin/compare/015377cdefbd...fa763b182832