[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 380e89: bug #4552 Incorrect routines display for database ... - Git

16 Oct 2014


      Branch: refs/heads/QA_4_2
  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
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/39498e594c37...38f3ae91cee1