Merge branch 'develop'

alextselegidis · Dec 9, 2020 · f4ab6ee · f4ab6ee
2 parents 8c836bf + 9133aee
commit f4ab6ee
Show file tree

Hide file tree

Showing 189 changed files with 4,085 additions and 2,389 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,9 @@
 /assets/js/**/*.min.js
 /assets/css/**/*.min.css
 /config.php
+/storage/backups/*
+!/storage/backups/.htaccess
+!/storage/backups/index.html
 /storage/cache/*
 !/storage/cache/.htaccess
 !/storage/cache/index.html

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,7 @@
 This file contains the code changes that were introduced into each release (starting from v1.1.0) so that is easy for 
 developers to maintain and readjust their custom modifications on the main project codebase.
 
-## [1.4.0] - TBA
+## [1.4.0] - 2020-12-09
 
 ### Added
 

diff --git a/application/config/autoload.php b/application/config/autoload.php
@@ -1,4 +1,4 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php defined('BASEPATH') or exit('No direct script access allowed');
 
 /*
 | -------------------------------------------------------------------
@@ -30,7 +30,7 @@
 
 /*
 | -------------------------------------------------------------------
-|  Auto-load Packges
+|  Auto-load Packages
 | -------------------------------------------------------------------
 | Prototype:
 |
@@ -53,7 +53,7 @@
 |	$autoload['libraries'] = array('database', 'session', 'xmlrpc');
 */
 
-$autoload['libraries'] = ['database'];
+$autoload['libraries'] = ['database', 'session'];
 
 
 /*

diff --git a/application/config/config.php b/application/config/config.php
@@ -1,4 +1,4 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php defined('BASEPATH') or exit('No direct script access allowed');
 
 /*
 |--------------------------------------------------------------------------
@@ -9,7 +9,7 @@
 |
 */
 $config['version'] = '1.4.0'; // This must be changed manually.
-$config['release_label'] = 'Beta.1'; // Leave empty for no title or add Alpha, Beta etc ...
+$config['release_label'] = ''; // Leave empty for no title or add Alpha, Beta etc ...
 $config['debug'] = Config::DEBUG_MODE;
 
 /*
@@ -304,7 +304,7 @@
 | new release.
 |
 */
-$config['cache_busting_token'] = '824HX';
+$config['cache_busting_token'] = '729RF';
 
 /*
 |--------------------------------------------------------------------------
@@ -315,7 +315,7 @@
 | MUST set an encryption key.  See the user guide for info.
 |
 */
-$config['encryption_key'] = Config::BASE_URL;
+$config['encryption_key'] = base64_encode(APPPATH);
 
 /*
 |--------------------------------------------------------------------------

diff --git a/application/config/constants.php b/application/config/constants.php
@@ -1,4 +1,4 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php defined('BASEPATH') or exit('No direct script access allowed');
 
 /*
 |--------------------------------------------------------------------------

diff --git a/application/config/database.php b/application/config/database.php
@@ -1,4 +1,4 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php defined('BASEPATH') or exit('No direct script access allowed');
 
 /*
 | -------------------------------------------------------------------

diff --git a/application/config/doctypes.php b/application/config/doctypes.php
@@ -1,4 +1,4 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php defined('BASEPATH') or exit('No direct script access allowed');
 
 $_doctypes = [
     'xhtml11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',

diff --git a/application/config/email.php b/application/config/email.php
@@ -1,14 +1,14 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php defined('BASEPATH') or exit('No direct script access allowed');
 
 // Add custom values by settings them to the $config array.
-// Example: $config['smtp_host'] = 'smtp.gmail.com'; 
+// Example: $config['smtp_host'] = 'smtp.gmail.com';
 // @link https://codeigniter.com/user_guide/libraries/email.html
 
 $config['useragent'] = 'Easy!Appointments';
 $config['protocol'] = 'mail'; // or 'smtp'
 $config['mailtype'] = 'html'; // or 'text'
 // $config['smtp_host'] = '';
-// $config['smtp_user'] = ''; 
+// $config['smtp_user'] = '';
 // $config['smtp_pass'] = '';
 // $config['smtp_crypto'] = 'ssl'; // or 'tls'
 // $config['smtp_port'] = 25;
diff --git a/application/config/foreign_chars.php b/application/config/foreign_chars.php
@@ -1,4 +1,4 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php defined('BASEPATH') or exit('No direct script access allowed');
 
 /*
 | -------------------------------------------------------------------

diff --git a/application/config/hooks.php b/application/config/hooks.php
@@ -1,4 +1,4 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php defined('BASEPATH') or exit('No direct script access allowed');
 
 /*
 | -------------------------------------------------------------------------

diff --git a/application/config/migration.php b/application/config/migration.php
@@ -1,4 +1,4 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php defined('BASEPATH') or exit('No direct script access allowed');
 
 /*
 |--------------------------------------------------------------------------
@@ -21,7 +21,7 @@
 | be upgraded / downgraded to.
 |
 */
-$config['migration_version'] = 20;
+$config['migration_version'] = 21;
 
 
 /*