Merge branch '7.1' into cherry-pick-349-b71

Author: RCheesley

docs/channels/emails.rst

@@ -187,6 +187,28 @@ To use custom date fields in tokens, use the following format:
 
 The date outputs in a human-readable format, configured in the settings in your Global Configuration > System Settings under 'Default format for date only' and 'Default time only format'.
 
+Label modifier for select and boolean fields
+--------------------------------------------
+
+For select and boolean field types, you can display the human-readable label instead of the stored value by using the ``|label`` modifier:
+
+.. code-block:: php
+
+   {contactfield=select_alias|label}
+   {contactfield=bool_alias|label}
+
+This is particularly useful when these fields contain technical values, but you want to show user-friendly labels in your Emails. For instance:
+
+* A country selection field storing ``us`` can display ``United States``
+* A boolean field storing ``1`` can display ``Yes``
+
+The modifier also works with Company fields:
+
+.. code-block:: php
+
+   {contactfield=company_select_alias|label}
+   {contactfield=company_bool_alias|label}
+
 Contact replies
 ===============
 

docs/components/forms.rst

@@ -80,6 +80,8 @@ To control the maximum number of fields shown on a Form:
 To add a new field to your Form:
 
 #. Click the Add a new field dropdown and select the type of field you wish to use. Available fields include:
+   
+   - **boolean** - This field provides a TRUE/FALSE or yes/no selection. You can configure it to display positive, negative, or both labels. Use this field for binary choices, such as agreeing to terms or opting into communications.
 
    - **CAPTCHA** - A basic tool for spam protection requiring the Form submitter to answer a question, or detecting when spambots try to submit data in a hidden CAPTCHA field - sometimes referred to as a honeypot. It's recommended to use some kind of CAPTCHA on every Form. It's also possible to support reCAPTCHA and other tools with third-party Plugins.
 

docs/configuration/settings.rst

@@ -321,6 +321,8 @@ Mail send settings
 
 * **Custom return path (bounce) address** - Set a custom return path/bounce Email address for Emails sent from the system. Note that some mail transports, such as GMail, won't support this.
 
+* **Email address length limit** - This setting determines the maximum allowed length for Email addresses, including the display name. The default value is 320 characters. If an Email address - including the display name - exceeds this limit, Mautic uses only the Email address without the display name when sending Emails. This helps prevent errors with Email servers that have strict length restrictions. You can adjust this value if you need to accommodate longer Email addresses or if you want to set a more restrictive limit.
+
 * **Mailer is owner** - If Contacts in Mautic have owners, select Yes to use the Contact owner as the sender of Emails to any Contacts they're listed as the owner for.
 
 .. note:: 
@@ -673,8 +675,6 @@ Mautic tracking settings
 
     The default tracking code provided in a new instance updates and changes after you set up a new custom domain or when you make changes to an existing one. You must use the new tracking code that reflects the new or edited custom domain. If you are using the Plugin for WordPress, Drupal, or Joomla, re-enter your account information in the Plugin.
 
-* **Identify visitor by tracking URL** - Select **Yes** to have Mautic begin tracking a Contact after the Contact clicks a link in an Email on a device where no cookie exists.
-
 * **Anonymize IP** - Select **Yes** to not store full IP addresses for your visitors/Contacts. This setting aids customers in achieving General Data Protection Regulation compliance.
 
 * **Identify visitors by IP** - Select **Yes** to use the IP address to identify Contacts. It's possible to track unidentified visitors with the same IP address as an existing Contact. This may result in undesirable outcomes with large Companies who use the same externally facing IP address.

docs/configuration/variables.rst

@@ -8,6 +8,41 @@ Variables
 
   ``Hi {contactfield=firstname|there},``
 
+Token modifiers
+***************
+
+Label modifier for select and boolean fields
+============================================
+
+For select and boolean type fields, you can use the ``|label`` modifier to display the human-readable label instead of the stored value. It's beneficial when your select fields store values like codes or IDs, but you want to display friendly labels to your Contacts.
+
+**Syntax:**
+
+.. code-block:: text
+
+   {contactfield=field_alias|label}
+
+**Examples:**
+
+* For a select field with alias ``country_select`` that has options, such as ``us`` for ``United States`` or ``uk`` for ``United Kingdom``:
+
+   * ``{contactfield=country_select}`` displays the value ``us``
+   * ``{contactfield=country_select|label}`` displays the label ``United States``
+
+* For a boolean field with alias ``is_subscriber``:
+
+   * ``{contactfield=is_subscriber}`` displays the value ``1`` or ``0``
+   * ``{contactfield=is_subscriber|label}`` displays the label ``Yes`` or ``No``
+
+* For both Contact fields and Company fields:
+
+   * ``{contactfield=company_type|label}`` displays the label of a Company select field
+   * ``{contactfield=company_active|label}`` displays the label of a Company boolean field
+
+.. note::
+
+   The ``|label`` modifier only works with select and boolean field types. For other field types, it displays the regular value.
+
 Contact fields
 **************
 

docs/contacts/contacts_overview.rst

@@ -65,6 +65,6 @@ Changing the view
 
 By default Mautic uses the **list view**, but you can also choose to switch to the **card view** also known as **grid view**, which uses avatars to depict the Contacts visually using cards. 
 
-If you'd like to see your Contacts in the card view, click the **C** button while you're looking at the Contact list. To go back to the table or list view, press the **T** key.
+Press **V** on your keyboard to switch between the list and card views.
 
 The :ref:`Manage Contacts<managing contacts>` section provides more information on how you can work with Contacts in Mautic.