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

Merge pull request #1181 from itflow-org/develop 

v25.02.3 - Stable Minor Release
This commit is contained in:
Johnny 2025-03-03 15:57:26 -05:00 committed by GitHub
parent 359b04e7d1 2c074e9dc4
commit 9f2b9e3b3e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -2,6 +2,11 @@
This file documents all notable changes made to ITFlow. This file documents all notable changes made to ITFlow.
## [25.02.3]
### Fixed
- Fixed notifications being reversed as dismissed notifications.
## [25.02.2] ## [25.02.2]
### Fixed ### Fixed

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. * 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.02.2"); DEFINE("APP_VERSION", "25.02.3");

8
notifications.php
View File

@ -101,14 +101,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
Notification <?php if ($sort == 'notification') { echo $order_icon; } ?> Notification <?php if ($sort == 'notification') { echo $order_icon; } ?>
</a> </a>
</th> </th>
<?php if(!$dismissed_filter) { ?> <?php if($dismissed_filter) { ?>
<th> <th>
<a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=notification_dismissed_at&order=<?php echo $disp; ?>"> <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=notification_dismissed_at&order=<?php echo $disp; ?>">
Dismissed At <?php if ($sort == 'notification_dismissed_at') { echo $order_icon; } ?> Dismissed At <?php if ($sort == 'notification_dismissed_at') { echo $order_icon; } ?>
</a> </a>
</th> </th>
<?php } ?> <?php } ?>
<?php if($dismissed_filter) { ?> <?php if(!$dismissed_filter) { ?>
<th class="text-center p-0"> <th class="text-center p-0">
<?php if (mysqli_num_rows($sql) > 0) { ?> <?php if (mysqli_num_rows($sql) > 0) { ?>
<a href="post.php?dismiss_all_notifications&csrf_token=<?php echo $_SESSION["csrf_token"]; ?>" <a href="post.php?dismiss_all_notifications&csrf_token=<?php echo $_SESSION["csrf_token"]; ?>"
@ -137,10 +137,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<td><?php echo $notification_timestamp; ?></td> <td><?php echo $notification_timestamp; ?></td>
<td><?php echo $notification_type; ?></td> <td><?php echo $notification_type; ?></td>
<td><?php echo $notification; ?></td> <td><?php echo $notification; ?></td>
<?php if(!$dismissed_filter) { ?> <?php if($dismissed_filter) { ?>
<td><?php echo $notification_dismissed_at; ?></td> <td><?php echo $notification_dismissed_at; ?></td>
<?php } ?> <?php } ?>
<?php if($dismissed_filter) { ?> <?php if(!$dismissed_filter) { ?>
<td class="text-center"><a class="btn btn-secondary btn-sm" href="post.php?dismiss_notification=<?php echo $notification_id; ?>" title="Dismiss"><i class="fas fa-check"></i></a></td> <td class="text-center"><a class="btn btn-secondary btn-sm" href="post.php?dismiss_notification=<?php echo $notification_id; ?>" title="Dismiss"><i class="fas fa-check"></i></a></td>
<?php } ?> <?php } ?>
</tr> </tr>