September 2012 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] dce843: Remove extraneous comma
by Marc Delisle 09 Sep '12

09 Sep '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: dce84310031184f32e4eaddffd2a0ad0c67152ea https://github.com/phpmyadmin/phpmyadmin/commit/dce84310031184f32e4eaddffd2… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-09-09 (Sun, 09 Sep 2012) Changed paths: M js/tbl_chart.js Log Message: ----------- Remove extraneous comma Commit: 467cd60a002da734dac1d645a7840bf5bdf6e6a6 https://github.com/phpmyadmin/phpmyadmin/commit/467cd60a002da734dac1d645a78… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-09-09 (Sun, 09 Sep 2012) Log Message: ----------- Merge branch 'QA_3_5' Commit: e491ab1c8accfdf40761ced5a96969c48143dc3f https://github.com/phpmyadmin/phpmyadmin/commit/e491ab1c8accfdf40761ced5a96… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-09-09 (Sun, 09 Sep 2012) Changed paths: M js/tbl_chart.js Log Message: ----------- Fix merge conflicts Commit: 814166fa7c4e91b4f86e635b36f8e1fcad5319fa https://github.com/phpmyadmin/phpmyadmin/commit/814166fa7c4e91b4f86e635b36f… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-09-09 (Sun, 09 Sep 2012) Changed paths: M po/ar.po M po/sr(a)latin.po Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e53ad4fde761...814166fa7c4e

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 693b0d: Translated using Weblate.
by Weblate 09 Sep '12

09 Sep '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 693b0dcf29e8e0bd3d63060f264769e30e9fff15 https://github.com/phpmyadmin/phpmyadmin/commit/693b0dcf29e8e0bd3d63060f264… Author: مترجم حرّ <metehyi(a)gmail.com> Date: 2012-09-09 (Sun, 09 Sep 2012) Changed paths: M po/ar.po Log Message: ----------- Translated using Weblate. Commit: e2ffae058a982efc6ae60feac356e695ebf5c248 https://github.com/phpmyadmin/phpmyadmin/commit/e2ffae058a982efc6ae60feac35… Author: Vojislav Pavić <vpavic(a)gmail.com> Date: 2012-09-09 (Sun, 09 Sep 2012) Changed paths: M po/sr(a)latin.po Log Message: ----------- Translated using Weblate. Commit: e53ad4fde7614354021910d4e77cfd963d39627b https://github.com/phpmyadmin/phpmyadmin/commit/e53ad4fde7614354021910d4e77… Author: Weblate <noreply(a)weblate.org> Date: 2012-09-09 (Sun, 09 Sep 2012) Changed paths: M js/codemirror/lib/codemirror.js M js/server_status.js Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/366477a8d392...e53ad4fde761

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] ad615d: Translated using Weblate.
by Weblate 09 Sep '12

09 Sep '12

Branch: refs/heads/QA_3_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: ad615d61ad46abf649457255c385ee5f5a9d843f https://github.com/phpmyadmin/phpmyadmin/commit/ad615d61ad46abf649457255c38… Author: مترجم حرّ <metehyi(a)gmail.com> Date: 2012-09-09 (Sun, 09 Sep 2012) Changed paths: M po/ar.po Log Message: ----------- Translated using Weblate. Commit: 866153383aa0d8b6086b7977ea59063dc816eb27 https://github.com/phpmyadmin/phpmyadmin/commit/866153383aa0d8b6086b7977ea5… Author: Vojislav Pavić <vpavic(a)gmail.com> Date: 2012-09-09 (Sun, 09 Sep 2012) Changed paths: M po/sr(a)latin.po Log Message: ----------- Translated using Weblate. Commit: fbf05f5879051e29bb3c2170617b4b977bf7c30c https://github.com/phpmyadmin/phpmyadmin/commit/fbf05f5879051e29bb3c2170617… Author: Weblate <noreply(a)weblate.org> Date: 2012-09-09 (Sun, 09 Sep 2012) Changed paths: M js/server_status.js Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f24b163fd6ee...fbf05f587905

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] cced20: Translated using Weblate.
by Marc Delisle 09 Sep '12

