Merge branch '5.x' into fix-merge-company-with-itself

.all-contributorsrc

@@ -1267,6 +1267,15 @@
         "review",
         "bug"
       ]
+    },
+    {
+      "login": "markusVJH",
+      "name": "Markus Heinilä",
+      "avatar_url": "https://avatars.githubusercontent.com/u/121946942?v=4",
+      "profile": "https://github.com/markusVJH",
+      "contributions": [
+        "review"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.ddev/config.yaml

@@ -10,6 +10,7 @@ additional_fqdns: []
 mariadb_version: "10.3"
 mysql_version: ""
 provider: default
+upload_dir: "media/files, media/images" # Specify the directories containing user-generated uploads
 use_dns_when_possible: true
 composer_version: "2"
 webimage_extra_packages: [php8.2-imap]

README.md

@@ -1,6 +1,6 @@
 [![codecov](https://codecov.io/gh/mautic/mautic/branch/features/graph/badge.svg)](https://codecov.io/gh/mautic/mautic)
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-134-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-135-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 About Mautic
@@ -239,6 +239,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/magician7"><img src="https://avatars.githubusercontent.com/u/2359284?v=4?s=100" width="100px;" alt="Damian"/><br /><sub><b>Damian</b></sub></a><br /><a href="https://github.com/mautic/mautic/pulls?q=is%3Apr+reviewed-by%3Amagician7" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/mautic/mautic/issues?q=author%3Amagician7" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/markusVJH"><img src="https://avatars.githubusercontent.com/u/121946942?v=4?s=100" width="100px;" alt="Markus Heinilä"/><br /><sub><b>Markus Heinilä</b></sub></a><br /><a href="https://github.com/mautic/mautic/pulls?q=is%3Apr+reviewed-by%3AmarkusVJH" title="Reviewed Pull Requests">👀</a></td>
     </tr>
   </tbody>
 </table>

app/bundles/LeadBundle/Resources/views/LeadCampaigns/index.html.twig

@@ -5,6 +5,7 @@
 #}
 {% set leadId = lead.id %}
 {% set leadName = lead.primaryIdentifier %}
+{% if campaigns is not empty %}
 <ul class="list-group">
     {% for c in campaigns %}
         {% set switch = c.inCampaign ? 'fa-toggle-on' : 'fa-toggle-off' %}
@@ -16,3 +17,6 @@
     </li>
     {% endfor %}
 </ul>
+{% else %}
+    {{ 'mautic.campaign.lead.notfound'|trans }}
+{% endif %}

app/bundles/LeadBundle/Tests/Controller/LeadDetailFunctionalTest.php

@@ -107,7 +107,7 @@ public function testLeadViewPreventsXSS(): void
         $dataHeader = $anchorTag->attr('data-header');
 
         Assert::assertNull($mouseOver);
-        Assert::assertSame(sprintf('Campaigns %s is part of', $firstName), $dataHeader);
+        Assert::assertSame(sprintf('Campaigns for %s', $firstName), $dataHeader);
         $response = $this->client->getResponse();
         // Make sure the data-target-url is not an absolute URL
         Assert::assertStringContainsString(sprintf('data-target-url="/s/contacts/view/%s/stats"', $lead->getId()), $response->getContent());

app/bundles/LeadBundle/Translations/en_US/messages.ini

@@ -11,6 +11,7 @@ mautic.campaign.lead.updatecompany="Update contact's primary company"
 mautic.contact.error.notfound="Contact not found."
 mautic.campaign.lead.scorecontactscompanies="Score company"
 mautic.campaign.lead.deletecontact="Delete contact"
+mautic.campaign.lead.notfound="There are no campaigns for this contact."
 mautic.campaign.lead.segments="Segments"
 mautic.campaign.lead.tags="Tags"
 mautic.campaign.lead.points="Contact points"
@@ -317,7 +318,7 @@ mautic.lead.lead.filter.bundles.include.placeholder="Include events by source"
 mautic.lead.lead.form.confirmbatchdelete="Delete the selected contacts?"
 mautic.lead.lead.form.confirmdelete="Delete this contact?"
 mautic.lead.lead.form.leadlists="filter by segment..."
-mautic.lead.lead.header.campaigns="Campaigns %name% is part of"
+mautic.lead.lead.header.campaigns="Campaigns for %name%"
 mautic.lead.lead.header.contact.frequency="Contact Preference Center"
 mautic.lead.lead.header.edit="Edit %name%"
 mautic.lead.lead.header.ipaddress="IP Addresses"

app/bundles/PointBundle/Translations/en_US/messages.ini

@@ -11,8 +11,8 @@ mautic.point.form.addaction="Use the list to the right to add an action."
 mautic.point.form.confirmbatchdelete="Delete the selected point actions?"
 mautic.point.form.confirmdelete="Delete the point action, %name%?"
 mautic.point.form.repeat="Is repeatable"
+mautic.point.form.type="Action taken by user"
 mautic.point.form.repeat.help="Enable to score leads multiple times for this action; disable for one-time scoring."
-mautic.point.form.type="When a contact..."
 mautic.point.menu.edit="Edit Point Action"
 mautic.point.menu.index="Manage Actions"
 mautic.point.menu.new="New Point Action"