-
-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[fc] Repository: plonetheme.barceloneta
Branch: refs/heads/master Date: 2024-09-03T12:18:28+02:00 Author: Peter Mathis (petschki) <peter.mathis@kombinat.at> Commit: plone/plonetheme.barceloneta@4edc57d 3.2.0-alpha.6 Files changed: M package-lock.json M package.json
- Loading branch information
Showing
1 changed file
with
8 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,50 +1,16 @@ | ||
Repository: plone.app.event | ||
Repository: plonetheme.barceloneta | ||
|
||
|
||
Branch: refs/heads/master | ||
Date: 2024-09-06T12:41:14+02:00 | ||
Author: Yuri (yurj) <yurj@alfa.it> | ||
Commit: https://github.com/plone/plone.app.event/commit/c87af95b3b19da9625e2d526ae2b5f8e65de9f31 | ||
Date: 2024-09-03T12:18:28+02:00 | ||
Author: Peter Mathis (petschki) <peter.mathis@kombinat.at> | ||
Commit: https://github.com/plone/plonetheme.barceloneta/commit/4edc57d0f63bfe9ac302e6469ba6403818f19916 | ||
|
||
Update event_summary.pt | ||
|
||
If the name is None, display the mail. Otherwise, a person icon with no useful info is displayed. | ||
|
||
Files changed: | ||
M plone/app/event/browser/event_summary.pt | ||
|
||
b'diff --git a/plone/app/event/browser/event_summary.pt b/plone/app/event/browser/event_summary.pt\nindex ffc11d49..b715c119 100644\n--- a/plone/app/event/browser/event_summary.pt\n+++ b/plone/app/event/browser/event_summary.pt\n@@ -140,7 +140,7 @@\n <p class="card-text"\n tal:condition="mail"\n ><a class="email"\n- tal:content="name"\n+ tal:content="python: name if name is not None else mail"\n tal:attributes="\n href string:mailto:${mail};\n "\n' | ||
|
||
Repository: plone.app.event | ||
|
||
|
||
Branch: refs/heads/master | ||
Date: 2024-09-06T12:44:58+02:00 | ||
Author: Yuri (yurj) <yurj@alfa.it> | ||
Commit: https://github.com/plone/plone.app.event/commit/af7374ea0c19d6f7cc4e5d932fc7d2cc688001fb | ||
|
||
Create 407.bugfix | ||
|
||
Files changed: | ||
A news/407.bugfix | ||
|
||
b'diff --git a/news/407.bugfix b/news/407.bugfix\nnew file mode 100644\nindex 000000000..1b59deb73\n--- /dev/null\n+++ b/news/407.bugfix\n@@ -0,0 +1,2 @@\n+[yurj]\n+If the name is None, display the mail. Otherwise, a person icon with no useful info is displayed.\n' | ||
|
||
Repository: plone.app.event | ||
|
||
|
||
Branch: refs/heads/master | ||
Date: 2024-09-09T09:18:19+02:00 | ||
Author: Yuri (yurj) <yurj@alfa.it> | ||
Commit: https://github.com/plone/plone.app.event/commit/bc1bb1228098894fb5697365dd5e6c7fa6d732b3 | ||
|
||
Merge pull request #407 from plone/yurj-link-to-mail-if-name-none | ||
|
||
Yurj link to mail if name none | ||
3.2.0-alpha.6 | ||
|
||
Files changed: | ||
A news/407.bugfix | ||
M plone/app/event/browser/event_summary.pt | ||
M package-lock.json | ||
M package.json | ||
|
||
b'diff --git a/news/407.bugfix b/news/407.bugfix\nnew file mode 100644\nindex 000000000..1b59deb73\n--- /dev/null\n+++ b/news/407.bugfix\n@@ -0,0 +1,2 @@\n+[yurj]\n+If the name is None, display the mail. Otherwise, a person icon with no useful info is displayed.\ndiff --git a/plone/app/event/browser/event_summary.pt b/plone/app/event/browser/event_summary.pt\nindex ffc11d499..b715c1197 100644\n--- a/plone/app/event/browser/event_summary.pt\n+++ b/plone/app/event/browser/event_summary.pt\n@@ -140,7 +140,7 @@\n <p class="card-text"\n tal:condition="mail"\n ><a class="email"\n- tal:content="name"\n+ tal:content="python: name if name is not None else mail"\n tal:attributes="\n href string:mailto:${mail};\n "\n' | ||
b'diff --git a/package-lock.json b/package-lock.json\nindex b1177212..e8a9d17d 100644\n--- a/package-lock.json\n+++ b/package-lock.json\n@@ -1,12 +1,12 @@\n {\n "name": "@plone/plonetheme-barceloneta-base",\n- "version": "3.2.0-alpha.5",\n+ "version": "3.2.0-alpha.6",\n "lockfileVersion": 3,\n "requires": true,\n "packages": {\n "": {\n "name": "@plone/plonetheme-barceloneta-base",\n- "version": "3.2.0-alpha.5",\n+ "version": "3.2.0-alpha.6",\n "license": "MIT",\n "dependencies": {\n "bootstrap": "5.3.3"\ndiff --git a/package.json b/package.json\nindex f63ecea9..776d2481 100644\n--- a/package.json\n+++ b/package.json\n@@ -1,7 +1,7 @@\n {\n "name": "@plone/plonetheme-barceloneta-base",\n "description": "Plone Theme Barceloneta Resources",\n- "version": "3.2.0-alpha.5",\n+ "version": "3.2.0-alpha.6",\n "files": [\n "/scss",\n "/plonetheme/barceloneta/theme/tinymce/*.css"\n' | ||
|