09 Sep '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: cced20fb0ea2c5595ebda7482b096694c5183d50 https://github.com/phpmyadmin/phpmyadmin/commit/cced20fb0ea2c5595ebda7482b0… Author: مترجم حرّ <metehyi(a)gmail.com> Date: 2012-09-08 (Sat, 08 Sep 2012) Changed paths: M po/ar.po Log Message: ----------- Translated using Weblate. Commit: 10d7183b597c3a8ab76b5586ddf69cfd13e6ad00 https://github.com/phpmyadmin/phpmyadmin/commit/10d7183b597c3a8ab76b5586ddf… Author: مترجم حرّ <metehyi(a)gmail.com> Date: 2012-09-08 (Sat, 08 Sep 2012) Changed paths: M po/de.po Log Message: ----------- Translated using Weblate. Commit: 1662302398cf3d2105f6c9d23c92dada83e6454e https://github.com/phpmyadmin/phpmyadmin/commit/1662302398cf3d2105f6c9d23c9… Author: Weblate <noreply(a)weblate.org> 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 libraries/import/xml.php M tbl_chart.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 Commit: f24b163fd6eef9d1102caafbcd2ee4119ce24f63 https://github.com/phpmyadmin/phpmyadmin/commit/f24b163fd6eef9d1102caafbcd2… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-09-09 (Sun, 09 Sep 2012) Changed paths: M js/server_status.js Log Message: ----------- These extra commas are fatal for Internet Explorer 9 Commit: 08eb5ef035603bd9008b3f192177dacff9406f67 https://github.com/phpmyadmin/phpmyadmin/commit/08eb5ef035603bd9008b3f19217… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-09-09 (Sun, 09 Sep 2012) Log Message: ----------- Merge branch 'QA_3_5' Commit: 89c60cbbeff59827003c322c0ac3a13ef1388dea https://github.com/phpmyadmin/phpmyadmin/commit/89c60cbbeff59827003c322c0ac… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-09-09 (Sun, 09 Sep 2012) Changed paths: M js/server_status.js Log Message: ----------- Fix merge conflicts Commit: 366477a8d39241db977b7f5a43f371f4859e582c https://github.com/phpmyadmin/phpmyadmin/commit/366477a8d39241db977b7f5a43f… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-09-09 (Sun, 09 Sep 2012) Changed paths: M js/codemirror/lib/codemirror.js Log Message: ----------- Fix from codemirror 2.22 for a IE problem Compare: https://github.com/phpmyadmin/phpmyadmin/compare/be47d23a3848...366477a8d392

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] f24b16: These extra commas are fatal for Internet Explorer...
by Marc Delisle 09 Sep '12

09 Sep '12

Branch: refs/heads/QA_3_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: f24b163fd6eef9d1102caafbcd2ee4119ce24f63 https://github.com/phpmyadmin/phpmyadmin/commit/f24b163fd6eef9d1102caafbcd2… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-09-09 (Sun, 09 Sep 2012) Changed paths: M js/server_status.js Log Message: ----------- These extra commas are fatal for Internet Explorer 9

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] cced20: Translated using Weblate.
by Weblate 08 Sep '12

08 Sep '12

Branch: refs/heads/QA_3_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: cced20fb0ea2c5595ebda7482b096694c5183d50 https://github.com/phpmyadmin/phpmyadmin/commit/cced20fb0ea2c5595ebda7482b0… Author: مترجم حرّ <metehyi(a)gmail.com> Date: 2012-09-08 (Sat, 08 Sep 2012) Changed paths: M po/ar.po Log Message: ----------- Translated using Weblate. Commit: 10d7183b597c3a8ab76b5586ddf69cfd13e6ad00 https://github.com/phpmyadmin/phpmyadmin/commit/10d7183b597c3a8ab76b5586ddf… Author: مترجم حرّ <metehyi(a)gmail.com> Date: 2012-09-08 (Sat, 08 Sep 2012) Changed paths: M po/de.po Log Message: ----------- Translated using Weblate. Commit: 1662302398cf3d2105f6c9d23c92dada83e6454e https://github.com/phpmyadmin/phpmyadmin/commit/1662302398cf3d2105f6c9d23c9… Author: Weblate <noreply(a)weblate.org> 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 libraries/import/xml.php M tbl_chart.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7664d049b651...1662302398cf

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 286c8a: Initial porting to jqplot
by Marc Delisle 08 Sep '12

