Skip to content

Instantly share code, notes, and snippets.

View marc1706's full-sized avatar

Marc Alexander marc1706

66 followers · 6 following
View GitHub Profile
@marc1706
marc1706 / language_changes_3.1.9_to_3.1.10-RC1.diff
Created September 24, 2016 19:22
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',
@marc1706
marc1706 / prosilver_changes_3.1.9_to_3.1.10-RC1.diff
Created September 24, 2016 19:25
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
@marc1706
marc1706 / Releasing 3.2.0-RC2.md
Last active December 9, 2016 23:38
Releasing 3.2.0-RC2

Todo List for 3.2.0-RC2

General

  • 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:
@marc1706
marc1706 / language_changes_3.2.0-RC1_to_3.2.0-RC2.diff
Created December 9, 2016 20:39
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',
@marc1706
marc1706 / prosilver_changes_3.2.0-RC1_to_3.2.0-RC2.diff
Created December 9, 2016 20:40
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
@marc1706
marc1706 / Releasing 3.1.11.md
Last active July 16, 2017 22:08
Releasing 3.1.11

Todo List for 3.1.11

General

  • 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:
@marc1706
marc1706 / Releasing 3.2.0.md
Last active September 30, 2018 19:21

Todo List for 3.2.0

General

  • 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:
@marc1706
marc1706 / language_changes_3.2.0-RC2_to_3.2.0.diff
Created January 7, 2017 15:35
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index e3d8e67..08290c9 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -350,6 +350,8 @@ $lang = array_merge($lang, array(
'COOKIE_DOMAIN' => 'Cookie domain',
'COOKIE_NAME' => 'Cookie name',
+ 'COOKIE_NOTICE' => 'Cookie notice',
+ 'COOKIE_NOTICE_EXPLAIN' => 'If enabled a cookie notice will be displayed to users when visiting your board. This might be required by law depending on the content of your board and enabled extensions.',
@marc1706
marc1706 / language_changes_3.1.10_to_3.2.0.diff
Created January 7, 2017 15:37
diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php
index 7d3d93d..2026453 100644
--- a/phpBB/language/en/acp/attachments.php
+++ b/phpBB/language/en/acp/attachments.php
@@ -70,9 +70,6 @@ $lang = array_merge($lang, array(
'CAT_FLASH_FILES' => 'Flash files',
'CAT_IMAGES' => 'Images',
- 'CAT_QUICKTIME_FILES' => 'Quicktime media files',
- 'CAT_RM_FILES' => 'RealMedia media files',
@marc1706
marc1706 / prosilver_changes_3.2.0-RC2_to_3.2.0.diff
Created January 7, 2017 15:38
diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg
index 6701ce5..7252820 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-RC2
-phpbb_version = 3.2.0-RC2