From ef96e419478db4bb459592d4148a86a2aaa063a1 Mon Sep 17 00:00:00 2001
From: dehart <derinus@gmail.com>
Date: Mon, 4 Nov 2024 13:47:11 +0100
Subject: [PATCH 1/4] fixed event missing organizer when it was duplicated to
 someone else its calendar

---
 www/modules/calendar/model/Event.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/modules/calendar/model/Event.php b/www/modules/calendar/model/Event.php
index abd745f5af..7b34315d50 100644
--- a/www/modules/calendar/model/Event.php
+++ b/www/modules/calendar/model/Event.php
@@ -2233,6 +2233,7 @@ public function duplicateRelation($relationName, $duplicate, array $attributes=a
 		if($relationName == 'participants' && isset($attributes['participants']) && $attributes['participants'] === null) {
 			return;
 		}
+		parent::duplicateRelation($relationName, $duplicate, $attributes, $findParams);
 	}
 	
 	/**

From 9be2c439ba020b8d7bea08b3268dafe123901969 Mon Sep 17 00:00:00 2001
From: Joachim van de Haterd <jvdhaterd@intermesh.nl>
Date: Mon, 4 Nov 2024 14:15:39 +0100
Subject: [PATCH 2/4] CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 364f811a83..52f302ac26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 - Core: Admin can change passwords without using own password again
 - Email: Set references header when forwarding mail
 - Newsletters: fix php compatibility error when sending newsletters
+- Supportclient: make creation dialog wider to fit format toolbar
 
 28-10-2024: 6.8.80
 - Core: bugfix editing individual field set in entity

From e842fa0d31b0c887723dbb4dd2f4f8ad7db56b48 Mon Sep 17 00:00:00 2001
From: Joachim van de Haterd <jvdhaterd@intermesh.nl>
Date: Mon, 4 Nov 2024 15:16:37 +0100
Subject: [PATCH 3/4] Calendar - fix more HTML encoding / decoding issues in
 Qtip #1191

---
 CHANGELOG.md                     |  1 +
 www/modules/calendar/Calendar.js | 23 +++++++++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52f302ac26..84295f7e42 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 - Email: Set references header when forwarding mail
 - Newsletters: fix php compatibility error when sending newsletters
 - Supportclient: make creation dialog wider to fit format toolbar
+- Calendar: fix more HTML encoding issues in Qtip
 
 28-10-2024: 6.8.80
 - Core: bugfix editing individual field set in entity
diff --git a/www/modules/calendar/Calendar.js b/www/modules/calendar/Calendar.js
index 9aae9aa64f..7c18b82277 100644
--- a/www/modules/calendar/Calendar.js
+++ b/www/modules/calendar/Calendar.js
@@ -48,7 +48,8 @@ GO.calendar.formatQtip = function(data,verbose)
 		str += '<br />'+t("Status", "calendar")+': ';
 		
 		if(t("statuses", "calendar")[data.status]){
-			str+=Ext.util.Format.htmlEncode(t("statuses", "calendar")[data.status]);
+			// str+=Ext.util.Format.htmlEncode(t("statuses", "calendar")[data.status]);
+			str+=t("statuses", "calendar")[data.status];
 		}else
 		{
 			str+=data.status;
@@ -57,12 +58,14 @@ GO.calendar.formatQtip = function(data,verbose)
 
 	if(!GO.util.empty(data.calendar_name))
 	{
-		str += '<br />'+t("Calendar", "calendar")+': '+Ext.util.Format.htmlEncode(data.calendar_name);
+		// str += '<br />'+t("Calendar", "calendar")+': '+Ext.util.Format.htmlEncode(data.calendar_name);
+		str += '<br />'+t("Calendar", "calendar")+': '+data.calendar_name;
 	}
 
 	if(!GO.util.empty(data.username))
 	{
-		str += '<br />'+t("Owner")+': '+Ext.util.Format.htmlEncode(data.username);
+		// str += '<br />'+t("Owner")+': '+Ext.util.Format.htmlEncode(data.username);
+		str += '<br />'+t("Owner")+': '+data.username;
 	}
 
 	str += '<br />'+t("Created at")+': '+data.creationDate.format(GO.settings.date_format+' '+GO.settings.time_format);
@@ -71,12 +74,14 @@ GO.calendar.formatQtip = function(data,verbose)
 		
 	if(verbose && !GO.util.empty(data.musername))
 	{
-		str += '<br />'+t("Modified by")+': '+Ext.util.Format.htmlEncode(data.musername);
+		// str += '<br />'+t("Modified by")+': '+Ext.util.Format.htmlEncode(data.musername);
+		str += '<br />'+t("Modified by")+': '+data.musername;
 	}
 	
 	if(!GO.util.empty(data.location))
 	{
-		str += '<br />'+t("Location", "calendar")+': '+Ext.util.Format.htmlEncode(data.location);
+		// str += '<br />'+t("Location", "calendar")+': '+Ext.util.Format.htmlEncode(data.location);
+		str += '<br />'+t("Location", "calendar")+': '+data.location;
 	}
 
 	if(!GO.util.empty(data.description))
@@ -87,12 +92,14 @@ GO.calendar.formatQtip = function(data,verbose)
 	if (!GO.util.empty(data.resources)) {
 		str += '<br />'+t("Used resources", "calendar")+':';
 		for (var i in data.resources)
-			str += '<br /> - '+Ext.util.Format.htmlEncode(data.resources[i]);
+			// str += '<br /> - '+Ext.util.Format.htmlEncode(data.resources[i]);
+			str += '<br /> - '+data.resources[i];
 	}
 	
 	if (!GO.util.empty(data.resourced_calendar_name))
-		str += '<br />'+t("Resource used in", "calendar")+': '+Ext.util.Format.htmlEncode(data.resourced_calendar_name);
-	
+		// str += '<br />'+t("Resource used in", "calendar")+': '+Ext.util.Format.htmlEncode(data.resourced_calendar_name);
+		str += '<br />'+t("Resource used in", "calendar")+': '+data.resourced_calendar_name;
+
 	return Ext.util.Format.htmlEncode(str);
 }
 

From 1498b1c96330d71f3a4e37bf5f81ac8205d3f519 Mon Sep 17 00:00:00 2001
From: Joachim van de Haterd <jvdhaterd@intermesh.nl>
Date: Mon, 4 Nov 2024 15:18:01 +0100
Subject: [PATCH 4/4] 6.8.81

---
 CHANGELOG.md    | 1 +
 www/version.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84295f7e42..a153692b4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,4 @@
+04-11-2024: 6.8.81
 - Core: Admin can change passwords without using own password again
 - Email: Set references header when forwarding mail
 - Newsletters: fix php compatibility error when sending newsletters
diff --git a/www/version.php b/www/version.php
index 6d210d934c..e1cf9643e0 100644
--- a/www/version.php
+++ b/www/version.php
@@ -1,2 +1,2 @@
 <?php
-return "6.8.80";
+return "6.8.81";