From ee5769a05382a645d6d3cb02e31e22ec18740a56 Mon Sep 17 00:00:00 2001
From: Du Peng <gnepud@gmail.com>
Date: Thu, 20 Mar 2025 10:40:23 +0100
Subject: [PATCH 1/2] (bug) event start/end date is not correct in the event
 list if the daylight saving time

---
 app/frontend/src/javascript/components/events/event-card.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/frontend/src/javascript/components/events/event-card.tsx b/app/frontend/src/javascript/components/events/event-card.tsx
index c85187549..550671828 100644
--- a/app/frontend/src/javascript/components/events/event-card.tsx
+++ b/app/frontend/src/javascript/components/events/event-card.tsx
@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { react2angular } from 'react2angular';
-import moment from 'moment';
 import { IApplication } from '../../models/application';
 import { Loader } from '../base/loader';
 import { Event } from '../../models/event';
@@ -56,7 +55,7 @@ export const EventCard: React.FC<EventCardProps> = ({ event, cardType }) => {
   const formatTime = (): string => {
     return event.all_day
       ? t('app.public.event_card.all_day')
-      : t('app.public.event_card.from_time_to_time', { START: FormatLib.time(moment(`${event.start_date}T${event.start_time}`).toDate()), END: FormatLib.time(moment(`${event.end_date}T${event.end_time}`).toDate()) });
+      : t('app.public.event_card.from_time_to_time', { START: event.start_time, END: event.end_time });
   };
 
   return (

From 097e43f32b0d51cf45bd54a3eada033d1645fc32 Mon Sep 17 00:00:00 2001
From: Du Peng <gnepud@gmail.com>
Date: Thu, 20 Mar 2025 10:41:15 +0100
Subject: [PATCH 2/2] Version 6.3.44

---
 CHANGELOG.md | 4 ++++
 package.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34eaf28cf..6cbcc777b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Next release
 
+## v6.3.44 2025 March 20
+
+- Fix a bug: event start/end date is not correct in the event list if the daylight saving time
+
 ## v6.3.43 2025 March 19
 
 - update upgrade.sh script to allow skip compile assets
diff --git a/package.json b/package.json
index ddafc00e5..08e5f2f31 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fab-manager",
-  "version": "6.3.43",
+  "version": "6.3.44",
   "description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.",
   "keywords": [
     "fablab",