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 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 @@ -