diff --git a/CHANGELOG.md b/CHANGELOG.md
index 658703c31..24851196a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### 03 Feb, 2019
+bump: version to .6
+update: README
+update: dependencies
+
### 28 Jan, 2019
update: composer.json
remove: DarkAlchemy from namespace
diff --git a/README.md b/README.md
index d0b1e3b75..c33daf045 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-# Pu-239 v0.5
+# Pu-239 v0.6
## Goals:
-1. Updated to PHP 7.2 - default settings - Done
+1. Update to PHP 7.3 - default settings - Done
2. Error free with MySQL 8.0 strict mode - default settings - Mostly Done
3. Remove merged bootstrap - Done
4. Update jquery - Done
@@ -19,7 +19,7 @@ This is a fork of U-232 V4.
PHP 7.2+ is required.
MySQL 5.6 is required. MySQL 8.0 recommended.
[Composer](https://getcomposer.org/download/) is required. Version ^1.8.3.
-[NPM](https://nodejs.org/en/download/package-manager/) is required. Version ^6.6.0.
+[NPM](https://nodejs.org/en/download/package-manager/) is required. Version ^6.7.0.
This code explicitly sets the php default timezone to 'UTC'. Further down, you will set MySQL default timezone to the same.
A simple bash script to install everything required to host Pu-239 is [here](https://github.com/darkalchemy/Pu-239-Installer) and can be used to jumpstart the installation process.
@@ -46,7 +46,7 @@ couchbase(untested)
file(FlySystem)
# data storage
-MySQL or MariaDB or Percona MySQL
+MySQL, MariaDB or Percona MySQL
Adminer is included, only user #1 has access, others can be added, by id
```
### To Install:
@@ -74,7 +74,7 @@ innodb_large_prefix = 1 # Percona removed this in 8.0, MariaDB deprecated this i
innodb_file_per_table = 1
# add/modify this in [mysqld] to increase payload capacity
-max_allowed_packet = 64M ## this may need to be increased as your user count increases
+max_allowed_packet = 128M ## this may need to be increased as your user count increases
# add/modify this in [mysqld] to stop autoincrement on insert ignore(optional)
innodb_autoinc_lock_mode = 0
@@ -138,7 +138,6 @@ git pull
# update dependancies:
composer install
-composer dump-autoload -o
npm install
sudo php bin/set_perms.php
php bin/uglify.php
@@ -166,10 +165,10 @@ php bin/uglify.php
```
### Adding, removing changing classes
-Make any changes, then run php bin/uglify.php to concatenate, minify and gzip the files for use.
+Make any changes, then run ```php bin/uglify.php``` to concatenate, minify and gzip the files for use.
### Cache Engines
-couchbase, apcu, memcached, redis or file. file is set as default set in .env. In order to use any cache engin besides 'file', you must first install the appropriate driver and php extensions.
+couchbase, apcu, memcached, redis or file. file is set as the default and is set in the .env file. In order to use any cache engin besides 'file', you must first install the appropriate driver and php extensions.
### Image Proxy:
An image proxy for hot linked images is built in, enabled by default, disable/enable in staff panel => site settings, this allows for browser image caching and images with http when site is https
diff --git a/composer.lock b/composer.lock
index cb7631e7d..9222c972a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -106,16 +106,16 @@
},
{
"name": "composer/xdebug-handler",
- "version": "1.3.1",
+ "version": "1.3.2",
"source": {
"type": "git",
"url": "https://github.com/composer/xdebug-handler.git",
- "reference": "dc523135366eb68f22268d069ea7749486458562"
+ "reference": "d17708133b6c276d6e42ef887a877866b909d892"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/dc523135366eb68f22268d069ea7749486458562",
- "reference": "dc523135366eb68f22268d069ea7749486458562",
+ "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/d17708133b6c276d6e42ef887a877866b909d892",
+ "reference": "d17708133b6c276d6e42ef887a877866b909d892",
"shasum": ""
},
"require": {
@@ -146,7 +146,7 @@
"Xdebug",
"performance"
],
- "time": "2018-11-29T10:59:02+00:00"
+ "time": "2019-01-28T20:25:53+00:00"
},
{
"name": "doctrine/annotations",
@@ -758,16 +758,16 @@
},
{
"name": "league/flysystem",
- "version": "1.0.49",
+ "version": "1.0.50",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
- "reference": "a63cc83d8a931b271be45148fa39ba7156782ffd"
+ "reference": "dab4e7624efa543a943be978008f439c333f2249"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a63cc83d8a931b271be45148fa39ba7156782ffd",
- "reference": "a63cc83d8a931b271be45148fa39ba7156782ffd",
+ "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/dab4e7624efa543a943be978008f439c333f2249",
+ "reference": "dab4e7624efa543a943be978008f439c333f2249",
"shasum": ""
},
"require": {
@@ -838,7 +838,7 @@
"sftp",
"storage"
],
- "time": "2018-11-23T23:41:29+00:00"
+ "time": "2019-02-01T08:50:36+00:00"
},
{
"name": "league/glide",
@@ -2565,20 +2565,21 @@
},
{
"name": "vlucas/phpdotenv",
- "version": "v2.5.2",
+ "version": "v2.6.1",
"source": {
"type": "git",
"url": "https://github.com/vlucas/phpdotenv.git",
- "reference": "cfd5dc225767ca154853752abc93aeec040fcf36"
+ "reference": "2a7dcf7e3e02dc5e701004e51a6f304b713107d5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/cfd5dc225767ca154853752abc93aeec040fcf36",
- "reference": "cfd5dc225767ca154853752abc93aeec040fcf36",
+ "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2a7dcf7e3e02dc5e701004e51a6f304b713107d5",
+ "reference": "2a7dcf7e3e02dc5e701004e51a6f304b713107d5",
"shasum": ""
},
"require": {
- "php": ">=5.3.9"
+ "php": ">=5.3.9",
+ "symfony/polyfill-ctype": "^1.9"
},
"require-dev": {
"phpunit/phpunit": "^4.8.35 || ^5.0"
@@ -2586,7 +2587,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
},
"autoload": {
@@ -2611,7 +2612,7 @@
"env",
"environment"
],
- "time": "2018-10-30T17:29:25+00:00"
+ "time": "2019-01-29T11:11:52+00:00"
}
],
"packages-dev": [],
diff --git a/templates/1/template.php b/templates/1/template.php
index 7197282e3..e3e672760 100644
--- a/templates/1/template.php
+++ b/templates/1/template.php
@@ -349,8 +349,8 @@ function stdfoot($stdfoot = false)
";
+ var is_12_hour = " . ($use_12_hour ? 1 : 0) . ';
+ ';
$htmlfoot .= "
diff --git a/templates/2/template.php b/templates/2/template.php
index 7197282e3..e3e672760 100644
--- a/templates/2/template.php
+++ b/templates/2/template.php
@@ -349,8 +349,8 @@ function stdfoot($stdfoot = false)
";
+ var is_12_hour = " . ($use_12_hour ? 1 : 0) . ';
+ ';
$htmlfoot .= "