Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: fa0b12fe0efd2dc6bdfdcf2ad7eb4983938ebf54 https://github.com/phpmyadmin/phpmyadmin/commit/fa0b12fe0efd2dc6bdfdcf2ad7eb... Author: Olivier Humbert trebmuh@tuxfamily.org Date: 2018-03-29 (Thu, 29 Mar 2018)
Changed paths: M po/fr.po
Log Message: ----------- Translated using Weblate (French)
Currently translated at 100.0% (3288 of 3288 strings)
[CI skip]
Commit: 85c975f27fadd3c1448a56f533f3d861156f1e62 https://github.com/phpmyadmin/phpmyadmin/commit/85c975f27fadd3c1448a56f533f3... Author: Lakshay arora b16060@students.iitmandi.ac.in Date: 2018-03-29 (Thu, 29 Mar 2018)
Changed paths: M js/tbl_zoom_plot_jqplot.js M templates/table/search/rows_zoom.twig
Log Message: ----------- Fix for issue #13439
Problem 1: The number of td elements in the zoom search form table were insufficient, due to which, the field_type(element #types_$) was getting replaced with field_value(element td:eq(3))(see ./js/tbl_zoom_jqplot.js lines 164, 188, 211, 232). Added a td element in the table for each row. Problem 2: The events attached to 'tableid_$' were inserting the values in wrong tr elements(see ./js/tbl_zoom_jqplot.js lines 185-188, 208-211, 229-232), leading to wrong values being passed to the zoom search.
Signed-off-by: Lakshay arora b16060@students.iitmandi.ac.in
Commit: 7222e02df5067ef736e862db675faaa4c2fbe9d8 https://github.com/phpmyadmin/phpmyadmin/commit/7222e02df5067ef736e862db675f... Author: Maurício Meneghini Fauth mauriciofauth@gmail.com Date: 2018-03-29 (Thu, 29 Mar 2018)
Changed paths: M js/tbl_zoom_plot_jqplot.js M templates/table/search/rows_zoom.twig
Log Message: ----------- Merge branch 'nulll-pointer-zoom_search_error' into QA_4_8
Fix #13439
Commit: 6789e86a6280bec1bbc28beeabc482c8e3b5c9a3 https://github.com/phpmyadmin/phpmyadmin/commit/6789e86a6280bec1bbc28beeabc4... Author: Maurício Meneghini Fauth mauriciofauth@gmail.com Date: 2018-03-29 (Thu, 29 Mar 2018)
Changed paths: M js/tbl_zoom_plot_jqplot.js M templates/table/search/rows_zoom.twig
Log Message: ----------- Merge branch 'QA_4_8'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/695fe3a994b1...6789e86a6280