Branch: refs/heads/QA_3_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 286c8a7dbb52e4be7f09aa0624c8d1ebd0e4118c https://github.com/phpmyadmin/phpmyadmin/commit/286c8a7dbb52e4be7f09aa0624c8... Author: Marc Delisle <marc@infomarc.info> Date: 2012-08-31 (Fri, 31 Aug 2012) Changed paths: A js/jqplot/plugins/jqplot.barRenderer.js A js/jqplot/plugins/jqplot.categoryAxisRenderer.js A js/jqplot/plugins/jqplot.pointLabels.js M js/tbl_chart.js M tbl_chart.php Log Message: ----------- Initial porting to jqplot Commit: 031065b6200829175f4ea0b998123302ea2ac4d8 https://github.com/phpmyadmin/phpmyadmin/commit/031065b6200829175f4ea0b99812... Author: Marc Delisle <marc@infomarc.info> Date: 2012-08-31 (Fri, 31 Aug 2012) Changed paths: M js/tbl_chart.js Log Message: ----------- Initial porting of bar charts Commit: 6e52c12b84406260a1224966f9056d1851016672 https://github.com/phpmyadmin/phpmyadmin/commit/6e52c12b84406260a1224966f905... Author: Marc Delisle <marc@infomarc.info> Date: 2012-09-03 (Mon, 03 Sep 2012) Changed paths: M js/tbl_chart.js Log Message: ----------- Correctly push series for two-columns charts (one-column charts not correct at the moment) Commit: 39e9744f046b556674f171a4e443e3ca7cab6fe4 https://github.com/phpmyadmin/phpmyadmin/commit/39e9744f046b556674f171a4e443... Author: Marc Delisle <marc@infomarc.info> Date: 2012-09-03 (Mon, 03 Sep 2012) Changed paths: M js/tbl_chart.js Log Message: ----------- Title changing Commit: ff94643044da58283ff28e982563c9d319b889bc https://github.com/phpmyadmin/phpmyadmin/commit/ff94643044da58283ff28e982563... Author: Marc Delisle <marc@infomarc.info> Date: 2012-09-03 (Mon, 03 Sep 2012) Changed paths: M js/tbl_chart.js Log Message: ----------- Chart legend Commit: 4031f0a79894cd3d89ca30d38aa341e642a9e50a https://github.com/phpmyadmin/phpmyadmin/commit/4031f0a79894cd3d89ca30d38aa3... Author: Marc Delisle <marc@infomarc.info> Date: 2012-09-07 (Fri, 07 Sep 2012) Changed paths: M js/tbl_chart.js Log Message: ----------- Pie chart Commit: b1100e9fb7a8c2995315e7b44c4851f2e3962e39 https://github.com/phpmyadmin/phpmyadmin/commit/b1100e9fb7a8c2995315e7b44c48... Author: Marc Delisle <marc@infomarc.info> Date: 2012-09-07 (Fri, 07 Sep 2012) Changed paths: M tbl_chart.php Log Message: ----------- Remove calling of highcharts Commit: 25a8298f57a1053770c6c01c14836a32a977c3f7 https://github.com/phpmyadmin/phpmyadmin/commit/25a8298f57a1053770c6c01c1483... Author: Marc Delisle <marc@infomarc.info> Date: 2012-09-07 (Fri, 07 Sep 2012) Changed paths: M js/tbl_chart.js Log Message: ----------- Legends work for pie Commit: d5fbbe8ed2dc9203feddc85c7c43b5e9f05072a0 https://github.com/phpmyadmin/phpmyadmin/commit/d5fbbe8ed2dc9203feddc85c7c43... Author: Marc Delisle <marc@infomarc.info> Date: 2012-09-07 (Fri, 07 Sep 2012) Changed paths: M js/tbl_chart.js Log Message: ----------- Support specific column Commit: 8d6d5865529a4cfcb61418aae2553f685e81a943 https://github.com/phpmyadmin/phpmyadmin/commit/8d6d5865529a4cfcb61418aae255... Author: Marc Delisle <marc@infomarc.info> Date: 2012-09-07 (Fri, 07 Sep 2012) Changed paths: M js/tbl_chart.js Log Message: ----------- This renderer causes an incorrect display Commit: 1b9158670818099954fffe4c8fd2be172039193a https://github.com/phpmyadmin/phpmyadmin/commit/1b9158670818099954fffe4c8fd2... Author: Marc Delisle <marc@infomarc.info> Date: 2012-09-07 (Fri, 07 Sep 2012) Changed paths: M js/tbl_chart.js Log Message: ----------- Column-specific legends Commit: 000362d747205ccd5ad1d8d78e0cb3cdd12c184a https://github.com/phpmyadmin/phpmyadmin/commit/000362d747205ccd5ad1d8d78e0c... Author: Marc Delisle <marc@infomarc.info> Date: 2012-09-07 (Fri, 07 Sep 2012) Changed paths: M js/tbl_chart.js Log Message: ----------- Stacked series Commit: 04698355e48775da41ddef37b5323e36ad3f6be3 https://github.com/phpmyadmin/phpmyadmin/commit/04698355e48775da41ddef37b532... Author: Marc Delisle <marc@infomarc.info> Date: 2012-09-08 (Sat, 08 Sep 2012) Changed paths: M js/tbl_chart.js M tbl_chart.php Log Message: ----------- Resizer for Display chart Commit: a74998d560bba743194a4102cc3d4f6bfb736ee1 https://github.com/phpmyadmin/phpmyadmin/commit/a74998d560bba743194a4102cc3d... Author: Marc Delisle <marc@infomarc.info> Date: 2012-09-08 (Sat, 08 Sep 2012) Changed paths: M js/tbl_chart.js Log Message: ----------- Spline Commit: b04e2be72a56af6883a7f9d1d70df764bece37bc https://github.com/phpmyadmin/phpmyadmin/commit/b04e2be72a56af6883a7f9d1d70d... Author: Marc Delisle <marc@infomarc.info> Date: 2012-09-08 (Sat, 08 Sep 2012) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry Commit: 7664d049b6511561ad242afbca1f28707682c5f6 https://github.com/phpmyadmin/phpmyadmin/commit/7664d049b6511561ad242afbca1f... Author: Marc Delisle <marc@infomarc.info> Date: 2012-09-08 (Sat, 08 Sep 2012) Changed paths: M ChangeLog A js/jqplot/plugins/jqplot.barRenderer.js A js/jqplot/plugins/jqplot.categoryAxisRenderer.js A js/jqplot/plugins/jqplot.pointLabels.js M js/tbl_chart.js M tbl_chart.php Log Message: ----------- Fix merge conflicts Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e41f19969a88...7664d049b651