[phpMyAdmin Git] [phpmyadmin/phpmyadmin] c22698: Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin

Gemorroj wapinet at mail.ru
Tue Aug 28 04:39:00 CEST 2018


Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: c22698506588942fe9a895fcaf919927a59015ca
https://github.com/phpmyadmin/phpmyadmin/commit/c22698506588942fe9a895fcaf919927a59015ca
Author: Gemorroj <wapinet at mail.ru>
Date: 2018-07-22 (Sun, 07 July 2018) +03:00

Changed paths: 
M ChangeLog
M js/tbl_structure.js
M po/ro.po

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

Commit: 1d94ab9bd2a8cc77516a31d1760b97d2651ce94f
https://github.com/phpmyadmin/phpmyadmin/commit/1d94ab9bd2a8cc77516a31d1760b97d2651ce94f
Author: Gemorroj <wapinet at mail.ru>
Date: 2018-07-28 (Sat, 07 July 2018) +03:00

Changed paths: 
M composer.json
M libraries/classes/Controllers/Server/ServerVariablesController.php
M libraries/classes/Controllers/Table/TableRelationController.php
M libraries/classes/Controllers/Table/TableStructureController.php
M libraries/classes/Plugins.php
M libraries/classes/Server/Privileges.php
M libraries/classes/Server/Status/Queries.php
M libraries/classes/Server/Status/Variables.php
M libraries/classes/Util.php
M po/az.po
M po/cs.po
M po/es.po
M po/he.po
M po/hr.po
M po/lt.po
M po/ml.po
M po/pa.po
M po/pl.po
M po/pt.po
M po/ro.po
M po/ru.po
M po/ug.po
M templates/server/variables/variable_row.twig
M templates/table/page_with_secondary_tabs.twig
M templates/table/relation/common_form.twig
M templates/table/structure/display_table_stats.twig
M test/classes/Controllers/Server/ServerVariablesControllerTest.php
D templates/table/relation/internal_relational_row.twig

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

Commit: 617dc5c677b8a56059c42ded6e887b7345f76405
https://github.com/phpmyadmin/phpmyadmin/commit/617dc5c677b8a56059c42ded6e887b7345f76405
Author: Gemorroj <wapinet at mail.ru>
Date: 2018-08-04 (Sat, 08 August 2018) +03:00

Changed paths: 
A templates/server/privileges/add_user_fieldset.twig
A templates/server/privileges/choose_user_group.twig
A templates/server/privileges/column_privileges.twig
A templates/server/privileges/delete_user_fieldset.twig
A templates/server/privileges/edit_routine_privileges.twig
A templates/server/privileges/global_priv_table.twig
A templates/server/privileges/initials_row.twig
A templates/server/privileges/privileges_summary.twig
A templates/server/privileges/require_options.twig
A templates/server/privileges/resource_limits.twig
M ChangeLog
M libraries/classes/CentralColumns.php
M libraries/classes/Controllers/Table/TableStructureController.php
M libraries/classes/Export.php
M libraries/classes/InsertEdit.php
M libraries/classes/Server/Privileges.php
M libraries/classes/Template.php
M libraries/classes/Twig/CharsetsExtension.php
M libraries/classes/Twig/CoreExtension.php
M libraries/classes/Twig/MessageExtension.php
M libraries/classes/Twig/PluginsExtension.php
M libraries/classes/Twig/RelationExtension.php
M libraries/classes/Twig/SanitizeExtension.php
M libraries/classes/Twig/ServerPrivilegesExtension.php
M libraries/classes/Twig/StorageEngineExtension.php
M libraries/classes/Twig/TableExtension.php
M libraries/classes/Twig/TrackerExtension.php
M libraries/classes/Twig/TransformationsExtension.php
M libraries/classes/Twig/UrlExtension.php
M libraries/classes/Twig/UtilExtension.php
M po/az.po
M po/zh_CN.po
M templates/columns_definitions/column_attributes.twig
M templates/columns_definitions/column_definitions_form.twig
M templates/columns_definitions/column_type.twig
M templates/columns_definitions/move_column.twig
M templates/columns_definitions/partitions.twig
M templates/columns_definitions/table_fields_definitions.twig
M templates/columns_definitions/transformation.twig
M templates/create_tracking_version.twig
M templates/database/central_columns/main.twig
M templates/database/create_table.twig
M templates/database/designer/database_tables.twig
M templates/database/designer/edit_delete_pages.twig
M templates/database/designer/main.twig
M templates/database/designer/page_save_as.twig
M templates/database/designer/schema_export.twig
M templates/database/multi_table_query/form.twig
M templates/database/search/main.twig
M templates/database/search/results.twig
M templates/database/structure/body_for_table_summary.twig
M templates/database/structure/favorite_anchor.twig
M templates/database/structure/print_view_data_dictionary_link.twig
M templates/database/structure/show_create_row.twig
M templates/database/structure/structure_table_row.twig
M templates/database/structure/table_header.twig
M templates/database/structure/tracking_icon.twig
M templates/database/tracking/tables.twig
M templates/display/export/hidden_inputs.twig
M templates/display/export/option_header.twig
M templates/display/export/options_output_format.twig
M templates/display/import/import.twig
M templates/display/import/javascript.twig
M templates/display/results/additional_fields.twig
M templates/display/results/multi_row_operations_form.twig
M templates/display/results/options_block.twig
M templates/display/results/show_all_checkbox.twig
M templates/display/results/table_navigation_button.twig
M templates/header_location.twig
M templates/list/item.twig
M templates/login/header.twig
M templates/login/twofactor.twig
M templates/login/twofactor/application_configure.twig
M templates/prefs_twofactor.twig
M templates/prefs_twofactor_configure.twig
M templates/prefs_twofactor_confirm.twig
M templates/preview_sql.twig
M templates/secondary_tabs.twig
M templates/select_lang.twig
M templates/server/binlog/log_row.twig
M templates/server/binlog/log_selector.twig
M templates/server/collations/charsets.twig
M templates/server/databases/databases_footer.twig
M templates/server/databases/index.twig
M templates/server/databases/table_row.twig
M templates/server/engines/list_engines.twig
M templates/server/engines/show_engine.twig
M templates/server/sub_page_header.twig
M templates/server/variables/link_template.twig
M templates/server/variables/variable_row.twig
M templates/table/chart/tbl_chart.twig
M templates/table/gis_visualization/gis_visualization.twig
M templates/table/index_form.twig
M templates/table/insert/continue_insertion_form.twig
M templates/table/page_with_secondary_tabs.twig
M templates/table/relation/common_form.twig
M templates/table/relation/foreign_key_row.twig
M templates/table/search/form_tag.twig
M templates/table/search/geom_func.twig
M templates/table/search/input_box.twig
M templates/table/search/replace_preview.twig
M templates/table/search/selection_form.twig
M templates/table/search/zoom_result_form.twig
M templates/table/structure/action_row_in_structure_table.twig
M templates/table/structure/display_partitions.twig
M templates/table/structure/display_structure.twig
M templates/table/structure/display_table_stats.twig
M templates/table/structure/partition_definition_form.twig
M templates/table/tracking/main.twig
M templates/table/tracking/structure_snapshot_columns.twig
M templates/theme_preview.twig
M templates/view_create.twig
M test/classes/CentralColumnsTest.php
M test/classes/InsertEditTest.php
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php
D libraries/classes/Twig/IndexExtension.php
D libraries/classes/Twig/PartitionExtension.php
D templates/privileges/add_privileges_database.twig
D templates/privileges/add_privileges_routine.twig
D templates/privileges/add_privileges_table.twig
D templates/privileges/add_user_fieldset.twig
D templates/privileges/choose_user_group.twig
D templates/privileges/column_privileges.twig
D templates/privileges/delete_user_fieldset.twig
D templates/privileges/edit_routine_privileges.twig
D templates/privileges/global_priv_table.twig
D templates/privileges/global_priv_tbl_item.twig
D templates/privileges/initials_row.twig
D templates/privileges/privileges_summary.twig
D templates/privileges/privileges_summary_row.twig
D templates/privileges/require_options.twig
D templates/privileges/require_options_item.twig
D templates/privileges/resource_limit_item.twig
D templates/privileges/resource_limits.twig

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

