Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 6e6e40a77560443ea9a2ef2ebe5704b4718d4a49
      
https://github.com/phpmyadmin/phpmyadmin/commit/6e6e40a77560443ea9a2ef2ebe5704b4718d4a49
  Author: Madhura Jayaratne <madhura...@gmail.com>
  Date:   2016-02-16 (Tue, 16 Feb 2016)

  Changed paths:
    M ChangeLog
    M libraries/Util.class.php

  Log Message:
  -----------
  Fix #11964 Undefined index: TABLE_COMMENT in database structure page

Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>


  Commit: a80124d6fd65b69aed1eb28434d3107aaa3d82a0
      
https://github.com/phpmyadmin/phpmyadmin/commit/a80124d6fd65b69aed1eb28434d3107aaa3d82a0
  Author: Madhura Jayaratne <madhura...@gmail.com>
  Date:   2016-02-16 (Tue, 16 Feb 2016)

  Changed paths:
    M ChangeLog
    M changelog.php
    M doc/setup.rst
    M import.php
    M index.php
    M js/config.js
    M js/functions.js
    M libraries/Config.class.php
    M libraries/Error.class.php
    M libraries/File.class.php
    M libraries/Header.class.php
    M libraries/Util.class.php
    M libraries/common.inc.php
    M libraries/error_report.lib.php
    M libraries/export.lib.php
    M libraries/file_listing.lib.php
    M libraries/php-gettext/gettext.inc
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M libraries/plugins/auth/AuthenticationHttp.class.php
    M libraries/plugins/auth/swekey/swekey.auth.lib.php
    M libraries/plugins/export/ExportPdf.class.php
    M libraries/plugins/import/ImportShp.class.php
    M libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php
    M libraries/select_lang.lib.php
    M libraries/sql-parser/src/Components/AlterOperation.php
    M libraries/sql-parser/src/Components/Condition.php
    M libraries/sql-parser/src/Components/CreateDefinition.php
    M libraries/sql-parser/src/Components/Expression.php
    M libraries/sql-parser/src/Components/IntoKeyword.php
    M libraries/sql-parser/src/Components/JoinKeyword.php
    M libraries/sql-parser/src/Components/PartitionDefinition.php
    M libraries/sql-parser/src/Components/Reference.php
    M libraries/sql-parser/src/Components/RenameOperation.php
    M libraries/sql-parser/src/Components/SetOperation.php
    M libraries/sql-parser/src/Parser.php
    M libraries/sql-parser/src/Statements/AlterStatement.php
    M libraries/sql-parser/src/Statements/CreateStatement.php
    M license.php
    M prefs_manage.php
    M setup/lib/index.lib.php
    M tbl_replace.php
    M test/classes/PMA_Error_test.php
    M test/libraries/PMA_ConfigGenerator_test.php

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

Conflicts:
        ChangeLog


  Commit: 39559ddca5f8a9ada8b86d26719e43815d8a362e
      
https://github.com/phpmyadmin/phpmyadmin/commit/39559ddca5f8a9ada8b86d26719e43815d8a362e
  Author: Madhura Jayaratne <madhura...@gmail.com>
  Date:   2016-02-16 (Tue, 16 Feb 2016)

  Changed paths:
    M ChangeLog
    M libraries/Util.php

  Log Message:
  -----------
  Merge branch 'QA_4_5' into QA_4_6


  Commit: eb7b9992934bf647f3cbdee9dbba7ad8503dc06a
      
