From 2f0b6c41693e3225e4d0dc36d2d4d86d370ede5c Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Wed, 29 Mar 2017 14:39:15 -0400 Subject: [PATCH 001/104] Prepare for 4.7.1-dev Signed-off-by: Isaac Bennetch --- ChangeLog | 2 ++ README | 2 +- doc/conf.py | 2 +- libraries/Config.php | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1123543d78..637cb9f47a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +4.7.1 (not yet released) + 4.7.0 (2017-03-28) - patch #12233 [Display] Improve message when renaming database to same name - issue #6146 Log authentication attempts to syslog diff --git a/README b/README index f23e316929..7477b35dda 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.7.0 +Version 4.7.1-dev A web interface for MySQL and MariaDB. diff --git a/doc/conf.py b/doc/conf.py index d1294594d2..a912d87376 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2017, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.7.0' +version = '4.7.1-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.php b/libraries/Config.php index 9f4c0e6005..cedd74ef3d 100644 --- a/libraries/Config.php +++ b/libraries/Config.php @@ -103,7 +103,7 @@ class Config */ public function checkSystem() { - $this->set('PMA_VERSION', '4.7.0'); + $this->set('PMA_VERSION', '4.7.1-dev'); /** * @deprecated */ From cf525c78761e4a984163c975a418580a5a024043 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 30 Mar 2017 13:09:08 +0200 Subject: [PATCH 002/104] Always execute tracking queries as controluser MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #13132 Signed-off-by: Michal Čihař --- ChangeLog | 1 + libraries/Tracker.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 637cb9f47a..ff9cc4e3d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 4.7.1 (not yet released) +- issue #13132 Always execute tracking queries as controluser 4.7.0 (2017-03-28) - patch #12233 [Display] Improve message when renaming database to same name diff --git a/libraries/Tracker.php b/libraries/Tracker.php index d37ba35372..6e698522b1 100644 --- a/libraries/Tracker.php +++ b/libraries/Tracker.php @@ -127,7 +127,7 @@ class Tracker " AND table_name = '" . $GLOBALS['dbi']->escapeString($tablename) . "' " . " ORDER BY version DESC LIMIT 1"; - $result = $GLOBALS['dbi']->fetchValue($sql_query); + $result = $GLOBALS['dbi']->fetchValue($sql_query, 0, 0, $GLOBALS['controllink']); return ($result == 1); } From 4009217a2ef3a0b68ec4005666b94f9b51abeb94 Mon Sep 17 00:00:00 2001 From: tmtisfree Date: Thu, 30 Mar 2017 09:48:16 +0000 Subject: [PATCH 003/104] Translated using Weblate (French) Currently translated at 100.0% (3192 of 3192 strings) [CI skip] --- po/fr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index 77d5c3969b..91648f29cd 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2017-03-03 14:49+0100\n" -"PO-Revision-Date: 2017-03-25 18:06+0000\n" +"PO-Revision-Date: 2017-03-30 09:48+0000\n" "Last-Translator: tmtisfree \n" "Language-Team: French " "\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 2.12\n" +"X-Generator: Weblate 2.13-dev\n" #: changelog.php:39 license.php:34 #, php-format @@ -3527,7 +3527,7 @@ msgstr "Restaurer l'ordre des colonnes" #: libraries/DisplayResults.php:957 libraries/central_columns.lib.php:661 msgid "Filter rows" -msgstr "Filtrer les lignes" +msgstr "Filtrer les lignes " #: libraries/DisplayResults.php:959 libraries/central_columns.lib.php:663 msgid "Search this table" From f89aafe9bfb194e4463bcc3469291a4101c5e539 Mon Sep 17 00:00:00 2001 From: Piyush Agrawal Date: Mon, 27 Mar 2017 18:44:47 +0530 Subject: [PATCH 004/104] Fix: Focus back to codemirror editor on selecting column Signed-off-by: Piyush Agrawal --- js/functions.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/functions.js b/js/functions.js index 03a2040582..79a08daebd 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1290,6 +1290,7 @@ function insertValueQuery() /* CodeMirror support */ if (codemirror_editor) { codemirror_editor.replaceSelection(columnsList); + codemirror_editor.focus(); //IE support } else if (document.selection) { myQuery.focus(); From 8602695340bd499cba1be6de89dcde3b41baaadd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 30 Mar 2017 13:16:42 +0200 Subject: [PATCH 005/104] Focus on SQL editor after inserting field name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #13125 Signed-off-by: Michal Čihař --- ChangeLog | 1 + js/functions.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ff9cc4e3d9..c467291b99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog 4.7.1 (not yet released) - issue #13132 Always execute tracking queries as controluser +- issue #13125 Focus on SQL editor after inserting field name 4.7.0 (2017-03-28) - patch #12233 [Display] Improve message when renaming database to same name diff --git a/js/functions.js b/js/functions.js index 79a08daebd..484cab4889 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1296,7 +1296,6 @@ function insertValueQuery() myQuery.focus(); var sel = document.selection.createRange(); sel.text = columnsList; - document.sqlform.insert.focus(); } //MOZILLA/NETSCAPE support else if (document.sqlform.sql_query.selectionStart || document.sqlform.sql_query.selectionStart == "0") { @@ -1305,6 +1304,7 @@ function insertValueQuery() var SqlString = document.sqlform.sql_query.value; myQuery.value = SqlString.substring(0, startPos) + columnsList + SqlString.substring(endPos, SqlString.length); + myQuery.focus(); } else { myQuery.value += columnsList; } From 73ab7f380bc2db43a08919247ce1fe418d412d64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 30 Mar 2017 13:45:43 +0200 Subject: [PATCH 006/104] Allow to run setup on the demo server MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #13083 Signed-off-by: Michal Čihař --- doc/config.rst | 6 ++++++ setup/index.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/config.rst b/doc/config.rst index f647871d99..5efd346242 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -3214,6 +3214,12 @@ Developer Enable to let server present itself as demo server. This is used for `phpMyAdmin demo server `_. + It currently changes following behavior: + + * There is welcome message on the main page. + * There is footer information about demo server and used git revision. + * The setup script is enabled even with existing configuration. + .. _config-examples: Examples diff --git a/setup/index.php b/setup/index.php index 97d446251e..594716dcfe 100644 --- a/setup/index.php +++ b/setup/index.php @@ -12,7 +12,7 @@ */ require './lib/common.inc.php'; -if (file_exists(CONFIG_FILE)) { +if (file_exists(CONFIG_FILE) && ! $cfg['DBG']['demo']) { PMA_fatalError(__('Configuration already exists, setup is disabled!')); } From 8beb7f544e7895ab80a1a5104945e3def83314ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 30 Mar 2017 13:59:07 +0200 Subject: [PATCH 007/104] Fixed broken links in setup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #13133 Signed-off-by: Michal Čihař --- ChangeLog | 1 + setup/config.php | 2 +- setup/frames/index.inc.php | 9 +++------ setup/lib/form_processing.lib.php | 15 ++++++--------- 4 files changed, 11 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index c467291b99..81bc5b5d08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog 4.7.1 (not yet released) - issue #13132 Always execute tracking queries as controluser - issue #13125 Focus on SQL editor after inserting field name +- issue #13133 Fixed broken links in setup 4.7.0 (2017-03-28) - patch #12233 [Display] Improve message when renaming database to same name diff --git a/setup/config.php b/setup/config.php index 3bc5d56a58..b7fd61119d 100644 --- a/setup/config.php +++ b/setup/config.php @@ -45,6 +45,6 @@ if (PMA_ifSetOr($_POST['submit_clear'], '')) { // Show generated config file in a