[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d4d5a0: Bug #3960 NavigationBarIconic config not honored

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: d4d5a037660dbd2b37813843c702f92ad9e5a524
      https://github.com/phpmyadmin/phpmyadmin/commit/d4d5a037660dbd2b37813843c702f92ad9e5a524
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-21 (Fri, 21 Jun 2013)

  Changed paths:
    M ChangeLog
    M db_tracking.php
    M doc/config.rst
    M libraries/DisplayResults.class.php
    M libraries/Footer.class.php
    M libraries/Menu.class.php
    M libraries/Util.class.php
    M libraries/config.default.php
    M libraries/config.values.php
    M libraries/config/FormDisplay.class.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M libraries/config/user_preferences.forms.php
    M libraries/display_create_table.lib.php
    M libraries/navigation/NavigationHeader.class.php
    M libraries/navigation/NavigationTree.class.php
    M libraries/operations.lib.php
    M libraries/schema/User_Schema.class.php
    M libraries/sql_query_form.lib.php
    M libraries/structure.lib.php
    M server_binlog.php
    M server_databases.php
    M tbl_structure.php
    M tbl_tracking.php
    M test/classes/PMA_DisplayResults_test.php
    M test/classes/PMA_Footer_test.php
    M test/classes/PMA_Menu_test.php
    M test/classes/PMA_Table_test.php
    M test/libraries/PMA_build_html_for_db_test.php
    M test/libraries/PMA_operations_test.php
    M test/libraries/PMA_transformation_test.php
    M test/libraries/common/PMA_buildActionTitles_test.php
    M test/libraries/common/PMA_getIcon_test.php

  Log Message:
  -----------
  Bug #3960 NavigationBarIconic config not honored


  Commit: 5cefd0fe8fa2e7915da205118c7449debd7f7299
      https://github.com/phpmyadmin/phpmyadmin/commit/5cefd0fe8fa2e7915da205118c7449debd7f7299
  Author: asdf sasd <ashkgwithu at mailinator.com>
  Date:   2013-06-22 (Sat, 22 Jun 2013)

  Changed paths:
    M po/hi.po

  Log Message:
  -----------
  Translated using Weblate (Hindi)

Currently translated at 57.0% (1484 of 2603)


  Commit: 48a366ab85f0ba3f6ec0d16ef99f9d5e2824cf9c
      https://github.com/phpmyadmin/phpmyadmin/commit/48a366ab85f0ba3f6ec0d16ef99f9d5e2824cf9c
  Author: Tony Chen <tonychen at finenet.com.tw>
  Date:   2013-06-22 (Sat, 22 Jun 2013)

  Changed paths:
    M po/zh_TW.po

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

Currently translated at 98.3% (2559 of 2603)


  Commit: d7e90ed1bc74da488320f4776a08e5442a039a5b
      https://github.com/phpmyadmin/phpmyadmin/commit/d7e90ed1bc74da488320f4776a08e5442a039a5b
  Author: gheni <gheni at yahoo.cn>
  Date:   2013-06-22 (Sat, 22 Jun 2013)

  Changed paths:
    M po/ug.po

  Log Message:
  -----------
  Translated using Weblate (Uighur)

Currently translated at 14.9% (388 of 2603)


  Commit: c900872cf0013c0d35a52ab1893d48b9e14a66cd
      https://github.com/phpmyadmin/phpmyadmin/commit/c900872cf0013c0d35a52ab1893d48b9e14a66cd
  Author: Weblate <noreply at weblate.org>
  Date:   2013-06-22 (Sat, 22 Jun 2013)

  Changed paths:
    M themes/original/css/common.css.php
    M themes/pmahomme/css/common.css.php

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


  Commit: 5c0d3e84676dc13362987441428871e9dad9bde2
      https://github.com/phpmyadmin/phpmyadmin/commit/5c0d3e84676dc13362987441428871e9dad9bde2
  Author: Michal Čihař <michal at cihar.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M ChangeLog
    M db_tracking.php
    M doc/config.rst
    M libraries/DisplayResults.class.php
    M libraries/Footer.class.php
    M libraries/Menu.class.php
    M libraries/Util.class.php
    M libraries/config.default.php
    M libraries/config.values.php
    M libraries/config/FormDisplay.class.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M libraries/config/user_preferences.forms.php
    M libraries/display_create_table.lib.php
    M libraries/navigation/NavigationHeader.class.php
    M libraries/navigation/NavigationTree.class.php
    M libraries/operations.lib.php
    M libraries/schema/User_Schema.class.php
    M libraries/sql_query_form.lib.php
    M libraries/structure.lib.php
    M server_binlog.php
    M server_databases.php
    M tbl_structure.php
    M tbl_tracking.php
    M test/classes/PMA_DisplayResults_test.php
    M test/classes/PMA_Footer_test.php
    M test/classes/PMA_Menu_test.php
    M test/classes/PMA_Table_test.php
    M test/libraries/PMA_build_html_for_db_test.php
    M test/libraries/PMA_operations_test.php
    M test/libraries/PMA_transformation_test.php
    M test/libraries/common/PMA_buildActionTitles_test.php
    M test/libraries/common/PMA_getIcon_test.php

  Log Message:
  -----------
  Merge pull request #440 from lem9/bug_3960_B

Bug #3960 NavigationBarIconic config not honored


  Commit: 93114b2e8446ac9259b83633ab5a02a4ed6b5c10
      https://github.com/phpmyadmin/phpmyadmin/commit/93114b2e8446ac9259b83633ab5a02a4ed6b5c10
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

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


  Commit: d6d38004c897d84551a4c7f2bc8ca7a500bd9b53
      https://github.com/phpmyadmin/phpmyadmin/commit/d6d38004c897d84551a4c7f2bc8ca7a500bd9b53
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M test/classes/plugin/transformations/Text_Plain_Append_test.php
    M test/classes/plugin/transformations/Text_Plain_Dateformat_test.php
    M test/classes/plugin/transformations/Text_Plain_Download_test.php
    M test/classes/plugin/transformations/Text_Plain_External_test.php
    M test/classes/plugin/transformations/Text_Plain_Hex_test.php
    M test/classes/plugin/transformations/Text_Plain_Longtoipv4_test.php

  Log Message:
  -----------
  Merge branch 'master' of github.com:phpmyadmin/phpmyadmin


  Commit: bebba32337447f844424df5dc75b87c640f6f2e8
      https://github.com/phpmyadmin/phpmyadmin/commit/bebba32337447f844424df5dc75b87c640f6f2e8
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M ChangeLog
    M db_tracking.php
    M doc/config.rst
    M libraries/DisplayResults.class.php
    M libraries/Footer.class.php
    M libraries/Menu.class.php
    M libraries/Util.class.php
    M libraries/config.default.php
    M libraries/config.values.php
    M libraries/config/FormDisplay.class.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M libraries/config/user_preferences.forms.php
    M libraries/display_create_table.lib.php
    M libraries/display_structure.lib.php
    M libraries/navigation/NavigationHeader.class.php
    M libraries/navigation/NavigationTree.class.php
    M libraries/operations.lib.php
    M libraries/schema/User_Schema.class.php
    M libraries/server_bin_log.lib.php
    M libraries/sql_query_form.lib.php
    M libraries/structure.lib.php
    M server_databases.php
    M tbl_structure.php
    M tbl_tracking.php
    M test/classes/PMA_DisplayResults_test.php
    M test/classes/PMA_Footer_test.php
    M test/classes/PMA_Menu_test.php
    M test/classes/PMA_Table_test.php
    M test/libraries/PMA_build_html_for_db_test.php
    M test/libraries/PMA_operations_test.php
    M test/libraries/PMA_transformation_test.php
    M test/libraries/common/PMA_buildActionTitles_test.php
    M test/libraries/common/PMA_getIcon_test.php

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

Conflicts:
	libraries/config.values.php
	libraries/sql_query_form.lib.php
	server_binlog.php
	server_databases.php
	tbl_structure.php
	test/classes/PMA_DisplayResults_test.php


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ab13abccafa1...bebba3233744