From: Johannes Keßler <johannes.kessler@bechtle.com>
Date: Tue, 1 Dec 2020 09:21:51 +0000 (+0100)
Subject: init of nigtrogen
X-Git-Tag: v1.3~1^2~1
X-Git-Url: http://91.132.146.200/gitweb/?a=commitdiff_plain;h=62a99d28447e5c86f337e6ee2119e47638cfac4f;p=selfpaste.git

init of nigtrogen
---

diff --git a/CHANGELOG b/CHANGELOG
index 6aad23c..5053bfe 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,8 @@
-202008xx version 1.2 Carbon
+20200814 version 1.3 Nitrogen
+* Added new default allowed file types
+* Cleanups
+
+20200814 version 1.2 Carbon
 * Cleanup version only. No new fetures
 
 20200530 version 1.1 Boron
diff --git a/VERSION b/VERSION
index 4ed135d..56e3251 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2 Carbon
+1.3 Nitrogen
diff --git a/client/webclient/config.default.php b/client/webclient/config.default.php
index 856bb47..b624570 100644
--- a/client/webclient/config.default.php
+++ b/client/webclient/config.default.php
@@ -18,7 +18,7 @@
 define('FRONTEND_USERNAME','some');
 /* please provide a unique password for this installation */
 define('FRONTEND_PASSWORD', 'admin');
-/* please provide a unique secret for this installation and add this to the allowed ones*/
+/* please provide a unique secret for this installation and add this to the allowed of your selfpase installation ones*/
 define('THE_SECRET','your super duper secret');
 /* the selfpaste installation endpoint url. Absolute or relative */
 define('THE_ENDPOINT','http://www.some.tld/path/to/selfpaste/index.php');
diff --git a/webroot/config.default.php b/webroot/config.default.php
index 81aa6ab..f340899 100644
--- a/webroot/config.default.php
+++ b/webroot/config.default.php
@@ -26,7 +26,7 @@ define('LOG_CREATION',true);
 define('SELFPASTE_UPLOAD_DIR','pasties');
 # those are the allowed file types.
 # Make sure you read the README and documentation!
-define('SELFPASTE_ALLOWED_FILETYPES','text/plain,text/comma-separated-values,text/css,text/xml,text/x-php,text/x-perl,text/x-shellscript,text/html,text/javascript,text/c-x');
+define('SELFPASTE_ALLOWED_FILETYPES','text/plain,text/comma-separated-values,text/css,text/xml,text/x-php,text/x-perl,text/x-shellscript,text/html,text/javascript,text/c-x,text/x-makefile');
 # this is your domain and path on which selfpaste is accessible
 # needed to respond with the correct link for your paste
 # please NO / at the end