08 Sep '12

Branch: refs/heads/QA_3_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 286c8a7dbb52e4be7f09aa0624c8d1ebd0e4118c https://github.com/phpmyadmin/phpmyadmin/commit/286c8a7dbb52e4be7f09aa0624c… Author: Marc Delisle <marc(a)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/031065b6200829175f4ea0b9981… Author: Marc Delisle <marc(a)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/6e52c12b84406260a1224966f90… Author: Marc Delisle <marc(a)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/39e9744f046b556674f171a4e44… Author: Marc Delisle <marc(a)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/ff94643044da58283ff28e98256… Author: Marc Delisle <marc(a)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/4031f0a79894cd3d89ca30d38aa… Author: Marc Delisle <marc(a)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/b1100e9fb7a8c2995315e7b44c4… Author: Marc Delisle <marc(a)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/25a8298f57a1053770c6c01c148… Author: Marc Delisle <marc(a)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/d5fbbe8ed2dc9203feddc85c7c4… Author: Marc Delisle <marc(a)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/8d6d5865529a4cfcb61418aae25… Author: Marc Delisle <marc(a)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/1b9158670818099954fffe4c8fd… Author: Marc Delisle <marc(a)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/000362d747205ccd5ad1d8d78e0… Author: Marc Delisle <marc(a)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/04698355e48775da41ddef37b53… Author: Marc Delisle <marc(a)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/a74998d560bba743194a4102cc3… Author: Marc Delisle <marc(a)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/b04e2be72a56af6883a7f9d1d70… Author: Marc Delisle <marc(a)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/7664d049b6511561ad242afbca1… Author: Marc Delisle <marc(a)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

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 286c8a: Initial porting to jqplot
by Marc Delisle 08 Sep '12

08 Sep '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 286c8a7dbb52e4be7f09aa0624c8d1ebd0e4118c https://github.com/phpmyadmin/phpmyadmin/commit/286c8a7dbb52e4be7f09aa0624c… Author: Marc Delisle <marc(a)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/031065b6200829175f4ea0b9981… Author: Marc Delisle <marc(a)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/6e52c12b84406260a1224966f90… Author: Marc Delisle <marc(a)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/39e9744f046b556674f171a4e44… Author: Marc Delisle <marc(a)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/ff94643044da58283ff28e98256… Author: Marc Delisle <marc(a)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/4031f0a79894cd3d89ca30d38aa… Author: Marc Delisle <marc(a)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/b1100e9fb7a8c2995315e7b44c4… Author: Marc Delisle <marc(a)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/25a8298f57a1053770c6c01c148… Author: Marc Delisle <marc(a)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/d5fbbe8ed2dc9203feddc85c7c4… Author: Marc Delisle <marc(a)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/8d6d5865529a4cfcb61418aae25… Author: Marc Delisle <marc(a)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/1b9158670818099954fffe4c8fd… Author: Marc Delisle <marc(a)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/000362d747205ccd5ad1d8d78e0… Author: Marc Delisle <marc(a)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/04698355e48775da41ddef37b53… Author: Marc Delisle <marc(a)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/a74998d560bba743194a4102cc3… Author: Marc Delisle <marc(a)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/b04e2be72a56af6883a7f9d1d70… Author: Marc Delisle <marc(a)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/7664d049b6511561ad242afbca1… Author: Marc Delisle <marc(a)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 Commit: a5d0fdad0ed56d63ac9dfdaa142eb535c9f36ccb https://github.com/phpmyadmin/phpmyadmin/commit/a5d0fdad0ed56d63ac9dfdaa142… Author: Marc Delisle <marc(a)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 Commit: eca1c28e16d56330afea529599755293ca74dc0a https://github.com/phpmyadmin/phpmyadmin/commit/eca1c28e16d56330afea5295997… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-09-08 (Sat, 08 Sep 2012) Changed paths: M js/tbl_chart.js Log Message: ----------- Adapt to new multiple selector Commit: 9b07f1237acbe84f612e3b2d0758d36f64013c53 https://github.com/phpmyadmin/phpmyadmin/commit/9b07f1237acbe84f612e3b2d075… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-09-08 (Sat, 08 Sep 2012) Changed paths: M js/tbl_chart.js Log Message: ----------- Incorrect reference to chart type Commit: fb7b1c1582819ab9788812c19b202ca78e3ba405 https://github.com/phpmyadmin/phpmyadmin/commit/fb7b1c1582819ab9788812c19b2… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-09-08 (Sat, 08 Sep 2012) Changed paths: M js/tbl_chart.js Log Message: ----------- Unused code Commit: 8ade1115d7d663baadcb040b73739ddfd57de3d5 https://github.com/phpmyadmin/phpmyadmin/commit/8ade1115d7d663baadcb040b737… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-09-08 (Sat, 08 Sep 2012) Changed paths: M js/tbl_chart.js Log Message: ----------- Initial display is wrong Commit: be47d23a3848456b7f66d617c9a733a31cbb1078 https://github.com/phpmyadmin/phpmyadmin/commit/be47d23a3848456b7f66d617c9a… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-09-08 (Sat, 08 Sep 2012) Changed paths: M js/tbl_chart.js Log Message: ----------- Use correct jqplot reference for axis labels Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2be4178527ae...be47d23a3848

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 183520: Translated using Weblate.
by Madhura Jayaratne 08 Sep '12

