Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0d8f510c22a9d2fff4cef85c8b39615e4df91380 https://github.com/phpmyadmin/phpmyadmin/commit/0d8f510c22a9d2fff4cef85c8b39... Author: Michal Čihař michal@cihar.com Date: 2014-03-19 (Wed, 19 Mar 2014)

Changed paths: M js/server_status_monitor.js

Log Message: ----------- Use JSON parser from jQuery instead of JSON plugin

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 5284882d3dd9f3214fe8c62ef7acd82c3b493c33 https://github.com/phpmyadmin/phpmyadmin/commit/5284882d3dd9f3214fe8c62ef7ac... Author: Michal Čihař michal@cihar.com Date: 2014-03-19 (Wed, 19 Mar 2014)

Changed paths: M js/server_status_monitor.js M setup/scripts.js

Log Message: ----------- Use native browser support for JSON

It's there in anything recent (only not supported in IE 6 and 7 which we don't support anyway).

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 2456af7a019fd95331acbc7e6cfc39601f079d31 https://github.com/phpmyadmin/phpmyadmin/commit/2456af7a019fd95331acbc7e6cfc... Author: Michal Čihař michal@cihar.com Date: 2014-03-19 (Wed, 19 Mar 2014)

Changed paths: R js/jquery/jquery.json-2.4.js M server_status_monitor.php M setup/index.php

Log Message: ----------- Remove no longer used JSON plugin for jQuery

Signed-off-by: Michal Čihař michal@cihar.com

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8316786c95ed...2456af7a019f