Merge branch 'develop' into slate

RedTurtle · Oct 5, 2023 · 23ccf94 · 23ccf94
2 parents 386eb22 + 3166a14
commit 23ccf94
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,31 @@
 
+
+## [8.7.4](https://github.com/redturtle/design-comuni-plone-theme/compare/v8.7.3...v8.7.4) (2023-10-05)
+
+
+### Maintenance
+
+* preparing release 8.7.4 ([7627cfd](https://github.com/redturtle/design-comuni-plone-theme/commit/7627cfd5edfa2469b8ddc6d8ccc675486be082dc))
+
+## [8.7.3](https://github.com/redturtle/design-comuni-plone-theme/compare/v8.7.2...v8.7.3) (2023-09-26)
+
+
+### Bug Fixes
+
+* fix rsss CardWithImageTemplate view date ([d509471](https://github.com/redturtle/design-comuni-plone-theme/commit/d509471994cfc4be62b1f15c60b06388ff8e0a9c))
+
+
+### Maintenance
+
+* preparing release 8.7.3 ([db663e6](https://github.com/redturtle/design-comuni-plone-theme/commit/db663e622df1e5756d7574a1288fd97ca30a3d8a))
+
+## [8.7.1](https://github.com/redturtle/design-comuni-plone-theme/compare/v8.7.2...v8.7.3) (2023-09-21)
+
+
+### Maintenance
+
+* release v8.7.1 ([b201b34](https://github.com/redturtle/design-comuni-plone-theme/commit/b201b34043e3bc14dbca40492b909801b2bbaaad))
+
 ## [8.7.2](https://github.com/redturtle/design-comuni-plone-theme/compare/v8.7.0...v8.7.2) (2023-09-21)
 
 
@@ -5899,4 +5926,4 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - added onclick to viewAll button [`baa258a`](https://github.com/RedTurtle/design-volto-theme/commit/baa258a983f9619b18f9c8d9fb078fe9b17f338b)
 - todo [`7814f01`](https://github.com/RedTurtle/design-volto-theme/commit/7814f01e5dd883c83bca4ecf53425ada9942d9ab)
 - updated gitignore with .history [`e73a28c`](https://github.com/RedTurtle/design-volto-theme/commit/e73a28c94176a172219c1a740a97047b5e2fa400)
-- Added nvmrc [`fd54a3c`](https://github.com/RedTurtle/design-volto-theme/commit/fd54a3cbcf8df22997f036919dfafda870f85db7)
+- Added nvmrc [`fd54a3c`](https://github.com/RedTurtle/design-volto-theme/commit/fd54a3cbcf8df22997f036919dfafda870f85db7)
diff --git a/RELEASE.md b/RELEASE.md
@@ -30,11 +30,12 @@
 - ...
 -->
 
-## Versione X.X.X (dd/mm/yyyy)
+## Versione 8.7.3 (26/09/2023)
 
 ### Fix
 
 - Sistemato margine del blocco Alert quando allineato a sinistra
+- Sistemato il template degli Rss Card con immagine per mostrare la data corretta
 
 ## Versione 8.7.0 (20/09/2023)
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "design-comuni-plone-theme",
   "description": "Volto Theme for Italia design guidelines",
   "license": "GPL-v3",
-  "version": "8.7.2",
+  "version": "8.7.4",
   "main": "src/index.js",
   "keywords": [
     "volto-addon",
@@ -130,7 +130,7 @@
     "typeface-roboto-mono": "0.0.75",
     "typeface-titillium-web": "0.0.72",
     "volto-blocks-widget": "3.1.0",
-    "volto-data-grid-widget": "2.2.1",
+    "volto-data-grid-widget": "2.2.2",
     "volto-dropdownmenu": "4.1.0",
     "volto-editablefooter": "5.0.1",
     "volto-feedback": "0.1.5",

diff --git a/publiccode.yml b/publiccode.yml
@@ -227,9 +227,9 @@ maintenance:
 name: io-Comune - Il sito AgID per Comuni ed Enti Pubblici
 platforms:
   - web
-releaseDate: '2023-09-21'
+releaseDate: '2023-10-05'
 softwareType: standalone/web
-softwareVersion: 8.7.2
+softwareVersion: 8.7.4
 url: 'https://github.com/italia/design-comuni-plone-theme'
 usedBy:
   - ASP Comuni Modenesi Area Nord

diff --git a/src/components/ItaliaTheme/Blocks/RssBlock/CardWithImageRssTemplate.jsx b/src/components/ItaliaTheme/Blocks/RssBlock/CardWithImageRssTemplate.jsx
@@ -78,7 +78,9 @@ const CardWithImageRssTemplate = ({
                           <span className="mx-1">&mdash;</span>
                         </>
                       )}
-                      <span>{getViewDate(item.pubDate, intl.locale)}</span>{' '}
+                      <span>
+                        {getViewDate(item.pubDate || item.date, intl.locale)}
+                      </span>{' '}
                     </div>
                     <CardTitle tag="h6">{item.title}</CardTitle>
                   </CardBody>

diff --git a/yarn.lock b/yarn.lock
@@ -4760,7 +4760,7 @@ __metadata:
     typeface-roboto-mono: 0.0.75
     typeface-titillium-web: 0.0.72
     volto-blocks-widget: 3.1.0
-    volto-data-grid-widget: 2.2.1
+    volto-data-grid-widget: 2.2.2
     volto-dropdownmenu: 4.1.0
     volto-editablefooter: 5.0.1
     volto-feedback: 0.1.5
@@ -11921,12 +11921,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"volto-data-grid-widget@npm:2.2.1":
-  version: 2.2.1
-  resolution: "volto-data-grid-widget@npm:2.2.1"
+"volto-data-grid-widget@npm:2.2.2":
+  version: 2.2.2
+  resolution: "volto-data-grid-widget@npm:2.2.2"
   peerDependencies:
     "@plone/volto": ">=16.0.0-alpha.38"
-  checksum: f782498eb79b2d29668129b51feea9db65d23ca8fff19b42ddcd75cf154d5bf7f128bc35e0ee2e569dc9cf9dfa24cb2ef0e65a181a8148ace1aa0acf29210508
+  checksum: 5f65b80336e6bedd0856214574573dc622c69fc03b41690014ef25b3cddcd0012f35a7283bf6fa4f18eac5af8a626f3700447b6341f7d03f1851ec6eb9ab0cb3
   languageName: node
   linkType: hard