Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 4dd2226ef2bd8658d13147e66a2e0dbbbedb1976
https://github.com/phpmyadmin/phpmyadmin/commit/4dd2226ef2bd8658d13147e66a2…
Author: Dan Ungureanu <udan1107(a)gmail.com>
Date: 2017-05-09 (Tue, 09 May 2017)
Changed paths:
M ChangeLog
M libraries/controllers/database/DatabaseStructureController.php
Log Message:
-----------
Redirect user to last page that has any tables to display.
Fixes #13241.
Signed-off-by: Dan Ungureanu <udan1107(a)gmail.com>
Commit: 47ba7df3129476e9048f19b0b8e9687c80375b1c
https://github.com/phpmyadmin/phpmyadmin/commit/47ba7df3129476e9048f19b0b8e…
Author: Takumi Hamamoto <novenove(a)nicolog.jp>
Date: 2017-05-13 (Sat, 13 May 2017)
Changed paths:
M po/ja.po
Log Message:
-----------
Translated using Weblate (Japanese)
Currently translated at 71.3% (2277 of 3192 strings)
[CI skip]
Commit: 3bd4e38d9b9645a520e0b78ce090d7580825c455
https://github.com/phpmyadmin/phpmyadmin/commit/3bd4e38d9b9645a520e0b78ce09…
Author: Viktar Vauchkevich <victorenator(a)gmail.com>
Date: 2017-05-15 (Mon, 15 May 2017)
Changed paths:
M po/be.po
Log Message:
-----------
Translated using Weblate (Belarusian)
Currently translated at 46.8% (1494 of 3192 strings)
[CI skip]
Commit: 8674361e46d990236306a9da43196cac653d3ecb
https://github.com/phpmyadmin/phpmyadmin/commit/8674361e46d990236306a9da431…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-05-15 (Mon, 15 May 2017)
Changed paths:
M ChangeLog
M libraries/controllers/database/DatabaseStructureController.php
Log Message:
-----------
Merge pull request #13262 from udan11/fix_13241
Redirect user to last page that has any tables to display.
Commit: a4286252a89bc965b1099ce7a24684eb605aae2d
https://github.com/phpmyadmin/phpmyadmin/commit/a4286252a89bc965b1099ce7a24…
Author: Balázs Úr <urbalazs(a)gmail.com>
Date: 2017-05-15 (Mon, 15 May 2017)
Changed paths:
M po/hu.po
Log Message:
-----------
Translated using Weblate (Hungarian)
Currently translated at 99.4% (3174 of 3192 strings)
[CI skip]
Commit: 51b5258510527c115ef875d46533d1503202fc2e
https://github.com/phpmyadmin/phpmyadmin/commit/51b5258510527c115ef875d4653…
Author: Weblate <noreply(a)weblate.org>
Date: 2017-05-15 (Mon, 15 May 2017)
Changed paths:
M ChangeLog
M libraries/controllers/database/DatabaseStructureController.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7
Commit: be92c4ef5e524acfaeff8be07f7479b66a81256b
https://github.com/phpmyadmin/phpmyadmin/commit/be92c4ef5e524acfaeff8be07f7…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-05-15 (Mon, 15 May 2017)
Log Message:
-----------
Merge commit '3bd4e38d9b9645a520e0b78ce090d7580825c455'
Commit: 17c1e99ee487c70b6746b9326a00b7868e39a783
https://github.com/phpmyadmin/phpmyadmin/commit/17c1e99ee487c70b6746b9326a0…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-05-15 (Mon, 15 May 2017)
Changed paths:
M ChangeLog
M libraries/controllers/database/DatabaseStructureController.php
Log Message:
-----------
Merge commit '8674361e46d990236306a9da43196cac653d3ecb'
Commit: 452f6210dccc7e84492c7c633ca1e6365fec74c8
https://github.com/phpmyadmin/phpmyadmin/commit/452f6210dccc7e84492c7c633ca…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-05-15 (Mon, 15 May 2017)
Log Message:
-----------
Merge branch 'QA_4_7'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6513497e8832...452f6210dccc
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 0a80a0ce571e5145128c666a7c60abf46bf4872b
https://github.com/phpmyadmin/phpmyadmin/commit/0a80a0ce571e5145128c666a7c6…
Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com>
Date: 2017-05-09 (Tue, 09 May 2017)
Changed paths:
M libraries/Util.php
M libraries/central_columns.lib.php
M libraries/controllers/database/DatabaseStructureController.php
M libraries/controllers/server/ServerDatabasesController.php
M libraries/controllers/server/ServerVariablesController.php
M libraries/rte/rte_list.lib.php
M libraries/server_privileges.lib.php
M libraries/tracking.lib.php
M libraries/user_preferences.lib.php
M templates/columns_definitions/column_adjust_privileges.twig
M templates/columns_definitions/column_attributes.phtml
M templates/columns_definitions/column_auto_increment.twig
M templates/columns_definitions/column_extra.twig
M templates/columns_definitions/column_indexes.twig
M templates/columns_definitions/column_length.twig
M templates/columns_definitions/column_null.twig
M templates/columns_definitions/column_type.twig
M templates/columns_definitions/transformation_option.twig
M templates/console/bookmark_content.phtml
M templates/console/display.phtml
M templates/console/query_action.twig
M templates/console/toolbar.twig
M templates/database/designer/canvas.twig
M templates/div_for_slider_effect.twig
M templates/dropdown.twig
M templates/filter.twig
M templates/prefs_autoload.twig
M templates/select_all.twig
M templates/table/structure/check_all_table_column.phtml
M templates/toggle_button.twig
Log Message:
-----------
Refactor variable names in Twig templates
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com>
Commit: cb881daea21cfb1af79bbee67bac416c273fa124
https://github.com/phpmyadmin/phpmyadmin/commit/cb881daea21cfb1af79bbee67ba…
Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com>
Date: 2017-05-10 (Wed, 10 May 2017)
Changed paths:
M libraries/server_privileges.lib.php
M libraries/twig/UtilExtension.php
M templates/error/report_form.twig
R templates/privileges/add_privileges_database.phtml
A templates/privileges/add_privileges_database.twig
R templates/privileges/add_privileges_routine.phtml
A templates/privileges/add_privileges_routine.twig
R templates/privileges/add_privileges_table.phtml
A templates/privileges/add_privileges_table.twig
R templates/privileges/add_user_fieldset.phtml
A templates/privileges/add_user_fieldset.twig
R templates/privileges/choose_user_group.phtml
A templates/privileges/choose_user_group.twig
R templates/privileges/column_privileges.phtml
A templates/privileges/column_privileges.twig
R templates/privileges/delete_user_fieldset.phtml
A templates/privileges/delete_user_fieldset.twig
R templates/privileges/edit_routine_privileges.phtml
A templates/privileges/edit_routine_privileges.twig
R templates/privileges/global_priv_tbl_item.phtml
A templates/privileges/global_priv_tbl_item.twig
R templates/privileges/privileges_summary_row.phtml
A templates/privileges/privileges_summary_row.twig
R templates/privileges/require_options_item.phtml
A templates/privileges/require_options_item.twig
R templates/privileges/resource_limit_item.phtml
A templates/privileges/resource_limit_item.twig
Log Message:
-----------
Port some templates to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com>
Commit: 113c1200884050074b1eae36750043d73decdcb5
https://github.com/phpmyadmin/phpmyadmin/commit/113c1200884050074b1eae36750…
Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com>
Date: 2017-05-12 (Fri, 12 May 2017)
Changed paths:
M libraries/Template.php
M libraries/controllers/server/ServerCollationsController.php
M libraries/controllers/server/ServerVariablesController.php
A libraries/twig/CharsetsExtension.php
M scripts/generate-twig-cache
R templates/server/binlog/log_row.phtml
A templates/server/binlog/log_row.twig
R templates/server/collations/charsets.phtml
A templates/server/collations/charsets.twig
R templates/server/engines/engines.phtml
A templates/server/engines/engines.twig
R templates/server/variables/link_template.phtml
A templates/server/variables/link_template.twig
R templates/server/variables/session_variable_row.phtml
A templates/server/variables/session_variable_row.twig
R templates/server/variables/variable_table_head.phtml
A templates/server/variables/variable_table_head.twig
M test/classes/controllers/ServerCollationsControllerTest.php
Log Message:
-----------
Port some templates to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com>
Commit: 496abb869f5f4761c91959dfba270e17e578d2f4
https://github.com/phpmyadmin/phpmyadmin/commit/496abb869f5f4761c91959dfba2…
Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com>
Date: 2017-05-12 (Fri, 12 May 2017)
Changed paths:
M libraries/controllers/table/TableRelationController.php
M libraries/controllers/table/TableSearchController.php
M libraries/controllers/table/TableStructureController.php
M libraries/server_privileges.lib.php
M templates/privileges/privileges_summary_row.twig
R templates/table/relation/dropdown_generate.phtml
A templates/table/relation/dropdown_generate.twig
R templates/table/relation/relational_dropdown.phtml
A templates/table/relation/relational_dropdown.twig
M templates/table/search/fields_table.phtml
R templates/table/search/replace_preview.phtml
A templates/table/search/replace_preview.twig
R templates/table/search/table_header.phtml
A templates/table/search/table_header.twig
R templates/table/secondary_tabs.phtml
A templates/table/secondary_tabs.twig
Log Message:
-----------
Port some templates to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com>
Commit: 6513497e88320cb8f772ceb503b6a6417a0180e2
https://github.com/phpmyadmin/phpmyadmin/commit/6513497e88320cb8f772ceb503b…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-05-15 (Mon, 15 May 2017)
Changed paths:
M libraries/Template.php
M libraries/Util.php
M libraries/central_columns.lib.php
M libraries/controllers/database/DatabaseStructureController.php
M libraries/controllers/server/ServerCollationsController.php
M libraries/controllers/server/ServerDatabasesController.php
M libraries/controllers/server/ServerVariablesController.php
M libraries/controllers/table/TableRelationController.php
M libraries/controllers/table/TableSearchController.php
M libraries/controllers/table/TableStructureController.php
M libraries/rte/rte_list.lib.php
M libraries/server_privileges.lib.php
M libraries/tracking.lib.php
A libraries/twig/CharsetsExtension.php
M libraries/twig/UtilExtension.php
M libraries/user_preferences.lib.php
M scripts/generate-twig-cache
M templates/columns_definitions/column_adjust_privileges.twig
M templates/columns_definitions/column_attributes.phtml
M templates/columns_definitions/column_auto_increment.twig
M templates/columns_definitions/column_extra.twig
M templates/columns_definitions/column_indexes.twig
M templates/columns_definitions/column_length.twig
M templates/columns_definitions/column_null.twig
M templates/columns_definitions/column_type.twig
M templates/columns_definitions/transformation_option.twig
M templates/console/bookmark_content.phtml
M templates/console/display.phtml
M templates/console/query_action.twig
M templates/console/toolbar.twig
M templates/database/designer/canvas.twig
M templates/div_for_slider_effect.twig
M templates/dropdown.twig
M templates/error/report_form.twig
M templates/filter.twig
M templates/prefs_autoload.twig
R templates/privileges/add_privileges_database.phtml
A templates/privileges/add_privileges_database.twig
R templates/privileges/add_privileges_routine.phtml
A templates/privileges/add_privileges_routine.twig
R templates/privileges/add_privileges_table.phtml
A templates/privileges/add_privileges_table.twig
R templates/privileges/add_user_fieldset.phtml
A templates/privileges/add_user_fieldset.twig
R templates/privileges/choose_user_group.phtml
A templates/privileges/choose_user_group.twig
R templates/privileges/column_privileges.phtml
A templates/privileges/column_privileges.twig
R templates/privileges/delete_user_fieldset.phtml
A templates/privileges/delete_user_fieldset.twig
R templates/privileges/edit_routine_privileges.phtml
A templates/privileges/edit_routine_privileges.twig
R templates/privileges/global_priv_tbl_item.phtml
A templates/privileges/global_priv_tbl_item.twig
R templates/privileges/privileges_summary_row.phtml
A templates/privileges/privileges_summary_row.twig
R templates/privileges/require_options_item.phtml
A templates/privileges/require_options_item.twig
R templates/privileges/resource_limit_item.phtml
A templates/privileges/resource_limit_item.twig
M templates/select_all.twig
R templates/server/binlog/log_row.phtml
A templates/server/binlog/log_row.twig
R templates/server/collations/charsets.phtml
A templates/server/collations/charsets.twig
R templates/server/engines/engines.phtml
A templates/server/engines/engines.twig
R templates/server/variables/link_template.phtml
A templates/server/variables/link_template.twig
R templates/server/variables/session_variable_row.phtml
A templates/server/variables/session_variable_row.twig
R templates/server/variables/variable_table_head.phtml
A templates/server/variables/variable_table_head.twig
R templates/table/relation/dropdown_generate.phtml
A templates/table/relation/dropdown_generate.twig
R templates/table/relation/relational_dropdown.phtml
A templates/table/relation/relational_dropdown.twig
M templates/table/search/fields_table.phtml
R templates/table/search/replace_preview.phtml
A templates/table/search/replace_preview.twig
R templates/table/search/table_header.phtml
A templates/table/search/table_header.twig
R templates/table/secondary_tabs.phtml
A templates/table/secondary_tabs.twig
M templates/table/structure/check_all_table_column.phtml
M templates/toggle_button.twig
M test/classes/controllers/ServerCollationsControllerTest.php
Log Message:
-----------
Merge pull request #13265 from mauriciofauth/templates
Port templates to Twig
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/96641035d8c9...6513497e8832
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 1095829d9ffe0ae7d7f729b7d516bdb873fe1e61
https://github.com/phpmyadmin/phpmyadmin/commit/1095829d9ffe0ae7d7f729b7d51…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-05-15 (Mon, 15 May 2017)
Changed paths:
M test/ci-lint
Log Message:
-----------
Avoid linting removed files
We can not lint files which have been removed in the commit.
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/error-reporting-server
Commit: cca6bf6c36a84bae3989eb99f1a1bd3f719c229f
https://github.com/phpmyadmin/error-reporting-server/commit/cca6bf6c36a84ba…
Author: Deven Bansod <devenbansod.bits(a)gmail.com>
Date: 2017-05-14 (Sun, 14 May 2017)
Changed paths:
M src/Controller/ReportsController.php
M src/Template/Reports/view.ctp
Log Message:
-----------
Allow POST methods for mark_related_to and unmark_related_to
Also, fix an error in Reports/view.ctp related to undefined symbol
Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com>
Commit: c9c188938b4ebf18574f74997576147df583aa7e
https://github.com/phpmyadmin/error-reporting-server/commit/c9c188938b4ebf1…
Author: Deven Bansod <devenbansod.bits(a)gmail.com>
Date: 2017-05-14 (Sun, 14 May 2017)
Changed paths:
M tests/TestCase/Controller/ReportsControllerTest.php
Log Message:
-----------
Fix old commented tests related to mark_related_to and unmark_related_to actions
Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com>
Compare: https://github.com/phpmyadmin/error-reporting-server/compare/d71e3f1c234a..…