Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 63fef03cc733a806d3a474a565ed33e6d509e59a https://github.com/phpmyadmin/phpmyadmin/commit/63fef03cc733a806d3a474a565ed... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-05-22 (Fri, 22 May 2015) Changed paths: M libraries/check_user_privileges.lib.php M libraries/plugins/auth/AuthenticationCookie.class.php Log Message: ----------- is_process_priv is no longer used Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: 43fbe8bbb3c976c00809de433f48d3b2d8f64822 https://github.com/phpmyadmin/phpmyadmin/commit/43fbe8bbb3c976c00809de433f48... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-05-22 (Fri, 22 May 2015) Changed paths: M ChangeLog M libraries/Util.class.php M libraries/check_user_privileges.lib.php Log Message: ----------- rfe #1242 Work with --skip-grant-tables Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: 7d6b3e5df5cb768f4d4ea48635a5c5013431a877 https://github.com/phpmyadmin/phpmyadmin/commit/7d6b3e5df5cb768f4d4ea48635a5... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-05-22 (Fri, 22 May 2015) Changed paths: M libraries/Template.class.php M libraries/browse_foreigners.lib.php M libraries/db_designer.lib.php M scripts/update-po A templates/designer/aggregate_query_panel.phtml A templates/designer/canvas.phtml A templates/designer/database_tables.phtml A templates/designer/delete_relation_panel.phtml A templates/designer/edit_delete_pages.phtml A templates/designer/having_query_panel.phtml A templates/designer/js_fields.phtml A templates/designer/new_relation_panel.phtml A templates/designer/options_panel.phtml A templates/designer/page_save_as.phtml A templates/designer/page_selector.phtml A templates/designer/query_details.phtml A templates/designer/rename_to_panel.phtml A templates/designer/schema_export.phtml A templates/designer/side_menu.phtml A templates/designer/table_list.phtml A templates/designer/where_query_panel.phtml R templates/tbl_chart.php A templates/tbl_chart.phtml A templates/test/echo.phtml A templates/test/static.phtml A templates/test/trim.phtml A test/classes/PMA_Template_test.php M test/libraries/PMA_browse_foreigners_test.php M themes/pmahomme/css/pmd.css.php Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3f8501fcbb6f...7d6b3e5df5cb