Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 42ee7ceb3dbf0eb0948289d7ddd8d0bf0aa3bc4e https://github.com/phpmyadmin/phpmyadmin/commit/42ee7ceb3dbf0eb0948289d7ddd8... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2015-08-23 (Sun, 23 Aug 2015)
Changed paths: M js/common.js
Log Message: ----------- Add missing ";".
Signed-off-by: Hugues Peccatte hugues.peccatte@gmail.com
Commit: 00dee1085c024d8d6d89a2cd2a7a8911c74622c5 https://github.com/phpmyadmin/phpmyadmin/commit/00dee1085c024d8d6d89a2cd2a7a... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2015-08-23 (Sun, 23 Aug 2015)
Changed paths: M .gitignore M .travis.yml M ChangeLog M PMAStandard/ruleset.xml M composer.json M db_designer.php M db_import.php M db_structure.php M db_tracking.php M doc/credits.rst M doc/faq.rst M doc/require.rst M doc/setup.rst M export.php M favicon.ico M gis_data_editor.php M import.php M index.php M js/export.js M js/functions.js M js/normalization.js M js/tbl_change.js M js/tbl_gis_visualization.js M js/tbl_operations.js M js/tbl_select.js M js/tbl_structure.js M libraries/Config.class.php M libraries/DisplayResults.class.php M libraries/Menu.class.php M libraries/Partition.class.php M libraries/Table.class.php M libraries/Util.class.php M libraries/common.inc.php M libraries/config.default.php M libraries/config/FormDisplay.tpl.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/config/user_preferences.forms.php A libraries/controllers/DatabaseController.class.php A libraries/controllers/DatabaseStructureController.class.php R 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 A libraries/controllers/TableStructureController.class.php M libraries/db_common.inc.php M libraries/db_designer.lib.php M libraries/db_info.inc.php M libraries/dbi/DBIDummy.class.php M libraries/display_create_table.lib.php R libraries/display_import.inc.php M libraries/display_import.lib.php M libraries/error_report.lib.php M libraries/export.lib.php M libraries/import.lib.php M libraries/insert_edit.lib.php M libraries/mult_submits.inc.php M libraries/navigation/NavigationHeader.class.php M libraries/navigation/Nodes/Node_Database.class.php M libraries/operations.lib.php M libraries/phpseclib/Crypt/AES.php M libraries/phpseclib/Crypt/Base.php M libraries/phpseclib/Crypt/Random.php M libraries/phpseclib/Crypt/Rijndael.php A libraries/phpseclib/LICENSE M libraries/plugins/auth/AuthenticationCookie.class.php A libraries/plugins/auth/recaptcha/ReCaptcha/ReCaptcha.php A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod.php A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Post.php A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Socket.php A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/SocketPost.php A libraries/plugins/auth/recaptcha/ReCaptcha/RequestParameters.php A libraries/plugins/auth/recaptcha/ReCaptcha/Response.php A libraries/plugins/auth/recaptcha/autoload.php R libraries/plugins/auth/recaptcha/recaptchalib.php M libraries/plugins/export/ExportSql.class.php M libraries/plugins/import/ImportSql.class.php M libraries/plugins/schema/svg/RelationStatsSvg.class.php M libraries/plugins/schema/svg/Svg_Relation_Schema.class.php M libraries/plugins/schema/svg/TableStatsSvg.class.php M libraries/pmd_common.php M libraries/relation.lib.php M libraries/rte/rte_routines.lib.php M libraries/server_databases.lib.php M libraries/server_status.lib.php M libraries/sql-parser/src/Component.php M libraries/sql-parser/src/Components/AlterOperation.php M libraries/sql-parser/src/Components/Array2d.php M libraries/sql-parser/src/Components/ArrayObj.php M libraries/sql-parser/src/Components/Condition.php M libraries/sql-parser/src/Components/CreateDefinition.php M libraries/sql-parser/src/Components/DataType.php M libraries/sql-parser/src/Components/Expression.php M libraries/sql-parser/src/Components/ExpressionArray.php M libraries/sql-parser/src/Components/FunctionCall.php M libraries/sql-parser/src/Components/IntoKeyword.php M libraries/sql-parser/src/Components/JoinKeyword.php M libraries/sql-parser/src/Components/Key.php M libraries/sql-parser/src/Components/Limit.php M libraries/sql-parser/src/Components/OptionsArray.php M libraries/sql-parser/src/Components/OrderKeyword.php M libraries/sql-parser/src/Components/ParameterDefinition.php A 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/Components/UnionKeyword.php M libraries/sql-parser/src/Context.php M libraries/sql-parser/src/Contexts/ContextMySql50000.php M libraries/sql-parser/src/Contexts/ContextMySql50100.php M libraries/sql-parser/src/Contexts/ContextMySql50500.php M libraries/sql-parser/src/Contexts/ContextMySql50600.php M libraries/sql-parser/src/Contexts/ContextMySql50700.php M libraries/sql-parser/src/Lexer.php M libraries/sql-parser/src/Parser.php M libraries/sql-parser/src/Statement.php M libraries/sql-parser/src/Statements/AlterStatement.php M libraries/sql-parser/src/Statements/CreateStatement.php M libraries/sql-parser/src/Token.php A libraries/sql-parser/src/Utils/BufferedQuery.php M libraries/sql-parser/src/Utils/Formatter.php M libraries/sql-parser/src/Utils/Misc.php M libraries/sql-parser/src/Utils/Query.php M libraries/sql-parser/src/Utils/Table.php M libraries/sql.lib.php M libraries/tbl_columns_definition_form.inc.php M libraries/tracking.lib.php M libraries/user_preferences.inc.php M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@latin.po M po/bg.po M po/bn.po M po/br.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/eo.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/fy.po M po/gl.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ky.po M po/li.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/ne.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr@latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz@latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po M server_import.php M tbl_change.php M tbl_import.php M tbl_structure.php M tbl_tracking.php 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 A templates/list/item.phtml A templates/list/unordered.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 R templates/table/geom_func.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/geom_func.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_partitions.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 M test/Environment_test.php M test/classes/plugin/export/PMA_ExportSql_test.php M test/classes/plugin/import/ImportSql_test.php M test/install-runkit M test/libraries/PMA_insert_edit_test.php
Log Message: ----------- Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin
Commit: 3aae3123356e2612ce98356cd95407f5e51080b2 https://github.com/phpmyadmin/phpmyadmin/commit/3aae3123356e2612ce98356cd954... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2015-08-23 (Sun, 23 Aug 2015)
Changed paths: M libraries/Linter.class.php M libraries/Table.class.php
Log Message: ----------- Update PHPDoc.
Signed-off-by: Hugues Peccatte hugues.peccatte@gmail.com
Commit: 3b50d8156d28eb3bad7db866a86651bf6351fb61 https://github.com/phpmyadmin/phpmyadmin/commit/3b50d8156d28eb3bad7db866a866... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2015-08-23 (Sun, 23 Aug 2015)
Changed paths: M js/get_image.js.php
Log Message: ----------- Minor coding style modification.
Signed-off-by: Hugues Peccatte hugues.peccatte@gmail.com
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d073bf4ca7e2...3b50d8156d28
-
Hugues Peccatte