Merge pull request #156 from phpbb/develop

Merge Develop into Master for version 1.5.0

Author: iMattPro

CHANGELOG.md

@@ -1,5 +1,16 @@
 # QuickInstall Changelog
 
+## Version 1.5.0
+- [Change] Config profiles in the `settings` directory are now in JSON format. Existing profiles in the old text format will automatically be converted to JSON.
+- [Change] Prettied up the documentation a bit.
+- [Change] Always show profiles in a drop-down menu, even when there is only one, for consistency. Also, naturally/case-insensitively sort them.
+- [Change] Now, when updating a saved profile, the name of the current profile will appear in the Save Profile's input field.
+- [Change] Relocated some error messages and alerts to the top of the page.
+- [Change] Improve appearances of some notices in the QI interface.
+- [Change] Literally countless code improvements, removing or fixing ancient code constructs and bad code smells, including completely rewriting the settings class from the ground up.
+- [Change] Updated Bootstrap to 4.5.2.
+- [Fix] Improved appearance of the Installed boards list in the sidebar and fixed layout issues it had with really long or really short board names.
+
 ## Version 1.4.2
 - [Fix] Fixed Delete buttons broken in version 1.4.1.
 

README.md

@@ -21,12 +21,10 @@ QuickInstall was made to support the community of phpBB extension developers (an
 
 ## 🛠 Upgrading
 1. Download the latest QuickInstall and extract it. 
-2. Copy everything into your QuickInstall folder **except for the `boards/`, `sources/` and `settings/` folders**.
 
-> Upgrading from QuickInstall 1.1.8 or earlier?
->
-> 1. Follow the upgrade procedure described above. 
-> 2. Point your browser to the Profiles page, make sure the settings are in order and click "Save".  QuickInstall will convert your old `qi_config.cfg` to a settings profile named "default".
+2. Copy everything into your existing QuickInstall folder **except for the `boards/`, `sources/` and `settings/` folders**. 
+
+*Note that when upgrading from a very old version of QuickInstall (1.1.8 or less) you will need to reconfigure your settings as a fresh install.*
 
 ## 💻 Requirements
 
@@ -41,15 +39,15 @@ QuickInstall is designed to run on all modern browsers. Please don't use old stu
 
 ##### Servers
 - Apache or Ngnix
-- PHP 5.3.3 or above, with the JSON module
+- PHP 5.4.7 or above, with the JSON module
 
 > Note that each version of phpBB has its own requirements and limitations:
 >
 > PHP requirements:
-> - phpBB 3.0 and 3.1 will not work with PHP 7
+> - phpBB 3.0 and 3.1 will only work with PHP 5.4.7 through 5.6.40
 > - phpBB 3.2.0-3.2.1 will only work with PHP 5.4.7 through 7.1.x
 > - phpBB 3.2.2-3.2.x will only work with PHP 5.4.7 through 7.2.x
-> - phpBB 3.3 will only work with PHP 7.1.3 or above
+> - phpBB 3.3.x will only work with PHP 7.1.3 or above
 > 
 > Database minimum requirements:
 > - phpBB 3.0 - MySQL 3.23+, MS SQL Server 2000, PostgreSQL 7.x, or SQLite 2

composer.json

@@ -2,7 +2,7 @@
   "name": "phpbb/quickinstall",
   "description": "QuickInstall is a developer tool used to create multiple phpBB3 installations.",
   "homepage": "https://www.phpbb.com/customise/db/official_tool/phpbb3_quickinstall",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "license": "GPL-2.0-only",
   "authors": [
     {
@@ -21,7 +21,8 @@
   "require": {
     "php": ">=5.4",
     "twig/twig": "^1.0",
-    "erusev/parsedown": "^1.7"
+    "erusev/parsedown": "^1.7",
+    "ext-json": "*"
   },
   "config": {
     "platform": {

develop/package-lock.json

@@ -1,10 +1,10 @@
 {
   "name": "quickinstall",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "license": "GPL-2.0-only",
   "dependencies": {
-    "autoprefixer": "^9.8.4",
-    "bootstrap": "^4.5.0",
+    "autoprefixer": "^9.8.6",
+    "bootstrap": "^4.5.2",
     "bootstrap-icons": "^1.0.0-alpha5",
     "copyfiles": "^2.3.0",
     "jquery": "^3.5.1",
@@ -15,7 +15,7 @@
     "style": "sass qi_bootstrap.scss | postcss --use autoprefixer -o qi_bootstrap.css",
     "style-min": "sass qi_bootstrap.scss --style compressed | postcss --use autoprefixer -o qi_bootstrap.min.css",
     "copy-bs-css": "copyfiles --flat qi_bootstrap.min.css ../style/assets/css",
-    "copy-bs-js": "copyfiles --flat node_modules/bootstrap/dist/js/bootstrap.min.js ../style/assets/js",
+    "copy-bs-js": "copyfiles --flat node_modules/bootstrap/dist/js/bootstrap.min.js node_modules/bootstrap/dist/js/bootstrap.min.js.map ../style/assets/js",
     "copy-bs-icons": "copyfiles --flat node_modules/bootstrap-icons/bootstrap-icons.svg ../style/assets/img",
     "all": "npm-run-all style style-min copy-bs-css copy-bs-js copy-bs-icons"
   }