From 7e7b5936607423d85445d374ee7c830c0aefb2ba Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 26 Nov 2014 15:24:09 +0100
Subject: [PATCH 1/2] [ticket/361] Update copyright info in portal files

B3P-361
---
 composer.json                                      | 6 +++---
 styles/prosilver/template/portal/portal_body.html  | 2 +-
 styles/subsilver2/template/portal/portal_body.html | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 2fbe26fe8..a80b1da3a 100644
--- a/composer.json
+++ b/composer.json
@@ -3,8 +3,8 @@
 	"type": "phpbb-extension",
 	"description": "Adds a portal with several blocks to your forum. You can change the settings, move the blocks, add new blocks and more in the ACP.",
 	"homepage": "http://www.board3.de",
-	"version": "2.1.0-b1",
-	"time": "2014-08-24 14:02:18",
+	"version": "2.1.0-rc1",
+	"time": "2014-11-26 14:23:15",
 	"license": "GPL-2.0",
 	"authors": [{
 			"name": "Marc Alexander",
@@ -29,7 +29,7 @@
 	"extra": {
 		"display-name": "Board3 Portal",
 		"soft-require": {
-			"phpbb/phpbb": ">=3.1.0-RC3,<3.2.*@dev"
+			"phpbb/phpbb": ">=3.1.2,<3.2.*@dev"
 		},
 		"version-check": {
 			"host": "board3.de",
diff --git a/styles/prosilver/template/portal/portal_body.html b/styles/prosilver/template/portal/portal_body.html
index 8f848f660..2a5f7556b 100644
--- a/styles/prosilver/template/portal/portal_body.html
+++ b/styles/prosilver/template/portal/portal_body.html
@@ -110,7 +110,7 @@
 </div>
 
 <!--// board3 Portal by www.board3.de //-->
-<div class="copyright">Powered by <a href="http://www.board3.de/">Board3 Portal</a> &copy; 2009 - 2013 Board3 Group</div>
+<div class="copyright">Powered by <a href="http://www.board3.de/">Board3 Portal</a> &copy; 2009 - 2014 Board3 Group</div>
 
 <!-- INCLUDEJS portal/assets/jquery.getscrollbarwidth.js -->
 <!-- INCLUDEJS portal/assets/portal.js -->
diff --git a/styles/subsilver2/template/portal/portal_body.html b/styles/subsilver2/template/portal/portal_body.html
index fcee549ba..949b3b25b 100644
--- a/styles/subsilver2/template/portal/portal_body.html
+++ b/styles/subsilver2/template/portal/portal_body.html
@@ -114,6 +114,6 @@
 <!--// board3 Portal by www.board3.de //-->
 		<!-- please keep this credits visible, thank you! -->
 		<br />
-		<div class="copyright" align="center">Powered by <a href="http://www.board3.de/">Board3 Portal</a> &copy; 2009 - 2011 Board3 Group</div>
+		<div class="copyright" align="center">Powered by <a href="http://www.board3.de/">Board3 Portal</a> &copy; 2009 - 2014 Board3 Group</div>
 		<br />
 <!-- INCLUDE overall_footer.html -->
\ No newline at end of file

From eb152add05b8e26947083e1c17a2fac0adfac89c Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 26 Nov 2014 15:33:57 +0100
Subject: [PATCH 2/2] [ticket/361] Update files to ignore on export

B3P-361
---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 2d8a464ae..10038ac34 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -10,3 +10,5 @@ git-tools/	export-ignore
 .coveralls.yml	export-ignore
 composer.phar	export-ignore
 composer.lock	export-ignore
+portal/upload/	export-ignore
+includes/functions_upload.php	export-ignore