From 5497adfde6e1df941d42bb8fb6e18b261402716e Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Sat, 18 Sep 2021 18:06:32 +0000
Subject: add option to mark all notices of a thread read if a notice of the
 thread is clicked (default 1) and fix a php error in find_parent() if
 $act->obj is not an array

---
 view/tpl/settings.tpl | 1 +
 1 file changed, 1 insertion(+)

(limited to 'view/tpl/settings.tpl')

diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index a3e68f60a..27e9d5d60 100644
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -154,6 +154,7 @@
 								{{include file="field_intcheckbox.tpl" field=$vnotify14}}
 								{{include file="field_intcheckbox.tpl" field=$vnotify15}}
 								{{include file="field_intcheckbox.tpl" field=$always_show_in_notices}}
+								{{include file="field_intcheckbox.tpl" field=$update_notices_per_parent}}
 								{{include file="field_input.tpl" field=$evdays}}
 							</div>
 						</div>
-- 
cgit v1.2.3


From 2a2c4d3e9cf09f2ebe0bda68a8c761c23e802e95 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Thu, 23 Sep 2021 08:50:44 +0000
Subject: fix bs regression

---
 view/tpl/settings.tpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'view/tpl/settings.tpl')

diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 27e9d5d60..353da9c2b 100644
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -16,7 +16,7 @@
 						</a>
 					</h3>
 				</div>
-				<div id="basic-settings-collapse" class="collapse show" role="tabpanel" aria-labelledby="basic-settings" data-parent="#settings">
+				<div id="basic-settings-collapse" class="collapse show" role="tabpanel" aria-labelledby="basic-settings" data-bs-parent="#settings">
 					<div class="section-content-tools-wrapper">
 						{{include file="field_input.tpl" field=$username}}
 						{{include file="field_select_grouped.tpl" field=$timezone}}
@@ -42,7 +42,7 @@
 						</a>
 					</h3>
 				</div>
-				<div id="privacy-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="privacy-settings" data-parent="#settings">
+				<div id="privacy-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="privacy-settings" data-bs-parent="#settings">
 					<div class="section-content-tools-wrapper">
 						{{include file="field_select_grouped.tpl" field=$role}}
 						{{$autoperms}}
@@ -102,7 +102,7 @@
 						</a>
 					</h3>
 				</div>
-				<div id="notification-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="notification-settings" data-parent="#settings">
+				<div id="notification-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="notification-settings" data-bs-parent="#settings">
 					<div class="section-content-tools-wrapper">
 						<div id="settings-notifications">
 
-- 
cgit v1.2.3