Commit: bc8fe79e77f0518cbf4fba78c4d53196088a5616
https://github.com/phpmyadmin/phpmyadmin/commit/bc8fe79e77f0518cbf4fba78c4d53196088a5616
Author: Gemorroj <wapinet at mail.ru>
Date: 2018-08-12 (Sun, 08 August 2018) +03:00

Changed paths: 
M ChangeLog
M doc/faq.rst
M index.php
M libraries/classes/Config/FormDisplay.php
M libraries/classes/Controllers/Table/TableIndexesController.php
M libraries/classes/Controllers/Table/TableRelationController.php
M libraries/classes/Controllers/Table/TableSearchController.php
M libraries/classes/Controllers/Table/TableStructureController.php
M libraries/classes/Display/Results.php
M libraries/classes/Rte/Events.php
M libraries/classes/Rte/Footer.php
M libraries/classes/Rte/General.php
M libraries/classes/Rte/Routines.php
M libraries/classes/Rte/Triggers.php
M libraries/classes/Twig/UtilExtension.php
M po/zh_TW.po
M templates/database/multi_table_query/form.twig
M templates/display/results/options_block.twig
M templates/table/index_form.twig
M templates/table/relation/common_form.twig
M templates/table/search/selection_form.twig
M templates/table/structure/display_structure.twig

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

Commit: 862bbedf089ca685dfdcdcac1e439f7625ddf83e
https://github.com/phpmyadmin/phpmyadmin/commit/862bbedf089ca685dfdcdcac1e439f7625ddf83e
Author: Gemorroj <wapinet at mail.ru>
Date: 2018-08-12 (Sun, 08 August 2018) +03:00

Changed paths: 
M libraries/tbl_columns_definition_form.inc.php

Log Message:
-----------
fix add new column

Signed-off-by: Gemorroj <wapinet at mail.ru>

Commit: 2575b9720dbb62ef3d0fa01b57e75a533aa0eda2
https://github.com/phpmyadmin/phpmyadmin/commit/2575b9720dbb62ef3d0fa01b57e75a533aa0eda2
Author: MaurĂ­cio Meneghini Fauth <mauriciofauth at gmail.com>
Date: 2018-08-27 (Mon, 08 August 2018) -03:00

Changed paths: 
M libraries/tbl_columns_definition_form.inc.php

Log Message:
-----------
Merge pull request #14563 from Gemorroj/add-column-fix

Add column fix



More information about the Git mailing list