From 3085e8f4ab7cd69b91e322d2edc4dc2b5aedd9f9 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 20 Sep 2014 06:40:29 -0400 Subject: [PATCH 1/4] 4.2.8.1 release Signed-off-by: Marc Delisle --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 85abf9bed2..8777086cd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,7 +10,7 @@ phpMyAdmin - ChangeLog - bug ajax.js responseHandler: another "cannot read property" - bug tbl_structure.js "cannot read property" -4.2.8.1 (not yet released) +4.2.8.1 (2014-09-13) - bug #4530 [security] DOM based XSS that results to a CSRF that creates a ROOT account in certain conditions From 9cd65f3db52381b01f051dfcd947a0499df53baa Mon Sep 17 00:00:00 2001 From: Kyeong Su Shin Date: Sat, 20 Sep 2014 06:59:14 +0200 Subject: [PATCH 2/4] Translated using Weblate (Korean) Currently translated at 84.6% (2343 of 2768) [ci skip] --- po/ko.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ko.po b/po/ko.po index 1db989e907..60e95015b7 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-07-08 07:11-0400\n" -"PO-Revision-Date: 2014-09-14 21:06+0200\n" +"PO-Revision-Date: 2014-09-20 06:59+0200\n" "Last-Translator: Kyeong Su Shin \n" "Language-Team: Korean \n" "Language: ko\n" @@ -6753,7 +6753,7 @@ msgstr "OpenDocument 형식" #: libraries/core.lib.php:287 #, php-format msgid "The %s extension is missing. Please check your PHP configuration." -msgstr "" +msgstr "%s 확장기능이 설치되지 않았습니다. PHP의 설정을 확인하십시오." #: libraries/core.lib.php:450 msgid "possible deep recursion attack" From ab9036fa605104d47d50af30989f72b12a110f79 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 20 Sep 2014 06:48:10 -0400 Subject: [PATCH 3/4] 4.2.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 8777086cd5..1496589790 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,9 @@ phpMyAdmin - ChangeLog ====================== -4.2.9.0 (not yet released) +4.2.10.0 (not yet released) + +4.2.9.0 (2014-09-20) - bug ajax.js responseHandler: cannot read property of null - bug sql.js: str is undefined - bug #4524 Allow for direct selection of "0" on the "user overview" page diff --git a/README b/README index f046f8172c..16267d601f 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.2.9-dev +Version 4.2.10-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index af38824237..b308f0078f 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.2.9-dev' +version = '4.2.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 aafa795c7f..6976cf42b2 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.2.9-dev'); + $this->set('PMA_VERSION', '4.2.10-dev'); /** * @deprecated */ From 3b8d16e88c47724ab99dae061f1e33cd568fc7b6 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 20 Sep 2014 06:53:07 -0400 Subject: [PATCH 4/4] 4.2.10-dev Signed-off-by: Marc Delisle --- ChangeLog | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a0a615603d..f5a5762801 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,7 +43,9 @@ phpMyAdmin - ChangeLog + rfe #1529 Avoid session timeout when user is active - bug #4528 Can't import dump via SQL field -4.2.9.0 (not yet released) +4.2.10.0 (not yet released) + +4.2.9.0 (2014-09-20) - bug ajax.js responseHandler: cannot read property of null - bug sql.js: str is undefined - bug #4524 Allow for direct selection of "0" on the "user overview" page @@ -52,7 +54,7 @@ phpMyAdmin - ChangeLog - bug ajax.js responseHandler: another "cannot read property" - bug tbl_structure.js "cannot read property" -4.2.8.1 (not yet released) +4.2.8.1 (2014-09-13) - bug #4530 [security] DOM based XSS that results to a CSRF that creates a ROOT account in certain conditions