From def4b9f49203125b614e19c0625e77f8f1171083 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 7 Aug 2015 08:01:22 -0400 Subject: [PATCH 1/4] Missing global declaration Signed-off-by: Marc Delisle --- libraries/mult_submits.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 6ab8c1021a..92769ab57d 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -41,7 +41,7 @@ foreach ($request_params as $one_request_param) { global $db, $table, $clause_is_unique, $from_prefix, $goto, $mult_btn, $original_sql_query, $query_type, $reload, $selected, $selected_fld, $selected_recent_table, $sql_query, - $submit_mult, $table_type, $to_prefix, $url_query; + $submit_mult, $table_type, $to_prefix, $url_query, $pmaThemeImage; /** * Prepares the work and runs some other scripts if required From 03753cacf7a2e1b2772c5cb337fea4313be24696 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 7 Aug 2015 09:25:40 -0400 Subject: [PATCH 2/4] 4.4.14-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 ed346040ad..73b5267fe4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,9 @@ phpMyAdmin - ChangeLog ====================== -4.4.13.0 (not yet released) +4.4.14.0 (not yet released) + +4.4.13.0 (2015-08-07) - issue #1808 "Improve table structure" generates invalid SQL - issue Once checked "Show only active" checkbox is always checked - issue #1813 Delete rows using "Check All" is broken diff --git a/README b/README index 38925cfea0..1f1820ca28 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.4.13-dev +Version 4.4.14-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index 14e24b02fd..38b306604a 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.4.13-dev' +version = '4.4.14-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index bb901608c5..b9927e270d 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.4.13-dev'); + $this->set('PMA_VERSION', '4.4.14-dev'); /** * @deprecated */ From 981abb95f65673b963f8063b6c47fc27ae26fd97 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 7 Aug 2015 09:27:28 -0400 Subject: [PATCH 3/4] 4.4.14 release date Signed-off-by: Marc Delisle --- ChangeLog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 120dfde8f0..d2bb323690 100644 --- a/ChangeLog +++ b/ChangeLog @@ -88,7 +88,9 @@ phpMyAdmin - ChangeLog + issue #6102 Add SHA256 security password support - issue #10250 Displayed git revision info is not set -4.4.13.0 (not yet released) +4.4.14.0 (not yet released) + +4.4.13.0 (2015-08-07) - issue #1808 "Improve table structure" generates invalid SQL - issue Once checked "Show only active" checkbox is always checked - issue #1813 Delete rows using "Check All" is broken From c15a5da663cb403d219e34cee18a08b71f6792ab Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 7 Aug 2015 10:04:02 -0400 Subject: [PATCH 4/4] Adjust releasing tasks Signed-off-by: Marc Delisle --- scripts/create-release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 59d3f43e20..1e1f78e70a 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -309,9 +309,9 @@ Todo now: - in doc/conf.py (if it exists) the line " version = '2.7.1-dev' " - 7. add a milestone for this new version in the bugs tickets, at https://sourceforge.net/p/phpmyadmin/bugs/milestones and set it to the default one + 7. on https://github.com/phpmyadmin/phpmyadmin/milestones close the milestone corresponding to the released version and open a new one for the next minor release - 8. tweet from @phpmya a link to the release notes (see item 5 above); your account should be added to TweetDeck to ease this posting + 8. if a maintenance version was released, delete the branch corresponding to the previous one; for example git push origin --delete MAINT_4_4_12 9. for a stable version, update demo/php/versions.ini in the scripts repository so that the demo server shows current versions