mirror of
https://github.com/LaCasemate/fab-manager.git
synced 2025-03-21 12:29:03 +01:00
Merge branch 'dev' for release 6.3.44
This commit is contained in:
commit
78fa66fda7
@ -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
|
||||
|
@ -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 (
|
||||
|
@ -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",
|
||||
|
Loading…
x
Reference in New Issue
Block a user