[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 9daaa1: Fix bug #4069 Navigation tree height not set corre...

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 9daaa1d21774f75279fa4153f97099e26240b3bd
      https://github.com/phpmyadmin/phpmyadmin/commit/9daaa1d21774f75279fa4153f97099e26240b3bd
  Author: J.M <me at mynetx.net>
  Date:   2013-08-26 (Mon, 26 Aug 2013)

  Changed paths:
    M js/navigation.js
    M libraries/navigation/NavigationHeader.class.php
    M themes/original/css/navigation.css.php
    M themes/pmahomme/css/navigation.css.php

  Log Message:
  -----------
  Fix bug #4069 Navigation tree height not set correctly dynamically


  Commit: 70b6741f8aebe0466703f73cb72fa0b1ddd54b38
      https://github.com/phpmyadmin/phpmyadmin/commit/70b6741f8aebe0466703f73cb72fa0b1ddd54b38
  Author: shanyan baishui <Siramizu at gmail.com>
  Date:   2013-08-26 (Mon, 26 Aug 2013)

  Changed paths:
    M po/zh_CN.po

  Log Message:
  -----------
  Translated using Weblate (Simplified Chinese)

Currently translated at 99.0% (2582 of 2609)


  Commit: 761a0aa2bfa2053e762e3b7d25d9f7376de28451
      https://github.com/phpmyadmin/phpmyadmin/commit/761a0aa2bfa2053e762e3b7d25d9f7376de28451
  Author: Weblate <noreply at weblate.org>
  Date:   2013-08-26 (Mon, 26 Aug 2013)

  Changed paths:
    M js/navigation.js
    M libraries/navigation/NavigationHeader.class.php
    M themes/original/css/navigation.css.php
    M themes/pmahomme/css/navigation.css.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0


  Commit: 2f3f1bcccb6ce82407076c1c47e4d6f917deb971
      https://github.com/phpmyadmin/phpmyadmin/commit/2f3f1bcccb6ce82407076c1c47e4d6f917deb971
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2013-08-26 (Mon, 26 Aug 2013)

  Changed paths:
    M js/navigation.js
    M themes/pmahomme/css/navigation.css.php

  Log Message:
  -----------
  Dynamically set tree_content's height too, bug#4069


  Commit: 3fdc172cde825200509c55d568b59b2689b57572
      https://github.com/phpmyadmin/phpmyadmin/commit/3fdc172cde825200509c55d568b59b2689b57572
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2013-08-27 (Tue, 27 Aug 2013)

  Log Message:
  -----------
  Merge commit '9daaa1d21774f75279fa4153f97099e26240b3bd'


  Commit: 5a4324adf49c2637ad370507e446f4e48dac491c
      https://github.com/phpmyadmin/phpmyadmin/commit/5a4324adf49c2637ad370507e446f4e48dac491c
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2013-08-27 (Tue, 27 Aug 2013)

  Log Message:
  -----------
  Merge commit '761a0aa2bfa2053e762e3b7d25d9f7376de28451'


  Commit: abd818826e7686badc2731b7bc0b617dd0ec9fab
      https://github.com/phpmyadmin/phpmyadmin/commit/abd818826e7686badc2731b7bc0b617dd0ec9fab
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2013-08-27 (Tue, 27 Aug 2013)

  Changed paths:
    M js/navigation.js
    M themes/pmahomme/css/navigation.css.php

  Log Message:
  -----------
  Merge commit '2f3f1bcccb6ce82407076c1c47e4d6f917deb971'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2762d8bb0fa9...abd818826e76