08 Sep '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 183520253c67c178937f4df22cb9e972dfdffc25 https://github.com/phpmyadmin/phpmyadmin/commit/183520253c67c178937f4df22cb… Author: مترجم حرّ <metehyi(a)gmail.com> Date: 2012-09-06 (Thu, 06 Sep 2012) Changed paths: M po/ar.po Log Message: ----------- Translated using Weblate. Commit: 1a240889a2a2ac90534afb176b856eb3376d1fed https://github.com/phpmyadmin/phpmyadmin/commit/1a240889a2a2ac90534afb176b8… Author: Weblate <noreply(a)weblate.org> Date: 2012-09-06 (Thu, 06 Sep 2012) Changed paths: M libraries/common.lib.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 Commit: e954a3542c14a80bb024953b54299537d0184dd6 https://github.com/phpmyadmin/phpmyadmin/commit/e954a3542c14a80bb024953b542… Author: مترجم حرّ <metehyi(a)gmail.com> Date: 2012-09-06 (Thu, 06 Sep 2012) Changed paths: M po/de.po Log Message: ----------- Translated using Weblate. Commit: e41f19969a882bb514090cc0a25694884ee9ffdd https://github.com/phpmyadmin/phpmyadmin/commit/e41f19969a882bb514090cc0a25… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-09-07 (Fri, 07 Sep 2012) Changed paths: M ChangeLog M libraries/import/xml.php Log Message: ----------- bug #3553068 [import] Table import from XML file fails Commit: 2be4178527aec66c350a0749c5c2897d6c62b363 https://github.com/phpmyadmin/phpmyadmin/commit/2be4178527aec66c350a0749c5c… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-09-07 (Fri, 07 Sep 2012) Changed paths: M ChangeLog M libraries/plugins/import/ImportXml.class.php Log Message: ----------- Merge branch 'QA_3_5' Conflicts: libraries/import/xml.php po/ar.po po/de.po Compare: https://github.com/phpmyadmin/phpmyadmin/compare/67bc3cd8f071...2be4178527ae

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] e41f19: bug #3553068 [import] Table import from XML file f...
by Madhura Jayaratne 08 Sep '12

08 Sep '12

Branch: refs/heads/QA_3_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: e41f19969a882bb514090cc0a25694884ee9ffdd https://github.com/phpmyadmin/phpmyadmin/commit/e41f19969a882bb514090cc0a25… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-09-07 (Fri, 07 Sep 2012) Changed paths: M ChangeLog M libraries/import/xml.php Log Message: ----------- bug #3553068 [import] Table import from XML file fails

1 0