From f1cf3d3c87c82c48e453b34e574570980cd394de Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Wed, 13 Jun 2018 21:37:15 +0100 Subject: [PATCH] Release 3.2.3 --- README.md | 1 + WHATS_NEW.txt | 5 +++++ application/config/config.php | 2 +- application/views/partial/header.php | 4 ++-- bower.json | 2 +- composer.lock | 21 +++++++++++---------- deployment.json | 2 +- package.json | 2 +- public/license/composer.LICENSES | 2 +- 9 files changed, 24 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index c6e0cdc10..552027d2f 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,7 @@ The main features are: * Selectable Boostrap (Bootswatch) based UI theme * Mailchimp integration * reCAPTCHA to protect login page from brute force attacks +* GDPR ready The software is written in PHP language, it uses MySQL (or MariaDB) as data storage back-end and has a simple but intuitive user interface. diff --git a/WHATS_NEW.txt b/WHATS_NEW.txt index cced7ea2e..511642444 100644 --- a/WHATS_NEW.txt +++ b/WHATS_NEW.txt @@ -1,3 +1,8 @@ +Version 3.2.3 +------------- ++ Further revert of CSRF change causing regression ++ Code Igniter 3.1.9 upgrade + Version 3.2.2 ------------- + Revert CSRF change causing regression diff --git a/application/config/config.php b/application/config/config.php index f3e8921c8..9efc52e09 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -8,7 +8,7 @@ | | */ -$config['application_version'] = '3.2.2'; +$config['application_version'] = '3.2.3'; /* |-------------------------------------------------------------------------- diff --git a/application/views/partial/header.php b/application/views/partial/header.php index 94d0c53c5..dd8be8928 100644 --- a/application/views/partial/header.php +++ b/application/views/partial/header.php @@ -72,10 +72,10 @@ - + - + diff --git a/bower.json b/bower.json index f23e02cc5..6c825b2e3 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "opensourcepos", "description": "Open Source Point of Sale is a web based POS system written in the PHP language. It uses MySQL as backend and has a simple user interface", - "version": "3.2.2", + "version": "3.2.3", "license": "MIT", "authors": [ "jekkos ", diff --git a/composer.lock b/composer.lock index 02ab3eec8..c187907ef 100644 --- a/composer.lock +++ b/composer.lock @@ -9,16 +9,16 @@ "packages": [ { "name": "codeigniter/framework", - "version": "3.1.8", + "version": "3.1.9", "source": { "type": "git", "url": "https://github.com/bcit-ci/CodeIgniter.git", - "reference": "02a0518e1c56ba3506f370362ac5ebdb8a138312" + "reference": "30e2eafa86c4c7b6b39cea3e7089a90df9f603fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bcit-ci/CodeIgniter/zipball/71e647782764184e3aab4faffe6d99176758979f", - "reference": "02a0518e1c56ba3506f370362ac5ebdb8a138312", + "url": "https://api.github.com/repos/bcit-ci/CodeIgniter/zipball/30e2eafa86c4c7b6b39cea3e7089a90df9f603fb", + "reference": "30e2eafa86c4c7b6b39cea3e7089a90df9f603fb", "shasum": "" }, "require": { @@ -38,7 +38,7 @@ ], "description": "The CodeIgniter framework", "homepage": "https://codeigniter.com", - "time": "2018-01-13 11:57:11" + "time": "2018-06-12 13:45:46" }, { "name": "dompdf/dompdf", @@ -103,16 +103,16 @@ }, { "name": "paragonie/random_compat", - "version": "v2.0.11", + "version": "v2.0.15", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8" + "reference": "10bcb46e8f3d365170f6de9d05245aa066b81f09" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/5da4d3c796c275c55f057af5a643ae297d96b4d8", - "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/10bcb46e8f3d365170f6de9d05245aa066b81f09", + "reference": "10bcb46e8f3d365170f6de9d05245aa066b81f09", "shasum": "" }, "require": { @@ -144,10 +144,11 @@ "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", "keywords": [ "csprng", + "polyfill", "pseudorandom", "random" ], - "time": "2017-09-27 21:40:39" + "time": "2018-06-08 15:26:40" }, { "name": "phenx/php-font-lib", diff --git a/deployment.json b/deployment.json index d3e27ccf2..74ae5f1de 100644 --- a/deployment.json +++ b/deployment.json @@ -14,7 +14,7 @@ "public_stats": true }, "version": { - "name": "3.2.2" + "name": "3.2.3" }, "files": [ {"includePattern": "dist(.*)\\.(zip)", "uploadPattern": "$1.$2"} diff --git a/package.json b/package.json index 978bf4875..810f0a232 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "opensourcepos", - "version": "3.2.2", + "version": "3.2.3", "description": "Open Source Point of Sale is a web based point of sale system written in the PHP language. It uses MySQL as the data storage back-end and has a simple user interface.", "main": "index.php", "license": "MIT", diff --git a/public/license/composer.LICENSES b/public/license/composer.LICENSES index 33010d468..d3b8a0fe9 100644 --- a/public/license/composer.LICENSES +++ b/public/license/composer.LICENSES @@ -1,6 +1,6 @@ { "name": "OpenSourcePOS", - "version": "3.2.2", + "version": "3.2.3", "license": [ "MIT" ],