https://github.com/phpmyadmin/phpmyadmin/commit/eb7b9992934bf647f3cbdee9dbba7ad8503dc06a
  Author: Madhura Jayaratne <madhura...@gmail.com>
  Date:   2016-02-16 (Tue, 16 Feb 2016)

  Changed paths:
    M ChangeLog
    M changelog.php
    M doc/setup.rst
    M import.php
    M index.php
    M js/config.js
    M js/functions.js
    M js/openlayers/img/cloud-popup-relative.png
    M js/openlayers/img/measuring-stick-off.png
    M js/openlayers/img/measuring-stick-on.png
    M js/openlayers/img/panning-hand-off.png
    M js/openlayers/img/panning-hand-on.png
    M js/openlayers/img/zoom-plus-mini.png
    M js/openlayers/img/zoom-world-mini.png
    M js/openlayers/img/zoombar.png
    M js/openlayers/theme/default/img/add_point_off.png
    M js/openlayers/theme/default/img/add_point_on.png
    M js/openlayers/theme/default/img/draw_line_off.png
    M js/openlayers/theme/default/img/draw_line_on.png
    M js/openlayers/theme/default/img/draw_point_off.png
    M js/openlayers/theme/default/img/draw_point_on.png
    M js/openlayers/theme/default/img/draw_polygon_off.png
    M js/openlayers/theme/default/img/draw_polygon_on.png
    M js/openlayers/theme/default/img/editing_tool_bar.png
    M js/openlayers/theme/default/img/move_feature_off.png
    M js/openlayers/theme/default/img/move_feature_on.png
    M js/openlayers/theme/default/img/navigation_history.png
    M js/openlayers/theme/default/img/pan-panel.png
    M js/openlayers/theme/default/img/pan_off.png
    M js/openlayers/theme/default/img/pan_on.png
    M js/openlayers/theme/default/img/panning-hand-off.png
    M js/openlayers/theme/default/img/panning-hand-on.png
    M js/openlayers/theme/default/img/remove_point_off.png
    M js/openlayers/theme/default/img/remove_point_on.png
    M js/openlayers/theme/default/img/ruler.png
    M js/openlayers/theme/default/img/view_next_off.png
    M js/openlayers/theme/default/img/view_previous_off.png
    M js/openlayers/theme/default/img/zoom-panel-NOALPHA.png
    M js/openlayers/theme/default/img/zoom-panel.png
    M libraries/Config.php
    M libraries/Error.php
    M libraries/File.php
    M libraries/Header.php
    M libraries/LanguageManager.php
    M libraries/Util.php
    M libraries/common.inc.php
    M libraries/error_report.lib.php
    M libraries/export.lib.php
    M libraries/file_listing.lib.php
    M libraries/php-gettext/gettext.inc
    M libraries/plugins/auth/AuthenticationCookie.php
    M libraries/plugins/auth/AuthenticationHttp.php
    M libraries/plugins/auth/swekey/swekey.auth.lib.php
    M libraries/plugins/export/ExportPdf.php
    M libraries/plugins/import/ImportShp.php
    M libraries/plugins/schema/pdf/PdfRelationSchema.php
    M libraries/sql-parser/src/Components/AlterOperation.php
    M libraries/sql-parser/src/Components/Condition.php
    M libraries/sql-parser/src/Components/CreateDefinition.php
    M libraries/sql-parser/src/Components/Expression.php
    M libraries/sql-parser/src/Components/IntoKeyword.php
    M libraries/sql-parser/src/Components/JoinKeyword.php
    M libraries/sql-parser/src/Components/PartitionDefinition.php
    M libraries/sql-parser/src/Components/Reference.php
    M libraries/sql-parser/src/Components/RenameOperation.php
    M libraries/sql-parser/src/Components/SetOperation.php
    M libraries/sql-parser/src/Parser.php
    M libraries/sql-parser/src/Statements/AlterStatement.php
    M libraries/sql-parser/src/Statements/CreateStatement.php
    M license.php
    M prefs_manage.php
    M setup/lib/index.lib.php
    M tbl_replace.php
    M test/classes/ConfigGeneratorTest.php
    M test/classes/ErrorTest.php
    M themes/original/img/b_column_add.png
    M themes/original/img/b_edit.png
    M themes/original/img/b_favorite.png
    M themes/original/img/b_find_replace.png
    M themes/original/img/b_index_add.png
    M themes/original/img/b_inline_edit.png
    M themes/original/img/b_no_favorite.png
    M themes/original/img/b_save.png
    M themes/original/img/b_table_add.png
    M themes/original/img/b_undo.png
    M themes/original/img/b_usrdrop.png
    M themes/original/img/b_usredit.png
    M themes/original/img/b_view_add.png
    M themes/original/img/b_views.png
    M themes/original/img/bd_deltbl.png
    M themes/original/img/console.png
    M themes/original/img/logo_left.png
    M themes/original/img/new_struct.png
    M themes/original/img/new_struct_hovered.png
    M themes/original/img/normalize.png
    M themes/original/img/s_lang.png
    M themes/original/img/s_rights.png
    M themes/original/img/s_top.png
    M themes/original/img/sprites.png
    M themes/original/img/vertical_line.png
    M themes/original/img/zoom-world-mini.png
    M themes/original/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png
    M themes/original/jquery/images/ui-bg_glass_65_ffffff_1x400.png
    M themes/original/jquery/images/ui-bg_glass_75_dadada_1x400.png
    M themes/original/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png
    M themes/original/jquery/images/ui-bg_glass_95_fef1ec_1x400.png
    M themes/original/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png
    M themes/original/jquery/images/ui-icons_222222_256x240.png
    M themes/original/jquery/images/ui-icons_2e83ff_256x240.png
    M themes/original/jquery/images/ui-icons_454545_256x240.png
    M themes/original/jquery/images/ui-icons_888888_256x240.png
    M themes/original/jquery/images/ui-icons_cd0a0a_256x240.png
    M themes/original/screen.png
    M themes/pmahomme/img/b_column_add.png
    M themes/pmahomme/img/b_favorite.png
    M themes/pmahomme/img/b_find_replace.png
    M themes/pmahomme/img/b_move.png
    M themes/pmahomme/img/b_no_favorite.png
    M themes/pmahomme/img/b_plus.png
    M themes/pmahomme/img/b_sqldoc.png
    M themes/pmahomme/img/b_undo.png
    M themes/pmahomme/img/bd_deltbl.png
    M themes/pmahomme/img/bd_drop.png
    M themes/pmahomme/img/bd_empty.png
    M themes/pmahomme/img/bd_export.png
    M themes/pmahomme/img/bd_firstpage.png
    M themes/pmahomme/img/bd_ftext.png
    M themes/pmahomme/img/bd_index.png
    M themes/pmahomme/img/bd_lastpage.png
    M themes/pmahomme/img/bd_primary.png
    M themes/pmahomme/img/bd_select.png
    M themes/pmahomme/img/bd_spatial.png
    M themes/pmahomme/img/bd_unique.png
    M themes/pmahomme/img/console.png
    M themes/pmahomme/img/left_nav_bg.png
    M themes/pmahomme/img/logo_left.png
    M themes/pmahomme/img/new_struct.png
    M themes/pmahomme/img/new_struct_hovered.png
    M themes/pmahomme/img/normalize.png
    M themes/pmahomme/img/pmd/2leftarrow.png
    M themes/pmahomme/img/pmd/2rightarrow.png
    M themes/pmahomme/img/pmd/Header.png
    M themes/pmahomme/img/pmd/Header_Linked.png
    M themes/pmahomme/img/pmd/ang_direct.png
    M themes/pmahomme/img/pmd/exitFullscreen.png
    M themes/pmahomme/img/pmd/help.png
    M themes/pmahomme/img/pmd/help_relation.png
    M themes/pmahomme/img/pmd/left_panel_butt.png
    M themes/pmahomme/img/pmd/relation.png
    M themes/pmahomme/img/pmd/save_as.png
    M themes/pmahomme/img/pmd/small_tab.png
    M themes/pmahomme/img/pmd/toggle_lines.png
    M themes/pmahomme/img/pmd/top_panel.png
    M themes/pmahomme/img/s_top.png
    M themes/pmahomme/img/select_bg.png
    M themes/pmahomme/img/sprites.png
    M themes/pmahomme/img/toggle-ltr.png
    M themes/pmahomme/img/toggle-rtl.png
    M themes/pmahomme/img/vertical_line.png
    M themes/pmahomme/img/zoom-world-mini.png
    M themes/pmahomme/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png
    M themes/pmahomme/jquery/images/ui-bg_glass_65_ffffff_1x400.png
    M themes/pmahomme/jquery/images/ui-bg_glass_75_dadada_1x400.png
    M themes/pmahomme/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png
    M themes/pmahomme/jquery/images/ui-bg_glass_95_fef1ec_1x400.png
    M themes/pmahomme/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png
    M themes/pmahomme/jquery/images/ui-icons_222222_256x240.png
    M themes/pmahomme/jquery/images/ui-icons_2e83ff_256x240.png
    M themes/pmahomme/jquery/images/ui-icons_454545_256x240.png
    M themes/pmahomme/jquery/images/ui-icons_888888_256x240.png
    M themes/pmahomme/jquery/images/ui-icons_cd0a0a_256x240.png
    M themes/pmahomme/screen.png

  Log Message:
  -----------
  Merge branch 'QA_4_6'


  Commit: 566caa5143646dc33282a902dc1718d18371b643
      
