Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 685ccaf680cd855fa57f332928d746fbc26a20cd https://github.com/phpmyadmin/phpmyadmin/commit/685ccaf680cd855fa57f332928d7... Author: Leonardo Strozzi laps15@inf.ufpr.br Date: 2018-07-24 (Tue, 07 July 2018) -03:00

Changed paths: A templates/server/privileges/add_privileges_database.twig A templates/server/privileges/add_privileges_routine.twig A templates/server/privileges/add_privileges_table.twig 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/global_priv_tbl_item.twig A templates/server/privileges/initials_row.twig A templates/server/privileges/privileges_summary.twig A templates/server/privileges/privileges_summary_row.twig A templates/server/privileges/require_options.twig A templates/server/privileges/require_options_item.twig A templates/server/privileges/resource_limit_item.twig A templates/server/privileges/resource_limits.twig M libraries/classes/Server/Privileges.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: ----------- Move privileges' template dir to server's

Signed-off-by: Leonardo Strozzi laps15@inf.ufpr.br

Commit: d3dfdbc6d19f19114b7f114c49ca82732677832e https://github.com/phpmyadmin/phpmyadmin/commit/d3dfdbc6d19f19114b7f114c49ca... Author: Leonardo Strozzi laps15@inf.ufpr.br Date: 2018-07-24 (Tue, 07 July 2018) -03:00

Changed paths: M templates/server/privileges/global_priv_table.twig M templates/server/privileges/privileges_summary.twig M templates/server/privileges/require_options.twig M templates/server/privileges/resource_limits.twig D templates/server/privileges/add_privileges_database.twig D templates/server/privileges/add_privileges_routine.twig D templates/server/privileges/add_privileges_table.twig D templates/server/privileges/global_priv_tbl_item.twig D templates/server/privileges/privileges_summary_row.twig D templates/server/privileges/require_options_item.twig D templates/server/privileges/resource_limit_item.twig

Log Message: ----------- Merge template files

replaced include statements for the file content where the file was used only for that statement

Signed-off-by: Leonardo Strozzi laps15@inf.ufpr.br

Commit: bfc4dab5de8506c88ab4a705fa83487a58b31a92 https://github.com/phpmyadmin/phpmyadmin/commit/bfc4dab5de8506c88ab4a705fa83... Author: Maurício Meneghini Fauth mauriciofauth@gmail.com Date: 2018-08-02 (Thu, 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 libraries/classes/Server/Privileges.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 pull request #14528 from laps15/refactor_server

Refactor server privileges templates