incrementing versionrelease-1.4

32 files changed, 38 insertions, 37 deletions

diff --git a/INSTALL.md b/INSTALL.md
index ecdbb2dc..615ce56e 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -205,7 +205,7 @@ CREATE INDEX parent ON prefix_comment(pasteid);
 CREATE TABLE prefix_config (
 id CHAR(16) NOT NULL, value TEXT, PRIMARY KEY (id)
 );
-INSERT INTO prefix_config VALUES('VERSION', '1.3.5');
+INSERT INTO prefix_config VALUES('VERSION', '1.4.0');
 ```
 
 In **PostgreSQL**, the `data`, `attachment`, `nickname` and `vizhash` columns
diff --git a/Makefile b/Makefile
index 83a6b6de..33d893fd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 .PHONY: all coverage coverage-js coverage-php doc doc-js doc-php increment sign test test-js test-php help
 
-CURRENT_VERSION = 1.3.5
-VERSION ?= 1.3.6
+CURRENT_VERSION = 1.4.0
+VERSION ?= 1.4.1
 VERSION_FILES = index.php cfg/ *.md css/ i18n/ img/ js/package.json js/privatebin.js lib/ Makefile tpl/ tst/
 REGEX_CURRENT_VERSION := $(shell echo $(CURRENT_VERSION) | sed "s/\./\\\./g")
 REGEX_VERSION := $(shell echo $(VERSION) | sed "s/\./\\\./g")
@@ -33,12 +33,13 @@ increment: ## Increment and commit new version number, set target version using
 do \
 sed -i "s/$(REGEX_CURRENT_VERSION)/$(REGEX_VERSION)/g" $$F; \
 done
-	git add $(VERSION_FILES)
+	cd tst && phpunit --no-coverage && cd ..
+	git add $(VERSION_FILES) tpl/
 git commit -m "incrementing version"
 
 sign: ## Sign a release.
 git tag $(VERSION)
-	git push --tags
+	git push origin $(VERSION)
 signrelease.sh
 
 test: test-js test-php ## Run all unit tests.
diff --git a/README.md b/README.md
index b89dbd79..5ee04954 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # [![PrivateBin](https://cdn.rawgit.com/PrivateBin/assets/master/images/preview/logoSmall.png)](https://privatebin.info/)
 
-*Current version: 1.3.5*
+*Current version: 1.4.0*
 
 **PrivateBin** is a minimalist, open source online
 [pastebin](https://en.wikipedia.org/wiki/Pastebin)
diff --git a/SECURITY.md b/SECURITY.md
index e00398b9..1ed1abb5 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -4,8 +4,8 @@
 
 | Version | Supported |
 | ------- | ------------------ |
-| 1.3.5 | :heavy_check_mark: |
-| < 1.3.5 | :x: |
+| 1.4.0 | :heavy_check_mark: |
+| < 1.4.0 | :x: |
 
 ## Reporting a Vulnerability
 
diff --git a/css/bootstrap/privatebin.css b/css/bootstrap/privatebin.css
index de8b6797..b026d011 100644
--- a/css/bootstrap/privatebin.css
+++ b/css/bootstrap/privatebin.css
@@ -6,7 +6,7 @@
 * @link https://github.com/PrivateBin/PrivateBin
 * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
 * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.3.5
+ * @version 1.4.0
 */
 
 body {
diff --git a/css/noscript.css b/css/noscript.css
index f42e419f..b07ba820 100644
--- a/css/noscript.css
+++ b/css/noscript.css
@@ -6,7 +6,7 @@
 * @link https://github.com/PrivateBin/PrivateBin
 * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
 * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.3.5
+ * @version 1.4.0
 */
 
 /* When there is no script at all other */
diff --git a/css/privatebin.css b/css/privatebin.css
index f852d396..38e44240 100644
--- a/css/privatebin.css
+++ b/css/privatebin.css
@@ -6,7 +6,7 @@
 * @link https://github.com/PrivateBin/PrivateBin
 * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
 * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.3.5
+ * @version 1.4.0
 */
 
 /* CSS Reset from YUI 3.4.1 (build 4118) - Copyright 2011 Yahoo! Inc. All rights reserved.
diff --git a/index.php b/index.php
index f846adb7..382cc84a 100644
--- a/index.php
+++ b/index.php
@@ -7,7 +7,7 @@
 * @link https://github.com/PrivateBin/PrivateBin
 * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
 * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.3.5
+ * @version 1.4.0
 */
 
 // change this, if your php files and data is outside of your webservers document root
diff --git a/js/package.json b/js/package.json
index 53e85dc3..42044b10 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
 "name": "privatebin",
- "version": "1.3.5",
+ "version": "1.4.0",
 "description": "PrivateBin is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted in the browser using 256 bit AES in Galois Counter mode (GCM).",
 "main": "privatebin.js",
 "directories": {
diff --git a/js/privatebin.js b/js/privatebin.js
index 21ba5438..21d94e1c 100644
--- a/js/privatebin.js
+++ b/js/privatebin.js
@@ -6,7 +6,7 @@
 * @see {@link https://github.com/PrivateBin/PrivateBin}
 * @copyright 2012 Sébastien SAUVAGE ({@link http://sebsauvage.net})
 * @license {@link https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License}
- * @version 1.3.5
+ * @version 1.4.0
 * @name PrivateBin
 * @namespace
 */
diff --git a/lib/Configuration.php b/lib/Configuration.php
index de065219..56e55adb 100644
--- a/lib/Configuration.php
+++ b/lib/Configuration.php
@@ -7,7 +7,7 @@
 * @link https://github.com/PrivateBin/PrivateBin
 * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
 * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.3.5
+ * @version 1.4.0
 */
 
 namespace PrivateBin;
diff --git a/lib/Controller.php b/lib/Controller.php
index 34087957..d16a8cac 100644
--- a/lib/Controller.php
+++ b/lib/Controller.php
@@ -7,7 +7,7 @@
 * @link https://github.com/PrivateBin/PrivateBin
 * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
 * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.3.5
+ * @version 1.4.0
 */
 
 namespace PrivateBin;
@@ -28,7 +28,7 @@ class Controller
 *
 * @const string
 */
- const VERSION = '1.3.5';
+ const VERSION = '1.4.0';
 
 /**
 * minimal required PHP version
diff --git a/lib/Data/AbstractData.php b/lib/Data/AbstractData.php
index 591b91fd..05353ce0 100644
--- a/lib/Data/AbstractData.php
+++ b/lib/Data/AbstractData.php
@@ -7,7 +7,7 @@
 * @link https://github.com/PrivateBin/PrivateBin
 * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
 * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.3.5
+ * @version 1.4.0
 */
 
 namespace PrivateBin\Data;
diff --git a/lib/Data/Database.php b/lib/Data/Database.php
index 03e60612..4b29fe2f 100644
--- a/lib/Data/Database.php
+++ b/lib/Data/Database.php
@@ -7,7 +7,7 @@
 * @link https://github.com/PrivateBin/PrivateBin
 * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
 * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.3.5
+ * @version 1.4.0
 */
 
 namespace PrivateBin\Data;
diff --git a/lib/Data/Filesystem.php b/lib/Data/Filesystem.php
index 577ad34f..b2bc1eed 100644
--- a/lib/Data/Filesystem.php
+++ b/lib/Data/Filesystem.php
@@ -7,7 +7,7 @@
 * @link https://github.com/PrivateBin/PrivateBin
 * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
 * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.3.5
+ * @version 1.4.0
 */
 
 namespace PrivateBin\Data;
diff --git a/lib/Filter.php b/lib/Filter.php
index 0ad87d3c..f8672a0f 100644
--- a/lib/Filter.php
+++ b/lib/Filter.php
@@ -7,7 +7,7 @@
 * @link https://github.com/PrivateBin/PrivateBin
 * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
 * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.3.5
+ * @version 1.4.0
 */
 
 namespace PrivateBin;
diff --git a/lib/FormatV2.php b/lib/FormatV2.php
index d2055f31..4d8d43d9 100644
--- a/lib/FormatV2.php
+++ b/lib/FormatV2.php
@@ -7,7 +7,7 @@
 * @link https://github.com/PrivateBin/PrivateBin
 * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
 * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.3.5
+ * @version 1.4.0
 */
 
 namespace PrivateBin;
diff --git a/lib/I18n.php b/lib/I18n.php
index 7b64655e..38464dea 100644
--- a/lib/I18n.php
+++ b/lib/I18n.php
@@ -7,7 +7,7 @@
 * @link https://github.com/PrivateBin/PrivateBin
 * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
 * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.3.5
+ * @version 1.4.0
 */
 
 namespace PrivateBin;
diff --git a/lib/Json.php b/lib/Json.php
index 5f4efcf3..13cd6157 100644
--- a/lib/Json.php
+++ b/lib/Json.php
@@ -7,7 +7,7 @@
 * @link https://github.com/PrivateBin/PrivateBin
 * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
 * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.3.5
+ * @version 1.4.0
 */
 
 namespace PrivateBin;
diff --git a/lib/Model.php b/lib/Model.php
index 8aebd794..360cf68c 100644
--- a/lib/Model.php
+++ b/lib/Model.php
@@ -7,7 +7,7 @@
 * @link https://github.com/PrivateBin/PrivateBin
 * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
 * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.3.5
+ * @version 1.4.0
 */
 
 namespace PrivateBin;
diff --git a/lib/Model/AbstractModel.php b/lib/Model/AbstractModel.php
index f2ab1daa..a21134ce 100644
--- a/lib/Model/AbstractModel.php
+++ b/lib/Model/AbstractModel.php
@@ -7,7 +7,7 @@
 * @link https://github.com/PrivateBin/PrivateBin
 * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
 * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.3.5
+ * @version 1.4.0
 */
 
 namespace PrivateBin\Model;
diff --git a/lib/Model/Comment.php b/lib/Model/Comment.php
index 4b3fc828..f9f45507 100644
--- a/lib/Model/Comment.php
+++ b/lib/Model/Comment.php
@@ -7,7 +7,7 @@
 * @link https://github.com/PrivateBin/PrivateBin
 * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
 * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.3.5
+ * @version 1.4.0
 */
 
 namespace PrivateBin\Model;
diff --git a/lib/Model/Paste.php b/lib/Model/Paste.php
index b855e6d5..ea9355aa 100644
--- a/lib/Model/Paste.php
+++ b/lib/Model/Paste.php
@@ -7,7 +7,7 @@
 * @link https://github.com/PrivateBin/PrivateBin
 * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
 * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.3.5
+ * @version 1.4.0
 */
 
 namespace PrivateBin\Model;
diff --git a/lib/Persistence/AbstractPersistence.php b/lib/Persistence/AbstractPersistence.php
index 4e61a8ee..ab860a2e 100644
--- a/lib/Persistence/AbstractPersistence.php
+++ b/lib/Persistence/AbstractPersistence.php
@@ -7,7 +7,7 @@
 * @link https://github.com/PrivateBin/PrivateBin
 * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
 * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.3.5
+ * @version 1.4.0
 */
 
 namespace PrivateBin\Persistence;
diff --git a/lib/Persistence/PurgeLimiter.php b/lib/Persistence/PurgeLimiter.php
index ef377703..44e23304 100644
--- a/lib/Persistence/PurgeLimiter.php
+++ b/lib/Persistence/PurgeLimiter.php
@@ -7,7 +7,7 @@
 * @link https://github.com/PrivateBin/PrivateBin
 * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
 * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.3.5
+ * @version 1.4.0
 */
 
 namespace PrivateBin\Persistence;
diff --git a/lib/Persistence/ServerSalt.php b/lib/Persistence/ServerSalt.php
index 1095498c..7f96e337 100644
--- a/lib/Persistence/ServerSalt.php
+++ b/lib/Persistence/ServerSalt.php
@@ -7,7 +7,7 @@
 * @link https://github.com/PrivateBin/PrivateBin
 * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
 * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.3.5
+ * @version 1.4.0
 */
 
 namespace PrivateBin\Persistence;
diff --git a/lib/Persistence/TrafficLimiter.php b/lib/Persistence/TrafficLimiter.php
index 93f91d23..921d9463 100644
--- a/lib/Persistence/TrafficLimiter.php
+++ b/lib/Persistence/TrafficLimiter.php
@@ -8,7 +8,7 @@
 * @link https://github.com/PrivateBin/PrivateBin
 * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
 * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.3.5
+ * @version 1.4.0
 */
 
 namespace PrivateBin\Persistence;
diff --git a/lib/Request.php b/lib/Request.php
index 858f1313..2eff8a96 100644
--- a/lib/Request.php
+++ b/lib/Request.php
@@ -7,7 +7,7 @@
 * @link https://github.com/PrivateBin/PrivateBin
 * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
 * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.3.5
+ * @version 1.4.0
 */
 
 namespace PrivateBin;
diff --git a/lib/View.php b/lib/View.php
index 81698047..c6332a33 100644
--- a/lib/View.php
+++ b/lib/View.php
@@ -7,7 +7,7 @@
 * @link https://github.com/PrivateBin/PrivateBin
 * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
 * @license http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.3.5
+ * @version 1.4.0
 */
 
 namespace PrivateBin;
diff --git a/lib/Vizhash16x16.php b/lib/Vizhash16x16.php
index 77584eb0..351ba969 100644
--- a/lib/Vizhash16x16.php
+++ b/lib/Vizhash16x16.php
@@ -8,7 +8,7 @@
 * @link http://sebsauvage.net/wiki/doku.php?id=php:vizhash_gd
 * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
 * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 0.0.5 beta PrivateBin 1.3.5
+ * @version 0.0.5 beta PrivateBin 1.4.0
 */
 
 namespace PrivateBin;
diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php
index 581ab81b..c0d5770a 100644
--- a/tpl/bootstrap.php
+++ b/tpl/bootstrap.php
@@ -73,7 +73,7 @@ endif;
 ?>
 <script type="text/javascript" data-cfasync="false" src="js/purify-2.3.6.js" integrity="sha512-N1GGPjbqLbwK821ZN7C925WuTwU4aDxz2CEEOXQ6/s6m6MBwVj8fh5fugiE2hzsm0xud3q7jpjZQ4ILnpMREYQ==" crossorigin="anonymous"></script>
 <script type="text/javascript" data-cfasync="false" src="js/legacy.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-LYos+qXHIRqFf5ZPNphvtTB0cgzHUizu2wwcOwcwz/VIpRv9lpcBgPYz4uq6jx0INwCAj6Fbnl5HoKiLufS2jg==" crossorigin="anonymous"></script>
- <script type="text/javascript" data-cfasync="false" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-1NZFNDz2w2LBicoB46OAYSWADJp7t4bP1JJz0X5GkpQXEZMWWIGSeNiLAj4qVty59Lsea2xCvTU0UbXMuMCvFA==" crossorigin="anonymous"></script>
+ <script type="text/javascript" data-cfasync="false" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-/F0+9bIbFUC8mKQzrcAjIs2Jg92w1DMcczT2Y/KqHVkFEXH1ZSrqtUX7QjLH6RgVR0YhTxhmWkZ2c8scGCwpkQ==" crossorigin="anonymous"></script>
 <!-- icon -->
 <link rel="apple-touch-icon" href="<?php echo I18n::encode($BASEPATH); ?>img/apple-touch-icon.png" sizes="180x180" />
 <link rel="icon" type="image/png" href="img/favicon-32x32.png" sizes="32x32" />
diff --git a/tpl/page.php b/tpl/page.php
index 49d111b1..9ee9da77 100644
--- a/tpl/page.php
+++ b/tpl/page.php
@@ -51,7 +51,7 @@ endif;
 ?>
 <script type="text/javascript" data-cfasync="false" src="js/purify-2.3.6.js" integrity="sha512-N1GGPjbqLbwK821ZN7C925WuTwU4aDxz2CEEOXQ6/s6m6MBwVj8fh5fugiE2hzsm0xud3q7jpjZQ4ILnpMREYQ==" crossorigin="anonymous"></script>
 <script type="text/javascript" data-cfasync="false" src="js/legacy.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-LYos+qXHIRqFf5ZPNphvtTB0cgzHUizu2wwcOwcwz/VIpRv9lpcBgPYz4uq6jx0INwCAj6Fbnl5HoKiLufS2jg==" crossorigin="anonymous"></script>
- <script type="text/javascript" data-cfasync="false" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-1NZFNDz2w2LBicoB46OAYSWADJp7t4bP1JJz0X5GkpQXEZMWWIGSeNiLAj4qVty59Lsea2xCvTU0UbXMuMCvFA==" crossorigin="anonymous"></script>
+ <script type="text/javascript" data-cfasync="false" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-/F0+9bIbFUC8mKQzrcAjIs2Jg92w1DMcczT2Y/KqHVkFEXH1ZSrqtUX7QjLH6RgVR0YhTxhmWkZ2c8scGCwpkQ==" crossorigin="anonymous"></script>
 <!-- icon -->
 <link rel="apple-touch-icon" href="img/apple-touch-icon.png?<?php echo rawurlencode($VERSION); ?>" sizes="180x180" />
 <link rel="icon" type="image/png" href="img/favicon-32x32.png?<?php echo rawurlencode($VERSION); ?>" sizes="32x32" />