Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5d21ba7f0f2381d4a22c2e522e6db79b20a76b94 https://github.com/phpmyadmin/phpmyadmin/commit/5d21ba7f0f2381d4a22c2e522e6d... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-08-27 (Thu, 27 Aug 2015)
Changed paths: M libraries/Types.class.php
Log Message: ----------- Basic JSON type details
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 51b80dfc6ba6671bf95f9ae09c6d1762ba5832a0 https://github.com/phpmyadmin/phpmyadmin/commit/51b80dfc6ba6671bf95f9ae09c6d... Author: Marc Delisle marc@infomarc.info Date: 2015-09-30 (Wed, 30 Sep 2015)
Changed paths: M libraries/Types.class.php
Log Message: ----------- Merge remote-tracking branch 'madhuracj/json'
Commit: 6dbdceef21ecc94f24fd9a86e5c542fbe1acf5a1 https://github.com/phpmyadmin/phpmyadmin/commit/6dbdceef21ecc94f24fd9a86e5c5... Author: Marc Delisle marc@infomarc.info Date: 2015-09-30 (Wed, 30 Sep 2015)
Changed paths: M ChangeLog M libraries/dbi/DBIMysqli.class.php
Log Message: ----------- Add type definition for JSON Add ChangeLog entry
Signed-off-by: Marc Delisle marc@infomarc.info
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b3381a130141...6dbdceef21ec