AS1024
/
itflow
mirror of https://github.com/itflow-org/itflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1133 from itflow-org/develop 

Release system - 24.12
This commit is contained in:
wrongecho 2024-12-30 14:26:38 +00:00 committed by GitHub
parent 4711955e17 955f7c3f3b
commit 0bde1ccee4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
admin_debug.php
View File

@ -519,12 +519,16 @@ $mysqli->close();
<table class="table table-bordered mb-3">
<tr>
<td>Current App Version</td>
<th><?php echo $commitHash; ?></th>
<th>ITFlow release version</th>
<th><?php echo APP_VERSION; ?></th>
</tr>
<tr>
<td>Current Code Commit</td>
<td><?php echo $commitHash; ?></td>
</tr>
<tr>
<td>Current DB Version</td>
<th><?php echo CURRENT_DATABASE_VERSION; ?></th>
<td><?php echo CURRENT_DATABASE_VERSION; ?></td>
</tr>
</table>

9
admin_update.php
View File

@ -3,7 +3,6 @@ require_once "inc_all_admin.php";
require_once "database_version.php";
$updates = fetchUpdates();
$latest_version = $updates->latest_version;
@ -43,8 +42,6 @@ $git_log = shell_exec("git log $repo_branch..origin/$repo_branch --pretty=format
<br>
<small class="text-secondary">Latest DB Version: <?php echo LATEST_DATABASE_VERSION; ?></small>
<br>
<small class="text-secondary">Branch: <?php echo $repo_branch; ?></small>
<hr>
<?php } else {
@ -54,9 +51,9 @@ $git_log = shell_exec("git log $repo_branch..origin/$repo_branch --pretty=format
<a class="btn btn-danger btn-lg" href="post.php?update&force_update=1"><i class="fas fa-fw fa-4x fa-hammer mb-1"></i><h5>FORCE Update App</h5></a>
<?php } else { ?>
<p class="text-secondary">Current Database Version:<br><strong class="text-dark"><?php echo CURRENT_DATABASE_VERSION; ?></strong></p>
<p class="text-secondary">Current App Version:<br><strong class="text-dark"><?php echo $current_version; ?></strong></p>
<p class="text-secondary">Branch:<br><strong class="text-dark"><?php echo $repo_branch; ?></strong></p>
<p><strong>Application Release Version:<br><strong class="text-dark"><?php echo APP_VERSION; ?></strong></p>
<p class="text-secondary">Database Version:<br><strong class="text-dark"><?php echo CURRENT_DATABASE_VERSION; ?></strong></p>
<p class="text-secondary">Code Commit:<br><strong class="text-dark"><?php echo $current_version; ?></strong></p>
<p class="text-muted">You are up to date!<br>Everything is going to be alright</p>
<i class="far fa-3x text-dark fa-smile-wink"></i><br>
<?php }

8
app_version.php Normal file
View File

@ -0,0 +1,8 @@
<?php
/*
* ITFlow
* This file defines the current ITFlow release/version
* Update this file each time we merge develop into master. Format is YY.M (add a .v if there is more than one release a month.
*/
DEFINE("APP_VERSION", "24.12");

2
footer.php
View File

@ -4,7 +4,7 @@ require_once "inc_confirm_modal.php";
<?php
if (str_contains(basename($_SERVER["PHP_SELF"]), "admin_")) { ?>
<p class="text-right font-weight-light">ITFlow /versioning coming soon/ &nbsp; · &nbsp; <a target="_blank" href="https://docs.itflow.org">Docs</a> &nbsp; · &nbsp; <a target="_blank" href="https://forum.itflow.org">Forum</a> &nbsp; · &nbsp; <a target="_blank" href="https://services.itflow.org">Services</a></p>
<p class="text-right font-weight-light">ITFlow <?php echo APP_VERSION ?> &nbsp; · &nbsp; <a target="_blank" href="https://docs.itflow.org">Docs</a> &nbsp; · &nbsp; <a target="_blank" href="https://forum.itflow.org">Forum</a> &nbsp; · &nbsp; <a target="_blank" href="https://services.itflow.org">Services</a></p>
<br>
<?php } ?>

4
inc_all_admin.php
View File

@ -9,7 +9,7 @@ require_once "check_login.php";
validateAdminRole();
// TODO: Change this to enforceAdminPermission();
// We can't do this until everyone has the new database fields added in 1.4.9 on Sept 14th 2024
// We can't do this until everyone has the new database fields added in db 1.4.9 on Sept 14th 2024
require_once "header.php";
@ -22,3 +22,5 @@ require_once "inc_wrapper.php";
require_once "inc_alert_feedback.php";
require_once "filter_header.php";
require_once "app_version.php";