ThaMunsta/itflow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prod to stage

Browse Source 
# Conflicts:
#	includes/filter_header.php
#	scripts/cron.php
#	scripts/cron_certificate_refresher.php
#	scripts/cron_domain_refresher.php
#	scripts/cron_mail_queue.php
#	scripts/cron_ticket_email_parser.php
This commit is contained in:
Mike Johnston
2025-11-10 09:32:02 -05:00
parent ca551406c7 d1dcc5fb7e
commit dd92bef63c
423 changed files with 21183 additions and 18623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/app_version.php
View File

@@ -5,4 +5,4 @@
* Update this file each time we merge develop into master. Format is YY.MM (add a .v if there is more than one release a month.
*/
DEFINE("APP_VERSION", "25.10.1");
DEFINE("APP_VERSION", "25.11");

2
includes/database_version.php
View File

@@ -5,4 +5,4 @@
* It is used in conjunction with database_updates.php
*/
DEFINE("LATEST_DATABASE_VERSION", "2.3.6");
DEFINE("LATEST_DATABASE_VERSION", "2.3.7");

8
includes/filter_header.php
View File

@@ -106,9 +106,13 @@ if ($_GET['canned_date'] == "custom" && !empty($_GET['dtf']) || !empty($_GET['dt
} elseif ($_GET['canned_date'] == "lastyear") {
$dtf = date('Y-m-d', strtotime("first day of january last year"));
$dtt = date('Y-m-d', strtotime("last day of december last year"));
}elseif (isset($_GET['canned_date']) && $_GET['canned_date'] === "alltime") {
$dtf = '1970-01-01';
$dtt = '2099-12-31';
} else {
$dtf = "NULL";
$dtt = date('Y-m-d', strtotime("last day of this month"));
// Fallback acts like all time
$dtf = '1970-01-01';
$dtt = '2099-12-31';
}
// Archived

1
includes/footer.php
View File

@@ -51,6 +51,7 @@ if (basename(dirname($_SERVER['REQUEST_URI'])) === 'guest') { ?>
<script src="/js/app.js"></script>
<script src="/js/ajax_modal.js"></script>
<script src="/js/confirm_modal.js"></script>
<script src="/js/date_filter.js"></script>
</body>
</html>