Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 380e8940b1450a2a4df25b453d44816709a9ba2e https://github.com/phpmyadmin/phpmyadmin/commit/380e8940b1450a2a4df25b453d44... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-10-09 (Thu, 09 Oct 2014) Changed paths: M ChangeLog M libraries/DatabaseInterface.class.php M libraries/Util.class.php M libraries/navigation/Nodes/Node_Database.class.php M libraries/navigation/Nodes/Node_Table.class.php M libraries/rte/rte_events.lib.php M libraries/rte/rte_routines.lib.php Log Message: ----------- bug #4552 Incorrect routines display for database due to case insensitive checks Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: c42beaa705fefaac11697e1c550481f78a6280ba https://github.com/phpmyadmin/phpmyadmin/commit/c42beaa705fefaac11697e1c5504... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-10-09 (Thu, 09 Oct 2014) Changed paths: M ChangeLog M export.php M js/makegrid.js M libraries/DisplayResults.class.php M libraries/Util.class.php M libraries/config.default.php M libraries/dbi/DBIDummy.class.php M libraries/plugins/export/ExportXml.class.php M po/bg.po M po/ca.po M po/de.po M po/gl.po M po/ksh.po M po/ru.po M po/tr.po Log Message: ----------- Merge branch 'QA_4_2' into Bug4552 Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: 3e70eb478943c9ff702c59912498b819a0aa7974 https://github.com/phpmyadmin/phpmyadmin/commit/3e70eb478943c9ff702c59912498... Author: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com> Date: 2014-10-17 (Fri, 17 Oct 2014) Changed paths: M ChangeLog M libraries/DatabaseInterface.class.php M libraries/Util.class.php M libraries/navigation/Nodes/Node_Database.class.php M libraries/navigation/Nodes/Node_Table.class.php M libraries/rte/rte_events.lib.php M libraries/rte/rte_routines.lib.php Log Message: ----------- Resolved merge conflict in Changelog Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com> Commit: 38f3ae91cee1a01c3f440bc3a517a6bf07cb9faf https://github.com/phpmyadmin/phpmyadmin/commit/38f3ae91cee1a01c3f440bc3a517... Author: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com> Date: 2014-10-17 (Fri, 17 Oct 2014) Changed paths: M ChangeLog M libraries/DatabaseInterface.class.php M libraries/Util.class.php M libraries/navigation/Nodes/Node_Database.class.php M libraries/navigation/Nodes/Node_Table.class.php M libraries/rte/rte_events.lib.php M libraries/rte/rte_routines.lib.php Log Message: ----------- Merge branch 'madhuracj-Bug4552' into QA_4_2 Commit: a10ce357a0e9144f649577f426d68df6869c23a4 https://github.com/phpmyadmin/phpmyadmin/commit/a10ce357a0e9144f649577f426d6... Author: Boyan Kehayov <bkehayov@gmail.com> Date: 2014-10-16 (Thu, 16 Oct 2014) Changed paths: M po/bg.po Log Message: ----------- Translated using Weblate (Bulgarian) Currently translated at 66.0% (1828 of 2768 strings) [CI skip] Commit: c7de289f9597ebde6cb37db8d576d55463ff020b https://github.com/phpmyadmin/phpmyadmin/commit/c7de289f9597ebde6cb37db8d576... Author: josep constanti <jconstanti@ovi.com> Date: 2014-10-16 (Thu, 16 Oct 2014) Changed paths: M po/ca.po Log Message: ----------- Translated using Weblate (Catalan) Currently translated at 87.5% (2424 of 2768 strings) [CI skip] Commit: 85866b8a841617148be43b73c7c9a203b5b9c076 https://github.com/phpmyadmin/phpmyadmin/commit/85866b8a841617148be43b73c7c9... Author: Michael Koch <michael.koch@enough.de> Date: 2014-10-16 (Thu, 16 Oct 2014) Changed paths: M po/de.po Log Message: ----------- Translated using Weblate (German) Currently translated at 99.6% (2759 of 2768 strings) [CI skip] Commit: aa3fd712e9426ee2280d9a3032e4b1f55df39793 https://github.com/phpmyadmin/phpmyadmin/commit/aa3fd712e9426ee2280d9a3032e4... Author: Burak Yavuz <hitowerdigit@hotmail.com> Date: 2014-10-16 (Thu, 16 Oct 2014) Changed paths: M po/tr.po Log Message: ----------- Translated using Weblate (Turkish) Currently translated at 100.0% (2768 of 2768 strings) [CI skip] Commit: f3fe7ca52891487c3b5a558e411293d40ed03936 https://github.com/phpmyadmin/phpmyadmin/commit/f3fe7ca52891487c3b5a558e4112... Author: Weblate <noreply@weblate.org> Date: 2014-10-16 (Thu, 16 Oct 2014) Changed paths: M ChangeLog M libraries/DatabaseInterface.class.php M libraries/Util.class.php M libraries/navigation/Nodes/Node_Database.class.php M libraries/navigation/Nodes/Node_Table.class.php M libraries/rte/rte_events.lib.php M libraries/rte/rte_routines.lib.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 Commit: a87294fbe4c900542f31e45a9ae70d13ce6f1aa1 https://github.com/phpmyadmin/phpmyadmin/commit/a87294fbe4c900542f31e45a9ae7... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-10-17 (Fri, 17 Oct 2014) Changed paths: M ChangeLog M libraries/DatabaseInterface.class.php M libraries/Util.class.php M libraries/navigation/Nodes/Node_Database.class.php M libraries/navigation/Nodes/Node_Table.class.php M libraries/rte/rte_events.lib.php M libraries/rte/rte_routines.lib.php Log Message: ----------- Merge branch 'QA_4_2' Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0afe20e942e8...a87294fbe4c9