Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a599b615341e605fd9b47cd00bac70e171eb7954 https://github.com/phpmyadmin/phpmyadmin/commit/a599b615341e605fd9b47cd00bac... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-08-10 (Mon, 10 Aug 2015)
Changed paths: M db_structure.php A libraries/controllers/DatabaseController.class.php A libraries/controllers/DatabaseStructureController.class.php R libraries/controllers/StructureController.class.php A libraries/controllers/TableStructureController.class.php M tbl_structure.php
Log Message: ----------- Create separate controllers from table and database structure pages
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 95361255c59c213d8ddbada7dd072e517aa78f60 https://github.com/phpmyadmin/phpmyadmin/commit/95361255c59c213d8ddbada7dd07... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-08-10 (Mon, 10 Aug 2015)
Changed paths: M libraries/controllers/TableStructureController.class.php
Log Message: ----------- No need to pass as method variables when the values can be accessed with instance variables
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: c90d05f3b2bf475aaefea9584bb647da180fdf4c https://github.com/phpmyadmin/phpmyadmin/commit/c90d05f3b2bf475aaefea9584bb6... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-08-10 (Mon, 10 Aug 2015)
Changed paths: M libraries/controllers/DatabaseStructureController.class.php
Log Message: ----------- Use instance variables
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: edf833644bbc56865cf876707533cc344306744b https://github.com/phpmyadmin/phpmyadmin/commit/edf833644bbc56865cf876707533... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-08-10 (Mon, 10 Aug 2015)
Changed paths: M libraries/Table.class.php M libraries/controllers/DatabaseStructureController.class.php A libraries/controllers/StructureController.class.php M libraries/controllers/TableChartController.class.php M libraries/controllers/TableGisVisualizationController.class.php M libraries/controllers/TableIndexesController.class.php M libraries/controllers/TableRelationController.class.php M libraries/controllers/TableSearchController.class.php M libraries/controllers/TableStructureController.class.php M libraries/db_designer.lib.php M libraries/display_create_table.lib.php M libraries/mult_submits.inc.php M libraries/navigation/NavigationHeader.class.php M po/el.po M po/et.po A templates/database/create_table.phtml A templates/database/designer/aggregate_query_panel.phtml A templates/database/designer/canvas.phtml A templates/database/designer/database_tables.phtml A templates/database/designer/delete_relation_panel.phtml A templates/database/designer/edit_delete_pages.phtml A templates/database/designer/having_query_panel.phtml A templates/database/designer/js_fields.phtml A templates/database/designer/new_relation_panel.phtml A templates/database/designer/options_panel.phtml A templates/database/designer/page_save_as.phtml A templates/database/designer/page_selector.phtml A templates/database/designer/query_details.phtml A templates/database/designer/rename_to_panel.phtml A templates/database/designer/schema_export.phtml A templates/database/designer/side_menu.phtml A templates/database/designer/table_list.phtml A templates/database/designer/where_query_panel.phtml A templates/database/structure/body_for_table_summary.phtml A templates/database/structure/browse_table.phtml A templates/database/structure/browse_table_label.phtml A templates/database/structure/check_all_tables.phtml A templates/database/structure/empty_table.phtml A templates/database/structure/favorite_anchor.phtml A templates/database/structure/print_view_data_dictionary_link.phtml A templates/database/structure/search_table.phtml A templates/database/structure/show_create.phtml A templates/database/structure/show_create_row.phtml A templates/database/structure/sortable_header.phtml A templates/database/structure/structure_table_row.phtml A templates/database/structure/table_header.phtml A templates/database/structure/tracking_icon.phtml R templates/designer/aggregate_query_panel.phtml R templates/designer/canvas.phtml R templates/designer/database_tables.phtml R templates/designer/delete_relation_panel.phtml R templates/designer/edit_delete_pages.phtml R templates/designer/having_query_panel.phtml R templates/designer/js_fields.phtml R templates/designer/new_relation_panel.phtml R templates/designer/options_panel.phtml R templates/designer/page_save_as.phtml R templates/designer/page_selector.phtml R templates/designer/query_details.phtml R templates/designer/rename_to_panel.phtml R templates/designer/schema_export.phtml R templates/designer/side_menu.phtml R templates/designer/table_list.phtml R templates/designer/where_query_panel.phtml R templates/gis_visualization/gis_visualization.phtml R templates/index_form.phtml R templates/logo.phtml A templates/navigation/logo.phtml A templates/secondary_tabs.phtml R templates/structure/action_row_in_structure_table.phtml R templates/structure/actions_in_table_structure.phtml R templates/structure/add_column.phtml R templates/structure/body_for_table_summary.phtml R templates/structure/browse_table.phtml R templates/structure/browse_table_label.phtml R templates/structure/check_all_table_column.phtml R templates/structure/check_all_tables.phtml R templates/structure/display_structure.phtml R templates/structure/display_table_stats.phtml R templates/structure/empty_table.phtml R templates/structure/favorite_anchor.phtml R templates/structure/move_columns_dialog.phtml R templates/structure/optional_action_links.phtml R templates/structure/print_view_data_dictionary_link.phtml R templates/structure/row_stats_table.phtml R templates/structure/search_table.phtml R templates/structure/secondary_tabs.phtml R templates/structure/show_create.phtml R templates/structure/show_create_row.phtml R templates/structure/sortable_header.phtml R templates/structure/structure_table_row.phtml R templates/structure/table_header.phtml R templates/structure/table_structure_header.phtml R templates/structure/table_structure_row.phtml R templates/structure/tracking_icon.phtml A templates/table/chart/tbl_chart.phtml R templates/table/column_comparison_operators.phtml R templates/table/create_table.phtml R templates/table/fields_table.phtml R templates/table/form_tag.phtml A templates/table/gis_visualization/gis_visualization.phtml A templates/table/index_form.phtml R templates/table/input_box.phtml R templates/table/options.phtml R templates/table/options_zoom.phtml A templates/table/relation/common_form.phtml A templates/table/relation/dropdown_generate.phtml A templates/table/relation/foreign_key_row.phtml A templates/table/relation/internal_relational_row.phtml A templates/table/relation/relational_dropdown.phtml R templates/table/replace_preview.phtml R templates/table/rows_normal.phtml R templates/table/rows_zoom.phtml A templates/table/search/column_comparison_operators.phtml A templates/table/search/fields_table.phtml A templates/table/search/form_tag.phtml A templates/table/search/input_box.phtml A templates/table/search/options.phtml A templates/table/search/options_zoom.phtml A templates/table/search/replace_preview.phtml A templates/table/search/rows_normal.phtml A templates/table/search/rows_zoom.phtml A templates/table/search/search_and_replace.phtml A templates/table/search/selection_form.phtml A templates/table/search/table_header.phtml A templates/table/search/zoom_result_form.phtml R templates/table/search_and_replace.phtml M templates/table/secondary_tabs.phtml R templates/table/selection_form.phtml A templates/table/structure/action_row_in_structure_table.phtml A templates/table/structure/actions_in_table_structure.phtml A templates/table/structure/add_column.phtml A templates/table/structure/check_all_table_column.phtml A templates/table/structure/display_structure.phtml A templates/table/structure/display_table_stats.phtml A templates/table/structure/move_columns_dialog.phtml A templates/table/structure/optional_action_links.phtml A templates/table/structure/row_stats_table.phtml A templates/table/structure/table_structure_header.phtml A templates/table/structure/table_structure_row.phtml R templates/table/table_header.phtml R templates/table/zoom_result_form.phtml R templates/tbl_chart.phtml R templates/tbl_relation/common_form.phtml R templates/tbl_relation/dropdown_generate.phtml R templates/tbl_relation/foreign_key_row.phtml R templates/tbl_relation/internal_relational_row.phtml R templates/tbl_relation/relational_dropdown.phtml
Log Message: ----------- Merge branch 'master' into structureController
Conflicts: libraries/controllers/StructureController.class.php
Commit: ba4eb9e53838a953157f40d54f1031aaf3cf732a https://github.com/phpmyadmin/phpmyadmin/commit/ba4eb9e53838a953157f40d54f10... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-08-10 (Mon, 10 Aug 2015)
Changed paths: M db_structure.php A libraries/controllers/DatabaseController.class.php A libraries/controllers/DatabaseStructureController.class.php A libraries/controllers/TableStructureController.class.php M tbl_structure.php
Log Message: ----------- Merge pull request #11379 from madhuracj/structureController
Create separate controllers from table and database structure pages
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2109cd3c358b...ba4eb9e53838