From dcaeb652b07fe6704897c6a4d444302b2a24e483 Mon Sep 17 00:00:00 2001 From: Mike Lewis Date: Thu, 16 Feb 2017 19:08:30 -0500 Subject: [PATCH 1/2] Also submit inline SQL form when pressing the command key on macOS Allows for the natural macOS key combination to submit a form (command + enter) to be used in addition to the Windows combination (control + enter) Signed-off-by: Mike Lewis --- js/functions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/functions.js b/js/functions.js index 0a5dde8182..0dbba5ac07 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2087,7 +2087,7 @@ function bindCodeMirrorToInlineEditor() { function catchKeypressesFromSqlInlineEdit(event) { // ctrl-enter is 10 in chrome and ie, but 13 in ff - if (event.ctrlKey && (event.keyCode == 13 || event.keyCode == 10)) { + if ((event.ctrlKey || event.metaKey) && (event.keyCode == 13 || event.keyCode == 10)) { $("#sql_query_edit_save").trigger('click'); } } From 53eff5d47b664558fd02881cde14f8144d997cfb Mon Sep 17 00:00:00 2001 From: Joshua Atkins Date: Wed, 15 Feb 2017 14:32:53 +0100 Subject: [PATCH 2/2] Align NULL values according to column alignment Fixes #13000. Signed-off-by: Joshua Atkins --- ChangeLog | 1 + themes/original/css/common.css.php | 1 - themes/pmahomme/css/common.css.php | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1c3097e679..c7201e5fdd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -81,6 +81,7 @@ phpMyAdmin - ChangeLog - issue #12345 Correctly show affected rows for LOAD DATA queries - issue #13010 Copy database: SQL error for copying PMADB metadata - issue #13002 Fixed OpenDocument exports +- issue #13000 Align NULL values according to the column alignment 4.6.6 (2017-01-23) - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup' diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php index 7875de63d9..8ec9437c81 100644 --- a/themes/original/css/common.css.php +++ b/themes/original/css/common.css.php @@ -307,7 +307,6 @@ th.condition { */ td.null { font-style: italic; - text-align: ; color: #7d7d7d; } diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php index d0c1a61240..208b278123 100644 --- a/themes/pmahomme/css/common.css.php +++ b/themes/pmahomme/css/common.css.php @@ -611,7 +611,6 @@ tr:last-child td.condition { */ td.null { font-style: italic; - text-align: ; color: #7d7d7d; }