init of nigtrogen

diff --git a/CHANGELOG b/CHANGELOG
index 6aad23cb98159f38a4c36f70551fdce06b8d833f..5053bfed39cdb2b7925e75cf9c9da7805a699a33 100644 (file)
--- 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 4ed135d7a5319c3cddd204d2d913fd6ceead01dd..56e32513f22a1cc1924f8201e52a6849fb3deffc 100644 (file)
--- 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 856bb47eb18196b22a123a5ff31e6dd4f68b6af5..b624570a0b11d9c0710575d57cb34ede99c2459f 100644 (file)
--- 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 81aa6ab5fb7c2450c2c0df85dfa4cd453ee3c768..f3408995dbe81edb7768d2ab21948442a4c1d739 100644 (file)
--- 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