From f9116b514cfbec3f95c56a769e76184abf8f08ba Mon Sep 17 00:00:00 2001 From: Nisarg Jhaveri Date: Mon, 2 Feb 2015 23:19:06 +0530 Subject: [PATCH 1/5] Remove unnecessary calculation, fix coding style - Remove unnecessary calculation - Remove trailing spaces in `navigation.js` Signed-off-by: Nisarg Jhaveri --- js/navigation.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/js/navigation.js b/js/navigation.js index 0a6c575b84..4a212d7ec7 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -165,7 +165,7 @@ $(function () { $icon.attr('src', icon_reload_src); }, 1000); }); - + $(document).on("change", '#navi_db_select', function (event) { $(this).closest('form').trigger('submit'); }); @@ -1111,8 +1111,7 @@ var ResizeHandler = function () { }); } // Set content bottom space beacuse of console - $('body').css('margin-bottom', - $(window).height() + $(document).scrollTop() - $('#pma_console').offset().top + 'px'); + $('body').css('margin-bottom', $('#pma_console').height() + 'px'); }; /* Initialisation section begins here */ if ($.cookie('pma_navi_width')) { From f7ac0a8e05b5d498fb43bbda438cfc2a555d3d57 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 5 Feb 2015 08:46:27 -0500 Subject: [PATCH 2/5] Fix typo Signed-off-by: Marc Delisle --- doc/setup.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/setup.rst b/doc/setup.rst index bfd001c102..3bd4b7536a 100644 --- a/doc/setup.rst +++ b/doc/setup.rst @@ -270,7 +270,7 @@ configured. This is called “Zero Configuration” mode and can be particularly useful in shared hosting situations. “Zeroconf” mode is on by default, to disable set :config:option:`$cfg['ZeroConf']` to false. -The following three scenarios are convered by the Zero Configuration mode: +The following three scenarios are covered by the Zero Configuration mode: * When entering a database where the configuration storage tables are not present, phpMyAdmin offers to create them from the Operations tab. From 8fdacd980b684563ff0f1f2a94cb137100fc8478 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 5 Feb 2015 12:47:54 -0500 Subject: [PATCH 3/5] 4.3.10-dev Signed-off-by: Marc Delisle --- ChangeLog | 4 +++- README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e0a5bfa96..c29172d0d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,9 @@ phpMyAdmin - ChangeLog ====================== -4.3.9.0 (not yet released) +4.3.10.0 (not yet released) + +4.3.9.0 (2015-02-05) - bug #4728 Incorrect headings in routine editor - bug #4730 Notice while browsing tables when phpmyadmin pma database exists, but not all the tables - bug #4729 Display original field when using "Relational display column" option and display column is empty diff --git a/README b/README index 8bf1b34311..e787ebad11 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.3.9-dev +Version 4.3.10-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index 40647f53bc..a4a2ebf4dd 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.3.9-dev' +version = '4.3.10-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 238504b480..2753833097 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -114,7 +114,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '4.3.9-dev'); + $this->set('PMA_VERSION', '4.3.10-dev'); /** * @deprecated */ From 9e9ed008dcfc97c6137d4ba267cd42389e64365d Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 5 Feb 2015 12:49:15 -0500 Subject: [PATCH 4/5] 4.3.9 release Signed-off-by: Marc Delisle --- ChangeLog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ff77e6fb7b..1fa90f7a4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,7 +34,9 @@ phpMyAdmin - ChangeLog - bug Fix isCanvasSupported for new window + rfe #1600 Clarify the "Inline" link -4.3.9.0 (not yet released) +4.3.10.0 (not yet released) + +4.3.9.0 (2015-02-05) - bug #4728 Incorrect headings in routine editor - bug #4730 Notice while browsing tables when phpmyadmin pma database exists, but not all the tables - bug #4729 Display original field when using "Relational display column" option and display column is empty From 6b0eea8ce0c03034647458c1a3e0b137dd5f6b50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=A0=CE=B1=CE=BD=CE=B1=CE=B3=CE=B9=CF=8E=CF=84=CE=B7?= =?UTF-8?q?=CF=82=20=CE=A0=CE=B1=CF=80=CE=AC=CE=B6=CE=BF=CE=B3=CE=BB=CE=BF?= =?UTF-8?q?=CF=85?= Date: Thu, 5 Feb 2015 21:05:29 +0100 Subject: [PATCH 5/5] Translated using Weblate (Greek) Currently translated at 100.0% (3009 of 3009 strings) [CI skip] --- po/el.po | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/po/el.po b/po/el.po index dd69de0492..37c177c2ee 100644 --- a/po/el.po +++ b/po/el.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-02-04 11:31-0500\n" -"PO-Revision-Date: 2015-01-29 11:51+0200\n" +"PO-Revision-Date: 2015-02-05 21:05+0200\n" "Last-Translator: Παναγιώτης Παπάζογλου \n" -"Language-Team: Greek \n" +"Language-Team: Greek " +"\n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -850,7 +850,6 @@ msgstr "" "αποτελέσματα." #: index.php:488 -#, fuzzy #| msgid "" #| "Your PHP parameter [a@http://php.net/manual/en/session.configuration." #| "php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower " @@ -862,10 +861,11 @@ msgid "" "cookie validity configured in phpMyAdmin, because of this, your login might " "expire sooner than configured in phpMyAdmin." msgstr "" -"Η παράμετρος PHP [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] είναι μικρότερη από " -"την ρυθμισμένη εγκυρότητα cookie στο phpMyAdmin. Εξαιτίας αυτού, η σύνδεσή " -"σας θα λήξει νωρίτερα από ό,τι ρυθμίστηκε στο phpMyAdmin." +"Η παράμετρος PHP " +"[a@http://php.net/manual/en/session.configuration.php#ini.session.gc-" +"maxlifetime@_blank]session.gc_maxlifetime[/a] είναι μικρότερη από την " +"ρυθμισμένη εγκυρότητα cookie στο phpMyAdmin. Εξαιτίας αυτού, η σύνδεσή σας " +"ίσως λήξει νωρίτερα από ό,τι ρυθμίστηκε στο phpMyAdmin." #: index.php:501 msgid "" @@ -4575,11 +4575,10 @@ msgid "Create PHP Code" msgstr "Δημιουργία κώδικα PHP" #: libraries/Util.class.php:1275 -#, fuzzy #| msgid "Edit index" msgctxt "Inline edit query" msgid "Edit inline" -msgstr "Εεπεξεργασία ευρετηρίου" +msgstr "Επεξεργασία εσωτερικά" #. l10n: Short week day name #: libraries/Util.class.php:1580 @@ -7374,7 +7373,6 @@ msgid "Suhosin warning" msgstr "προειδοποίηση Suhosin" #: libraries/config/messages.inc.php:757 -#, fuzzy #| msgid "" #| "Disable the default warning that is displayed on the Structure page if " #| "column names in a table are reserved MySQL words." @@ -7382,14 +7380,14 @@ msgid "" "Disable the default warning that is displayed on the main page if session." "gc_maxlifetime is less than `LoginCookieValidity`." msgstr "" -"Απενεργοποiήστε την προεπιλεγμένη προειδοποίηση που εμφανίζεται στη σελίδα " -"Δομής, αν τα ονόματα στηλών είναι δεσμευμένες λέξεις της MySQL." +"Απενεργοποiήστε την προεπιλεγμένη προειδοποίηση που εμφανίζεται στη βασική " +"σελίδα αν το session.gc_maxlifetime είναι λιγότερο από το " +"«LoginCookieValidity»." #: libraries/config/messages.inc.php:758 -#, fuzzy #| msgid "Login cookie validity" msgid "Login cookie validity warning" -msgstr "Εγκυρότητα cookie σύνδεσης" +msgstr "Προειδοποίηση εγκυρότητας cookie σύνδεσης" #: libraries/config/messages.inc.php:759 msgid "" @@ -10593,10 +10591,9 @@ msgstr "" "ένας τίτλος για τον σύνδεσμο." #: libraries/plugins/transformations/output/Text_Plain_Json.class.php:38 -#, fuzzy #| msgid "Formats text as SQL query with syntax highlighting." msgid "Formats text as JSON with syntax highlighting." -msgstr "Μορφοποιεί το κείμενο ως ερώτημα SQL με συντακτική επισήμανση." +msgstr "Μορφοποιεί το κείμενο ως JSON με επισήμανση της σύνταξης." #: libraries/pmd_common.php:492 msgid "Error: relation already exists." @@ -13817,10 +13814,9 @@ msgid "Storage Engine:" msgstr "Μηχανή αποθήκευσης:" #: libraries/tbl_columns_definition_form.lib.php:81 -#, fuzzy #| msgid "Connections" msgid "Connection:" -msgstr "Συνδέσεις" +msgstr "Σύνδεση:" #: libraries/tbl_columns_definition_form.lib.php:127 msgid "PARTITION definition:"