Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Prep 1.6.13 #276

Merged
merged 5 commits into from
Nov 25, 2024
Merged

Prep 1.6.13 #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0450427
Fix update notification
iMattPro Nov 25, 2024
882f61b
Rede#date notification
iMattPro Nov 25, 2024
7aaf4f9
Restyle update toast
iMattPro Nov 25, 2024
2c56f6f
Make sure to get most up to date version
iMattPro Nov 25, 2024
e2e3b5f
Prep 1.6.13
iMattPro Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# QuickInstall Changelog

## Version 1.6.13
- [Fix] Restored functionality to QI's version checking.

## Version 1.6.12
- [Fix] Fixed a fatal PHP error that could occur when creating new boards from the latest build of phpBB 4.
- [Fix] Fixed a fatal PHP error that could occur when creating new boards under PHP 8.
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.6.12",
"version": "1.6.13",
"license": "GPL-2.0-only",
"authors": [
{
Expand Down
2 changes: 1 addition & 1 deletion includes/qi.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ public static function get_update()
return $version_helper
->set_current_version(self::current_version())
->force_stability('stable')
->set_file_location('www.phpbb.com', '/customise/db/official_tool/phpbb3_quickinstall', 'version_check')
->set_file_location('www.phpbb.com', '/customise/db/official_tool/phpbb3_quickinstall', 'version_check', true)
->get_update();
}

Expand Down
2 changes: 1 addition & 1 deletion includes/qi_version_helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ public function get_update()
try
{
$updates = $this->get_suggested_updates();
return array_shift($updates);
return array_pop($updates);
}
catch (RuntimeException $e)
{
Expand Down
2 changes: 1 addition & 1 deletion language/en/qi.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@
'TIME_SETTINGS' => 'Time settings',
'TOGGLE_NAVIGATION' => 'Toggle navigation',

'UPDATE_AVAILABLE' => 'A new version is available.',
'UPDATE_AVAILABLE' => 'An update is available.',

'VERSION_CHECK_TITLE' => 'QI %1$s is available. You are using QI %2$s. Click to download the latest version.',

Expand Down
14 changes: 4 additions & 10 deletions style/overall_header.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,12 @@
{% if U_VERSION_CHECK_URL %}
<div class="toast-container position-fixed top-0 end-0 p-3 mt-5" style="z-index: 1045">
<div id="qiUpdateToast" class="toast" role="alert" aria-live="assertive" aria-atomic="true">
<div class="toast-header">
<strong class="me-auto">{{ lang('UPDATE_AVAILABLE') }}</strong>
<div class="toast-body d-flex align-items-center justify-content-between">
<span>{{ lang('UPDATE_AVAILABLE') }}</span>
<a href="{{ U_VERSION_CHECK_URL }}" class="btn btn-danger btn-sm ms-3" title="{{ VERSION_CHECK_TITLE }}">{{ lang('DOWNLOAD') }}</a>
<span class="vr mx-3"></span>
<button type="button" class="btn-close" data-bs-dismiss="toast" aria-label="Close"></button>
</div>
<div class="toast-body">
<a href="{{ U_VERSION_CHECK_URL }}" class="btn btn-danger" title="{{ VERSION_CHECK_TITLE }}">
<svg class="bi text-white" width="16" height="16" fill="currentColor">
<use xlink:href="{{ QI_ROOT_PATH }}style/assets/img/bootstrap-icons.svg#download"/>
</svg>
{{ lang('DOWNLOAD') }} &nbsp; <span class="badge rounded-pill bg-warning text-dark">{{ VERSION_CHECK_CURRENT }}</span>
</a>
</div>
</div>
</div>
{% endif %}
Expand Down