From 6da64cc3b2ba4439574f914f51e161645375be96 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 3 May 2013 08:12:31 -0400 Subject: [PATCH 1/2] 4.0.0 release --- ChangeLog | 4 +--- README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 89d1f5891d..b37eb178fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ====================== -4.0.0.0 (not yet released) +4.0.0.0 (2013-05-03) + Patch #3481047 for rfe #3480477 Insert as new row enhancement + Patch #3480999 Activate codemirror in the query window - Patch #3495284 XML Import - fix message and redirect @@ -114,8 +114,6 @@ underscore (see PMASA-2013-5) - bug #3892 [export] SQL Export files are empty -3.5.9.0 (not yet released) - 3.5.8.1 (2013-04-24) - [security] Remote code execution (preg_replace), reported by Janek Vind (see PMASA-2013-2) diff --git a/README b/README index 83617e5dcd..4599062d1d 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.0.0-rc4 +Version 4.0.0 A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index 60adfe1bb4..33baf0a86b 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -49,7 +49,7 @@ copyright = u'2012 - 2013, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.0.0-rc4' +version = '4.0.0' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 89643b20b6..bd2fcf4800 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -101,7 +101,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '4.0.0-rc4'); + $this->set('PMA_VERSION', '4.0.0'); /** * @deprecated */ From 360878b6a99dc419c9c2e40ec77bb2922e47d17a Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 3 May 2013 08:13:50 -0400 Subject: [PATCH 2/2] Fix merge conflict --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 48c65277e2..d222ea0b52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,7 +15,7 @@ phpMyAdmin - ChangeLog - bug #3901 Setup script warning for config auth (stored login data) shows link BBcode - bug #3895 [browse] Fixed getting BLOB data -4.0.0.0 (not yet released) +4.0.0.0 (2013-05-03) + Patch #3481047 for rfe #3480477 Insert as new row enhancement + Patch #3480999 Activate codemirror in the query window - Patch #3495284 XML Import - fix message and redirect