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 / Release-3.2.3.md
Last active September 21, 2018 19:18
Releasing 3.2.3

Todo List for 3.2.3

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.3 and correct any unreadable descriptions
  • Check the feature hightlights wiki page for completeness
  • Branch of prep-release-3.2.3 from 3.2.x:
@marc1706
marc1706 / .htdev.diff
Created September 9, 2017 15:45
Fix website .htdev for local use
diff --git a/.htdev b/.htdev
index 3799b87..dc565db 100644
--- a/.htdev
+++ b/.htdev
@@ -7,17 +7,17 @@
# Including as mentioned above should work in almost every case.
# Include old .htdev
-Include /var/www/www.phpbb.com/htdocs/old/.htdev
+Include /var/www/website/.htdev
@marc1706
marc1706 / prosilver_changes_3.2.0_to_3.2.1-RC1.diff
Created June 27, 2017 20:22
diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg
index 7252820..2deceef 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
-phpbb_version = 3.2.0
@marc1706
marc1706 / prosilver_changes_3.1.10_to_3.1.11-RC1.diff
Created June 27, 2017 20:20
Style changes phpBB 3.1.10 to 3.1.11-RC1
diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg
index 300a831..019db11 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.10
-phpbb_version = 3.1.10
@marc1706
marc1706 / language_changes_3.2.0_to_3.2.1-RC1.diff
Created June 27, 2017 20:18
diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php
index 2026453..123c35a 100644
--- a/phpBB/language/en/acp/attachments.php
+++ b/phpBB/language/en/acp/attachments.php
@@ -119,7 +119,7 @@ $lang = array_merge($lang, array(
'MAX_EXTGROUP_FILESIZE' => 'Maximum file size',
'MAX_IMAGE_SIZE' => 'Maximum image dimensions',
'MAX_IMAGE_SIZE_EXPLAIN' => 'Maximum size of image attachments. Set both values to 0px by 0px to disable dimension checking.',
- 'MAX_THUMB_WIDTH' => 'Maximum thumbnail width in pixel',
+ 'MAX_THUMB_WIDTH' => 'Maximum thumbnail width/height in pixel',
@marc1706
marc1706 / language_changes_3.1.10_to_3.1.11-RC1.diff
Created June 27, 2017 20:14
diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php
index 7d3d93d..750f2f8 100644
--- a/phpBB/language/en/acp/attachments.php
+++ b/phpBB/language/en/acp/attachments.php
@@ -125,7 +125,7 @@ $lang = array_merge($lang, array(
'MAX_EXTGROUP_FILESIZE' => 'Maximum file size',
'MAX_IMAGE_SIZE' => 'Maximum image dimensions',
'MAX_IMAGE_SIZE_EXPLAIN' => 'Maximum size of image attachments. Set both values to 0px by 0px to disable dimension checking.',
- 'MAX_THUMB_WIDTH' => 'Maximum thumbnail width in pixel',
+ 'MAX_THUMB_WIDTH' => 'Maximum thumbnail width/height in pixel',
@marc1706
marc1706 / Releasing-3.2.1.md
Last active August 28, 2017 00:59
Release 3.2.1

Todo List for 3.2.1

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.1 and correct any unreadable descriptions
  • Check the feature hightlights wiki page for completeness
  • Branch of prep-release-3.2.1 from 3.2.x:
@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
@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 / 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.',