- Make sure
phpBB/docs/CREDTIS.txt
is up to date - Make sure Contributors have their ranks
- Make sure all reports in the security tracker are closed or invalid
- Go through Issues fixed in 3.2.0 and correct any unreadable descriptions
- Check the feature hightlights wiki page for completeness
- Branch of
prep-release-3.2.0
from 3.2.x:
- Make sure
phpBB/docs/CREDTIS.txt
is up to date: phpbb/phpbb#4451 - Make sure Contributors have their ranks
- Make sure all reports in the security tracker are closed or invalid
- Go through Issues fixed in 3.1.11 and correct any unreadable descriptions
- Check the feature hightlights wiki page for completeness
- Branch of
prep-release-3.1.11
from 3.1.x:
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg | |
index 895ee49..6701ce5 100644 | |
--- a/phpBB/styles/prosilver/style.cfg | |
+++ b/phpBB/styles/prosilver/style.cfg | |
@@ -21,8 +21,8 @@ | |
# General Information about this style | |
name = prosilver | |
copyright = © phpBB Limited, 2007 | |
-style_version = 3.2.0-RC1 | |
-phpbb_version = 3.2.0-RC1 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php | |
index 5ff904f..2026453 100644 | |
--- a/phpBB/language/en/acp/attachments.php | |
+++ b/phpBB/language/en/acp/attachments.php | |
@@ -111,7 +111,7 @@ $lang = array_merge($lang, array( | |
'IMAGE_LINK_SIZE' => 'Image link dimensions', | |
'IMAGE_LINK_SIZE_EXPLAIN' => 'Display image attachment as an inline text link if image is larger than this. To disable this behaviour, set the values to 0px by 0px.', | |
- 'IMAGICK_PATH' => 'Imagemagick path', | |
+ 'IMAGICK_PATH' => 'ImageMagick path', |
- Make sure
phpBB/docs/CREDTIS.txt
is up to date - Make sure Contributors have their ranks
- Make sure all reports in the security tracker are closed or invalid
- Go through Issues fixed in 3.2.0-RC2 and correct any unreadable descriptions
- Check the feature hightlights wiki page for completeness
- Branch of
prep-release-3.2.0-RC2
from 3.2.x:
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg | |
index ed1790f..300a831 100644 | |
--- a/phpBB/styles/prosilver/style.cfg | |
+++ b/phpBB/styles/prosilver/style.cfg | |
@@ -21,8 +21,8 @@ | |
# General Information about this style | |
name = prosilver | |
copyright = © phpBB Limited, 2007 | |
-style_version = 3.1.9 | |
-phpbb_version = 3.1.9 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php | |
index cf2f0a4..7d3d93d 100644 | |
--- a/phpBB/language/en/acp/attachments.php | |
+++ b/phpBB/language/en/acp/attachments.php | |
@@ -117,7 +117,7 @@ $lang = array_merge($lang, array( | |
'IMAGE_LINK_SIZE' => 'Image link dimensions', | |
'IMAGE_LINK_SIZE_EXPLAIN' => 'Display image attachment as an inline text link if image is larger than this. To disable this behaviour, set the values to 0px by 0px.', | |
- 'IMAGICK_PATH' => 'Imagemagick path', | |
+ 'IMAGICK_PATH' => 'ImageMagick path', |
- Make sure
phpBB/docs/CREDTIS.txt
is up to date: phpbb/phpbb#4451 - Make sure Contributors have their ranks
- Make sure all reports in the security tracker are closed or invalid
- Go through Issues fixed in 3.1.10 and correct any unreadable descriptions
- Check the feature hightlights wiki page for completeness
- Branch of
prep-release-3.1.10
from 3.1.x:
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash | |
set -e | |
PR=$1 | |
git checkout 3.2.x && git fetch upstream && git fetch origin && git reset --hard upstream/3.2.x && hub merge $1 && git push origin 3.2.x | |
git checkout 3.3.x && git reset --hard upstream/3.3.x && git merge --no-ff --no-edit 3.2.x && git push origin 3.3.x | |
git checkout master && git reset --hard upstream/master && git merge --no-ff --no-edit 3.3.x && git push origin master |
##Find everything enclosed in tags
<primaryAddress>[\s\S]*?<\/primaryAddress>
Use i Modifier for finding across lines!