jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Release 2.0.13 (#3955)

Browse Source 
- added missing escape to prevent HTML injection
- added missing color attribute
- upgrade theme
  - use dropdown submenu if title is set, otherwise dropdown tends to get too long
  - allow to use card-table instead of card-body
  - added `required` attribute to username and password field
- fix pagination back to page 1
- prevent tag name too long
- re-add missing user preferences link
This commit is contained in:
Kevin Papst
2023-03-30 01:08:15 +02:00
committed by GitHub
parent 7164ec126f
commit 01226a1243
23 changed files with 102 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Twig/LocaleFormatExtensions.php
View File

@@ -116,7 +116,7 @@ final class LocaleFormatExtensions extends AbstractExtension implements LocaleAw
return $this->locale;
}
public function isWeekend(DateTime|string|null $dateTime): bool
public function isWeekend(\DateTimeInterface|string|null $dateTime): bool
{
if (!$dateTime instanceof \DateTime) {
return false;
@@ -141,7 +141,7 @@ final class LocaleFormatExtensions extends AbstractExtension implements LocaleAw
return ($day === 0 || $day === 6);
}
public function dateShort(DateTime|string|null $date): string
public function dateShort(\DateTimeInterface|string|null $date): string
{
return (string) $this->getFormatter()->dateShort($date);
}
@@ -158,17 +158,17 @@ final class LocaleFormatExtensions extends AbstractExtension implements LocaleAw
return new DateTime($date, new \DateTimeZone($timezone));
}
public function dateFormat(DateTime|string|null $date, string $format): string
public function dateFormat(\DateTimeInterface|string|null $date, string $format): string
{
return (string) $this->getFormatter()->dateFormat($date, $format);
}
public function dateWeekday(DateTime $date): string
public function dateWeekday(\DateTimeInterface $date): string
{
return $this->dayName($date, true) . ' ' . $this->getFormatter()->dateFormat($date, 'd');
}
public function time(DateTime|string|null $date): string
public function time(\DateTimeInterface|string|null $date): string
{
return (string) $this->getFormatter()->time($date);
}
@@ -192,12 +192,12 @@ final class LocaleFormatExtensions extends AbstractExtension implements LocaleAw
return $months;
}
public function monthName(\DateTime $dateTime, bool $withYear = false): string
public function monthName(\DateTimeInterface $dateTime, bool $withYear = false): string
{
return $this->getFormatter()->monthName($dateTime, $withYear);
}
public function dayName(\DateTime $dateTime, bool $short = false): string
public function dayName(\DateTimeInterface $dateTime, bool $short = false): string
{
return $this->getFormatter()->dayName($dateTime, $short);
}