https://github.com/phpmyadmin/phpmyadmin/commit/566caa5143646dc33282a902dc1718d18371b643
  Author: Madhura Jayaratne <madhura...@gmail.com>
  Date:   2016-02-16 (Tue, 16 Feb 2016)

  Changed paths:
    M ChangeLog
    M doc/setup.rst
    M js/get_image.js.php
    M js/get_scripts.js.php
    M js/messages.php
    M js/whitelist.php
    M libraries/DatabaseInterface.php
    M libraries/Theme.php
    M libraries/Util.php
    M scripts/create-release.sh
    M scripts/generate-sprites
    M test/bootstrap-dist.php
    M test/classes/AdvisorTest.php
    M test/classes/ConfigTest.php
    M test/classes/DbSearchTest.php
    M test/classes/ErrorHandlerTest.php
    M test/classes/ErrorTest.php
    M test/classes/FooterTest.php
    M test/classes/HeaderTest.php
    M test/classes/LinterTest.php
    M test/classes/MenuTest.php
    M test/classes/MessageTest.php
    M test/classes/TableTest.php
    M test/classes/ThemeTest.php
    M test/classes/config/FormDisplayTest.php
    M test/classes/config/FormTest.php
    M test/classes/controllers/DatabaseStructureControllerTest.php
    M test/classes/controllers/ServerBinlogControllerTest.php
    M test/classes/controllers/ServerCollationsControllerTest.php
    M test/classes/controllers/ServerDatabasesControllerTest.php
    M test/classes/controllers/ServerEnginesControllerTest.php
    M test/classes/controllers/ServerPluginsControllerTest.php
    M test/classes/controllers/ServerVariablesControllerTest.php
    M test/classes/controllers/TableIndexesControllerTest.php
    M test/classes/controllers/TableRelationControllerTest.php
    M test/classes/controllers/TableSearchControllerTest.php
    M test/classes/controllers/TableStructureControllerTest.php
    M test/classes/dbi/DBIMysqliTest.php
    M test/classes/navigation/NavigationTest.php
    M test/classes/navigation/NavigationTreeTest.php
    M test/classes/navigation/NodeColumnContainerTest.php
    M test/classes/navigation/NodeColumnTest.php
    M test/classes/navigation/NodeDatabaseChildTest.php
    M test/classes/navigation/NodeDatabaseTest.php
    M test/classes/navigation/NodeEventContainerTest.php
    M test/classes/navigation/NodeEventTest.php
    M test/classes/navigation/NodeFactoryTest.php
    M test/classes/navigation/NodeFunctionContainerTest.php
    M test/classes/navigation/NodeFunctionTest.php
    M test/classes/navigation/NodeIndexContainerTest.php
    M test/classes/navigation/NodeIndexTest.php
    M test/classes/navigation/NodeProcedureContainerTest.php
    M test/classes/navigation/NodeProcedureTest.php
    M test/classes/navigation/NodeTableContainerTest.php
    M test/classes/navigation/NodeTableTest.php
    M test/classes/navigation/NodeTest.php
    M test/classes/navigation/NodeTriggerContainerTest.php
    M test/classes/navigation/NodeTriggerTest.php
    M test/classes/navigation/NodeViewContainerTest.php
    M test/classes/navigation/NodeViewTest.php
    M test/classes/plugin/auth/AuthenticationCookieTest.php
    M test/classes/plugin/import/ImportCsvTest.php
    M test/libraries/Files_test.php
    M test/libraries/PMA_FormDisplay_tpl_test.php
    M test/libraries/PMA_central_columns_test.php
    M test/libraries/PMA_display_change_password_test.php
    M test/libraries/PMA_display_create_table_test.php
    M test/libraries/PMA_display_export_test.php
    M test/libraries/PMA_insert_edit_test.php
    M test/libraries/PMA_mult_submits_test.php
    M test/libraries/PMA_normalization_test.php
    M test/libraries/PMA_operations_test.php
    M test/libraries/PMA_relation_test.php
    M test/libraries/PMA_select_server_test.php
    M test/libraries/PMA_server_common_test.php
    M test/libraries/PMA_server_privileges_test.php
    M test/libraries/PMA_server_replication_test.php
    M test/libraries/PMA_server_status_advisor_test.php
    M test/libraries/PMA_server_status_monitor_test.php
    M test/libraries/PMA_server_status_processes_test.php
    M test/libraries/PMA_server_status_queries_test.php
    M test/libraries/PMA_server_status_test.php
    M test/libraries/PMA_server_status_variables_test.php
    M test/libraries/PMA_server_user_groups_test.php
    M test/libraries/PMA_sql_query_form_test.php
    M test/libraries/PMA_tbl_tracking_test.php
    M test/libraries/PMA_transformation_test.php
    M test/libraries/common/PMA_buildActionTitles_test.php
    M test/libraries/common/PMA_checkParameters_test.php
    M test/libraries/common/PMA_getIcon_test.php
    M test/libraries/common/PMA_showDocu_test.php
    M test/libraries/common/PMA_showPHPDocu_test.php
    M test/libraries/core/PMA_fatalError_test.php
    M test/libraries/core/PMA_getTableCount_test_dis.php
    M test/libraries/core/PMA_headerLocation_test.php
    M test/libraries/core/PMA_warnMissingExtension_test.php
    M test/libraries/rte/PMA_RTN_getEditorForm_test.php
    M themes/original/img/sprites.png
    M themes/original/sprites.lib.php
    M themes/pmahomme/img/sprites.png
    M themes/pmahomme/sprites.lib.php
    M themes/sprites.css.php

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


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/004598527af6...566caa514364
_______________________________________________
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

Reply via email to