[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 86eb4c: Fix bug#4710 Nav tree error after filtering the ta...

[Atul Pratap Singh]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 86eb4c456855bb1663af60418d09f3e348b705d2
      https://github.com/phpmyadmin/phpmyadmin/commit/86eb4c456855bb1663af60418d09f3e348b705d2
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    M ChangeLog
    M js/navigation.js

  Log Message:
  -----------
  Fix bug#4710 Nav tree error after filtering the tables

Signed-off-by: Atul Pratap Singh <atulpratapsingh05 at gmail.com>


  Commit: a2c3b39cec88c31c5f8e3cf946722560f184e763
      https://github.com/phpmyadmin/phpmyadmin/commit/a2c3b39cec88c31c5f8e3cf946722560f184e763
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    M js/messages.php

  Log Message:
  -----------
  Better message for enter search on fast filter

Signed-off-by: Atul Pratap Singh <atulpratapsingh05 at gmail.com>


  Commit: 3a43b5a4589cb8eeb69625fc75649ead999a02e2
      https://github.com/phpmyadmin/phpmyadmin/commit/3a43b5a4589cb8eeb69625fc75649ead999a02e2
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Log Message:
  -----------
  Merge commit '86eb4c456855bb1663af60418d09f3e348b705d2'


  Commit: a1137cd1054ee8dea8685b882e127b3555167ca6
      https://github.com/phpmyadmin/phpmyadmin/commit/a1137cd1054ee8dea8685b882e127b3555167ca6
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    M js/messages.php

  Log Message:
  -----------
  Merge branch 'QA_4_3'

Conflicts:
	js/messages.php

Signed-off-by: Atul Pratap Singh <atulpratapsingh05 at gmail.com>


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1d4c93cc2934...a1137cd1054e