From db73ed221072f05d24552b565c937c8aeb39560b Mon Sep 17 00:00:00 2001 From: Priyanshi Gaur Date: Fri, 15 Mar 2024 15:08:21 +0530 Subject: [PATCH 01/21] Move tracking script from within Cron Jobs Signed-off-by: Priyanshi Gaur --- docs/configuration/cron_jobs.rst | 19 ------------------ docs/configuration/tracking_script.rst | 27 ++++++++++++++++++++++++++ docs/index.rst | 1 + 3 files changed, 28 insertions(+), 19 deletions(-) create mode 100644 docs/configuration/tracking_script.rst diff --git a/docs/configuration/cron_jobs.rst b/docs/configuration/cron_jobs.rst index 433d6f21..401cb53e 100644 --- a/docs/configuration/cron_jobs.rst +++ b/docs/configuration/cron_jobs.rst @@ -338,22 +338,3 @@ Example output If you have SSH access, try to run the command directly to Select for errors. If there is nothing printed from either in a SSH session or in the cron output, verify in the server's logs. If you see similar errors to ``'Warning: Invalid argument supplied for foreach()' in /vendor/symfony/console/Symfony/Component/Console/Input/ArgvInput.php:287``, you either need to use ``php-cli`` instead of ``php`` or try using ``php -d register_argc_argv=On``. ` -Tracking script -############### - -After installation and setup of the :doc:`/configuration/cron_jobs` you're ready to begin tracking Contacts. You need to add a piece of JavaScript to the websites for each site you wish to track through Mautic. - -This is straightforward process, you can add this tracking script to your website template file, or install a Mautic Integration for the more common Content Management System platforms. - -Here is an example of the tracking JavaScript which you can access by clicking on **Tracking Settings** in the Global Configuration. - - -.. code-block:: javascript - - (function(w,d,t,u,n,a,m){w['MauticTrackingObject']=n; - w[n]=w[n]||function(){(w[n].q=w[n].q||[]).push(arguments)},a=d.createElement(t), - m=d.getElementsByTagName(t)[0];a.async=1;a.src=u;m.parentNode.insertBefore(a,m) - })(window,document,'script','https://example.com/mautic/mtc.js','mt'); - mt('send', 'pageview'); - -You should replace the site URL, ``example.com/mautic`` with the URL to your Mautic instance in the example provided, but it's recommended to copy the whole code block from the tracking settings in your Mautic instance. diff --git a/docs/configuration/tracking_script.rst b/docs/configuration/tracking_script.rst new file mode 100644 index 00000000..caa31d29 --- /dev/null +++ b/docs/configuration/tracking_script.rst @@ -0,0 +1,27 @@ +.. vale off + +Tracking script +############### + +.. vale on + +After installation and setup of the :doc:`/configuration/cron_jobs` you're ready to begin tracking Contacts. You need to add a piece of JavaScript to the websites for each site you wish to track through Mautic. + +This is straightforward process, you can add this tracking script to your website template file, or install a Mautic Integration for the more common Content Management System platforms. + +Here is an example of the tracking JavaScript which you can access by clicking on **Tracking Settings** in the Global Configuration. + + +.. code-block:: javascript + + (function(w,d,t,u,n,a,m){w['MauticTrackingObject']=n; + w[n]=w[n]||function(){(w[n].q=w[n].q||[]).push(arguments)},a=d.createElement(t), + m=d.getElementsByTagName(t)[0];a.async=1;a.src=u;m.parentNode.insertBefore(a,m) + })(window,document,'script','https://example.com/mautic/mtc.js','mt'); + mt('send', 'pageview'); + +You should replace the site URL, ``example.com/mautic`` with the URL to your Mautic instance in the example provided, but it's recommended to copy the whole code block from the tracking settings in your Mautic instance. + +Type: Page Redirect +From URL: /docs/build/html/configuration/cron_jobs.html#tracking-script +To URL: /docs/build/html/configuration/tracking_script.html \ No newline at end of file diff --git a/docs/index.rst b/docs/index.rst index 0b36867c..4e5c8e28 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -54,6 +54,7 @@ There are different types of documentation available to help you navigate your w configuration/maxmind_license configuration/command_line_interface configuration/cron_jobs + configuration/tracking_script configuration/variables configuration/settings From 3659851b5908cabca4ac5a11db03f2b569566219 Mon Sep 17 00:00:00 2001 From: Priyanshi Gaur Date: Fri, 15 Mar 2024 21:18:10 +0530 Subject: [PATCH 02/21] Remove the redirect section from the page Signed-off-by: Priyanshi Gaur --- docs/configuration/tracking_script.rst | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/docs/configuration/tracking_script.rst b/docs/configuration/tracking_script.rst index caa31d29..77f5b826 100644 --- a/docs/configuration/tracking_script.rst +++ b/docs/configuration/tracking_script.rst @@ -20,8 +20,4 @@ Here is an example of the tracking JavaScript which you can access by clicking o })(window,document,'script','https://example.com/mautic/mtc.js','mt'); mt('send', 'pageview'); -You should replace the site URL, ``example.com/mautic`` with the URL to your Mautic instance in the example provided, but it's recommended to copy the whole code block from the tracking settings in your Mautic instance. - -Type: Page Redirect -From URL: /docs/build/html/configuration/cron_jobs.html#tracking-script -To URL: /docs/build/html/configuration/tracking_script.html \ No newline at end of file +You should replace the site URL, ``example.com/mautic`` with the URL to your Mautic instance in the example provided, but it's recommended to copy the whole code block from the tracking settings in your Mautic instance. \ No newline at end of file From 193371cdb7e0ee3e7aac1e752d9fa7f5af389683 Mon Sep 17 00:00:00 2001 From: John Linhart Date: Tue, 7 May 2024 16:19:38 +0200 Subject: [PATCH 03/21] Hide/Unhide themes documented --- docs/themes/manage_themes.rst | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/docs/themes/manage_themes.rst b/docs/themes/manage_themes.rst index 923c5fc2..19b610fa 100644 --- a/docs/themes/manage_themes.rst +++ b/docs/themes/manage_themes.rst @@ -104,6 +104,31 @@ To preview a Theme: .. vale off +Hiding a Theme +****************** + +.. vale on + +Default themes cannot be uninstalled, but they can be hidden from the list of themes in the Email and Page builders. + +To hide a Theme: + +1. Log in to Mautic. + +2. Click the **Settings** icon. + +3. Click **Themes**. + +4. In the Themes section, locate the Theme that you want to hide. + +5. Select the drop-down before the Theme, and click **Hide**. + +6. Mautic moves the Theme to the bottom of the table and show it in grey. This means the theme is hidden in the builders. + +To revert this change open the context menu of the hidden theme and click **Unhide**. + +.. vale off + Downloading a Theme ******************* From 55c63f80ec6568f78f4bbc3dddd5e9247e094b4e Mon Sep 17 00:00:00 2001 From: John Linhart Date: Tue, 7 May 2024 16:26:57 +0200 Subject: [PATCH 04/21] Vale fixes --- docs/themes/manage_themes.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/themes/manage_themes.rst b/docs/themes/manage_themes.rst index 19b610fa..263ff277 100644 --- a/docs/themes/manage_themes.rst +++ b/docs/themes/manage_themes.rst @@ -109,7 +109,7 @@ Hiding a Theme .. vale on -Default themes cannot be uninstalled, but they can be hidden from the list of themes in the Email and Page builders. +Users can't remove defautl Themes, but they can hide them from the list of Themes in the Email and Landing Page builders. To hide a Theme: @@ -123,9 +123,9 @@ To hide a Theme: 5. Select the drop-down before the Theme, and click **Hide**. -6. Mautic moves the Theme to the bottom of the table and show it in grey. This means the theme is hidden in the builders. +6. Mautic moves the Theme to the bottom of the table and show it in grey. This means the Theme is hidden in the builders. -To revert this change open the context menu of the hidden theme and click **Unhide**. +To revert this change open the context menu of the hidden Theme and click **Unhide**. .. vale off From a1b9b6e7aeee1a898b535cfe13b21cc6e760b84c Mon Sep 17 00:00:00 2001 From: John Linhart Date: Tue, 7 May 2024 16:32:48 +0200 Subject: [PATCH 05/21] Typo --- docs/themes/manage_themes.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/themes/manage_themes.rst b/docs/themes/manage_themes.rst index 263ff277..67005cf1 100644 --- a/docs/themes/manage_themes.rst +++ b/docs/themes/manage_themes.rst @@ -109,7 +109,7 @@ Hiding a Theme .. vale on -Users can't remove defautl Themes, but they can hide them from the list of Themes in the Email and Landing Page builders. +Users can't remove default Themes, but they can hide them from the list of Themes in the Email and Landing Page builders. To hide a Theme: From e39051772d0855c4e979ccc329dea803111a519b Mon Sep 17 00:00:00 2001 From: John Linhart Date: Tue, 7 May 2024 16:33:56 +0200 Subject: [PATCH 06/21] Keeping up with the text length :facepalm: --- docs/themes/manage_themes.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/themes/manage_themes.rst b/docs/themes/manage_themes.rst index 67005cf1..d299b159 100644 --- a/docs/themes/manage_themes.rst +++ b/docs/themes/manage_themes.rst @@ -105,7 +105,7 @@ To preview a Theme: .. vale off Hiding a Theme -****************** +************** .. vale on From 4b08c816a4d042ec38851bec64491c30aecfc7d1 Mon Sep 17 00:00:00 2001 From: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Tue, 5 Mar 2024 15:22:48 -0300 Subject: [PATCH 07/21] active --- docs/campaigns/creating_campaigns.rst | 4 ++-- docs/campaigns/managing_campaigns.rst | 2 +- docs/channels/focus_items.rst | 8 ++++---- docs/channels/social_monitoring.rst | 12 ++++++------ docs/configuration/command_line_interface.rst | 2 +- docs/configuration/settings.rst | 6 +++--- docs/contacts/import_contacts.rst | 6 +++--- docs/contacts/manage_contacts.rst | 2 +- docs/plugins/hubspot.rst | 4 ++-- docs/plugins/vtiger.rst | 6 +++--- docs/plugins/zoho_crm.rst | 2 +- docs/points/points.rst | 8 ++++---- docs/segments/manage_segments.rst | 10 +++++----- docs/stages/stages.rst | 2 +- docs/users_roles/managing_roles.rst | 8 ++++---- 15 files changed, 41 insertions(+), 41 deletions(-) diff --git a/docs/campaigns/creating_campaigns.rst b/docs/campaigns/creating_campaigns.rst index f9121209..d5508c99 100644 --- a/docs/campaigns/creating_campaigns.rst +++ b/docs/campaigns/creating_campaigns.rst @@ -5,7 +5,7 @@ Creating Campaigns .. vale on -Creating Campaigns is a central part of the marketing automation process. When you create a new Campaign, you perform the basic administrative tasks such as choosing a name for the Campaign, creating a description, assigning a Category and defining publishing information for the Campaign. +Creating Campaigns is a central part of the marketing automation process. When you create a new Campaign, you perform the basic administrative tasks such as choosing a name for the Campaign, creating a description, assigning a Category and defining activating information for the Campaign. At the heart of any marketing automation Campaign is the Campaign Builder. This allows you to specify how Contacts enter the Campaign, and what happens at every point after they enter the workflow. @@ -51,7 +51,7 @@ To begin creating Campaigns, perform the following steps: - **Category** - Choose a Category to assign your Campaign to. Categories help you organize your Campaigns. To learn more about creating and managing Categories, see :doc:`/categories/categories-overview`. - **Allow Contacts to restart the Campaign** - Click the toggle switch to allow Contacts to restart the Campaign if you're building a Campaign for a recurring message - for example birthdays, subscriptions - or transactional operations - for example activity notifications, updating data. Enabling this option allows Contacts to go through the same Campaign multiple times. -- **Published** - Click the toggle switch to publish or un-publish the Campaign. Ensure that you don't publish a Campaign until you're actually ready for it to go live. You can also schedule to publish or un-publish a Campaign at a future date by selecting a time and date. +- **Active** - Click the toggle switch to enable or disable the Campaign. Ensure that you don't enable a Campaign until you're actually ready for it to go live. You can also schedule to activate or disable a Campaign at a future date by selecting a time and date. #. Click **Launch Campaign Builder** to start building your Campaign, and add at least one event. For information about how to use the Campaign Builder, see :doc:`/campaigns/creating_campaigns`. diff --git a/docs/campaigns/managing_campaigns.rst b/docs/campaigns/managing_campaigns.rst index 93ae3df0..ed7b79a8 100644 --- a/docs/campaigns/managing_campaigns.rst +++ b/docs/campaigns/managing_campaigns.rst @@ -17,7 +17,7 @@ The following image shows a sample Campaign overview with its highlighted panels :width: 600 :alt: Screenshot showing the Campaign overview -The **Details** drop-down menu gives a quick overview of the most important information about your Campaign. This information includes the name of the User who created the Campaign, Category of the Campaign, creation date and time, publishing date and time, Contact Segments in your Campaign and more. +The **Details** drop-down menu gives a quick overview of the most important information about your Campaign. This information includes the name of the User who created the Campaign, Category of the Campaign, creation date and time, activating date and time, Contact Segments in your Campaign and more. The **Campaign Statistics** panel shows the number of Contacts added to the Campaign over the specified period of time in graphical format. To specify the time period, use the From and To date selectors, and click Apply. diff --git a/docs/channels/focus_items.rst b/docs/channels/focus_items.rst index 54648637..e02f3fbb 100644 --- a/docs/channels/focus_items.rst +++ b/docs/channels/focus_items.rst @@ -157,13 +157,13 @@ When creating a new Focus Item, you can set the following fields: **Category** - Assign a Category to help you organize your Focus Items. -**Published** - Whether the Focus Item is available for use - published - or not available - unpublished +**Active** - Whether the Focus Item is available for use - active - or not available - unactive .. vale off -**Publish at (date/time)** - This allows you to define the date and time at which this Text Message is available for sending to Contacts +**Activate at (date/time)** - This allows you to define the date and time at which this Text Message is available for sending to Contacts -**Unpublish at (date/time)** - This allows you to define the date and time at which this Text Message ceases to be available for sending to Contacts. +**Disable at (date/time)** - This allows you to define the date and time at which this Text Message ceases to be available for sending to Contacts. .. vale on @@ -198,7 +198,7 @@ You can use the menu on the sidebar to configure the Focus Item to your liking. Using Focus Items ***************** -Once you have created your Focus Item, you're ready to publish it to your website. If you're not quite ready for the Focus Item to go live but you need to get it set up on your website, you can set the Focus Item to Unpublished. +Once you have created your Focus Item, you're ready to activate it to your website. If you're not quite ready for the Focus Item to go live but you need to get it set up on your website, you can set the Focus Item to unactive. Deploying to a website ====================== diff --git a/docs/channels/social_monitoring.rst b/docs/channels/social_monitoring.rst index 54417724..e977d25a 100644 --- a/docs/channels/social_monitoring.rst +++ b/docs/channels/social_monitoring.rst @@ -42,13 +42,13 @@ When selecting the Twitter Mention monitoring method, the following fields are a There are also the standard Mautic fields available: -**Published** - This allows you to set the published status of the Social Monitor. Unpublished Social Monitors won't collect new Contacts. +**Active** - This allows you to set the activation status of the Social Monitor. Deactivated Social Monitors won't collect new Contacts. .. vale off -**Publish at (date/time)** - This allows you to define the date and time at which this Social Monitor is monitoring for new Contacts. You might use this to coincide with an event, for example. +**Activate at (date/time)** - This allows you to define the date and time at which this Social Monitor is monitoring for new Contacts. You might use this to coincide with an event, for example. -**Unpublish at (date/time)** - This allows you to define the date and time at which this Social Monitor is monitoring for new Contacts. +**Deactivate at (date/time)** - This allows you to define the date and time at which this Social Monitor is monitoring for new Contacts. .. vale on @@ -69,13 +69,13 @@ When selecting the Twitter Hashtags monitoring method, the following fields are There are also the standard Mautic fields available: -**Published** - This allows you to set the published status of the Social Monitor. Unpublished Social Monitors won't collect new Contacts. +**Active** - This allows you to set the activation status of the Social Monitor. Deactivated Social Monitors won't collect new Contacts. .. vale off -**Publish at (date/time)** - This allows you to define the date and time at which this Social Monitor is monitoring for new Contacts. This might be used to coincide with an event, for example. +**Activate at (date/time)** - This allows you to define the date and time at which this Social Monitor is monitoring for new Contacts. This might be used to coincide with an event, for example. -**Unpublish at (date/time)** - This allows you to define the date and time at which this Social Monitor ceases to monitor for new Contacts. +**Deactivate at (date/time)** - This allows you to define the date and time at which this Social Monitor ceases to monitor for new Contacts. .. vale on diff --git a/docs/configuration/command_line_interface.rst b/docs/configuration/command_line_interface.rst index 889c9979..b736c824 100644 --- a/docs/configuration/command_line_interface.rst +++ b/docs/configuration/command_line_interface.rst @@ -90,7 +90,7 @@ These are the commands you may need to use in relation to your Mautic instance. - Rebuild Campaigns based on Contact Segments. - ``mautic:campaigns:update`` * - ``mautic:campaigns:trigger`` - - Trigger timed events for published Campaigns. + - Trigger timed events for active Campaigns. - * - ``mautic:campaigns:validate`` - Validate if a Contact has been inactive for a decision and execute events if so. diff --git a/docs/configuration/settings.rst b/docs/configuration/settings.rst index 7f1ee1dd..595e51ba 100644 --- a/docs/configuration/settings.rst +++ b/docs/configuration/settings.rst @@ -374,7 +374,7 @@ Unsubscribe settings * **Show Contact preference settings** - Select **Yes** to direct the unsubscribe link to your configured Preference enter. If you haven't created a Preference Center, Mautic creates a default page based on the next 5 settings. The created page uses the default Theme for styling. -* **Show Contact Segment preferences** - Select **Yes** to allow a Contact to change which Segments they're part of on the Preference Center page. Segments won't display on the Preference Center page if they aren't published and public. +* **Show Contact Segment preferences** - Select **Yes** to allow a Contact to change which Segments they're part of on the Preference Center page. Segments won't display on the Preference Center page if they aren't active and public. * **Show Contact frequency preferences** - Select **Yes** to allow an individual to limit the number of Marketing Messages they receive on each Channel from the Preference Center. @@ -607,9 +607,9 @@ Notification settings :width: 600 :alt: Screenshot showing Webhook Notification Settings Configuration in Mautic -If a Campaign or Webhook is automatically unpublished because of a high volume of errors, Mautic sends a notification alerting Users. +If a Campaign or Webhook is automatically deactivated because of a high volume of errors, Mautic sends a notification alerting Users. -* **Send notification to author** - Set this field to Yes to send an Email notification to the User who created the unpublished Campaign or Webhook. Deleted Users don't receive notifications. +* **Send notification to author** - Set this field to Yes to send an Email notification to the User who created the deactivated Campaign or Webhook. Deleted Users don't receive notifications. .. vale off diff --git a/docs/contacts/import_contacts.rst b/docs/contacts/import_contacts.rst index b44d7c1d..d0c6fcca 100644 --- a/docs/contacts/import_contacts.rst +++ b/docs/contacts/import_contacts.rst @@ -172,13 +172,13 @@ How to stop a background import 2. In the top right corner of the Contacts page, open the sub menu of actions and select the :ref:`Import History` option. -3. Unpublish the import job you want to stop. The import changes :ref:`status` to Stopped. It finishes importing the current batch and then stops. +3. Deactivate the import job you want to stop. The import changes :ref:`status` to Stopped. It finishes importing the current batch and then stops. -4. To start the import again, publish it, and the background job continues with the next :doc:`cron job execution`. +4. To start the import again, activate it, and the background job continues with the next :doc:`cron job execution`. .. image:: images/import-publish.png :align: center - :alt: Screenshot of Import publish + :alt: Screenshot of Import activation | diff --git a/docs/contacts/manage_contacts.rst b/docs/contacts/manage_contacts.rst index ab5aa8e4..1ef3275e 100644 --- a/docs/contacts/manage_contacts.rst +++ b/docs/contacts/manage_contacts.rst @@ -57,7 +57,7 @@ Add new Contact | -This opens the new Contact screen, where you can enter all the information you have about the Contact. It also displays all published Contact fields when creating a new Contact. +This opens the new Contact screen, where you can enter all the information you have about the Contact. It also displays all available Contact fields when creating a new Contact. Use the tabs at the top to populate existing Custom Fields and social network profiles. diff --git a/docs/plugins/hubspot.rst b/docs/plugins/hubspot.rst index 47670225..4abf7ed5 100644 --- a/docs/plugins/hubspot.rst +++ b/docs/plugins/hubspot.rst @@ -30,7 +30,7 @@ Configure the HubSpot CRM Plugin .. note:: - Be sure to complete all steps before you publish the Plugin. + Be sure to complete all steps before you activate the Plugin. 1. Log in to Mautic instance. @@ -63,7 +63,7 @@ Configure the HubSpot CRM Plugin 9. Click **Save** to save the Plugin configuration. - * If you want to use the Plugin, set the *Publish* switch to **Yes**. Only do this when you have fully configured the Plugin settings. + * If you want to use the Plugin, set the *Active* switch to **Yes**. Only do this when you have fully configured the Plugin settings. 10. Set up the :ref:`cron job` if you haven't already configured it. diff --git a/docs/plugins/vtiger.rst b/docs/plugins/vtiger.rst index a9d86a68..65159125 100644 --- a/docs/plugins/vtiger.rst +++ b/docs/plugins/vtiger.rst @@ -31,7 +31,7 @@ To authenticate the Mautic Plugin to be able to communicate with Vtiger CRM you' * Vtiger username - The username, email address usually, which you use to log in to your Vtiger. -* Vtiger access key - The access key published in your Vtiger profile. To get it, go to Vtiger's **My Preferences**. The Access Key hash is at the bottom of the page. +* Vtiger access key - The access key activated in your Vtiger profile. To get it, go to Vtiger's **My Preferences**. The Access Key hash is at the bottom of the page. .. image:: images/vtiger-mautic.png :alt: Screenshot of Vtiger Mautic Integration @@ -49,9 +49,9 @@ Configure the Vtiger CRM Plugin .. vale on -If you want to use the Plugin, you have to publish it. +If you want to use the Plugin, you have to activate it. -1. Set the *Publish* switch to **Yes**. +1. Set the *Active* switch to **Yes**. 2. In the **Features tab** is Push Contacts to this Integration checkbox and it's checked by default. diff --git a/docs/plugins/zoho_crm.rst b/docs/plugins/zoho_crm.rst index 44602d47..eabaeed1 100644 --- a/docs/plugins/zoho_crm.rst +++ b/docs/plugins/zoho_crm.rst @@ -87,7 +87,7 @@ You can also configure other options: If the values are empty for the Mautic object, a value of 'Unknown' is sent. If the ZohoCRM field is a pick list, be sure the list values of Mautic's field match those of the field in ZohoCRM. -8. Set the Publish switch to **Yes**. +8. Set the Active switch to **Yes**. 9. Click **Save & Close**. .. vale on diff --git a/docs/points/points.rst b/docs/points/points.rst index aa711ceb..19bd68a0 100644 --- a/docs/points/points.rst +++ b/docs/points/points.rst @@ -33,7 +33,7 @@ To add a new action: * **Category** - Organize your Point actions based on their goals, Campaigns, etc. For more information, see :doc:`Categories`. All Points accumulate on a Contact record, regardless of Category. There is one Points score for each Contact. - * **Published and Publish/Unpublish at date/time** - Once you have a Point action, Mautic awards Points when a Contact completes the action. Points aren't given for unpublished actions. If you have target behaviors that you want to award Points for within a certain time period, you can set the publish and unpublish dates + * **Active and Activate/Deactivate at date/time** - Once you have a Point action, Mautic awards Points when a Contact completes the action. Points aren't given for unactive actions. If you have target behaviors that you want to award Points for within a certain time period, you can set the activate and deactivate dates * **Is repeatable** - To award Points each time a Contact completes an action, select **Yes**. If you want to award Points **only** the first time someone completes the action, select **No** - this is the default. @@ -47,7 +47,7 @@ Once a Contact has accumulated a Point total, you may want to trigger an action .. image:: images/points-trigger.png :alt: Screenshot of Points trigger -Creating Point Triggers is like creating Point Actions. The **Name**, **Description**, **Category**, and **Publish** options are all the same. The trigger fires based on the minimum number of Points. Set a number and decide if you want to **Trigger for existing applicable Contacts upon saving - if published**. +Creating Point Triggers is like creating Point Actions. The **Name**, **Description**, **Category**, and **Active** options are all the same. The trigger fires based on the minimum number of Points. Set a number and decide if you want to **Trigger for existing applicable Contacts upon saving - if activated**. Once you have decided and entered those options, go to the **Events** tab. Here, you can trigger one or more events once a Contact has reached your predetermined Point total. These Point triggers and associated events are also fully customizable. @@ -57,12 +57,12 @@ Once you have decided and entered those options, go to the **Events** tab. Here, Campaign triggers ================= -**Modify Contact's Campaigns** - Add a Contact to or remove a Contact from any Campaigns you have published. +**Modify Contact's Campaigns** - Add a Contact to or remove a Contact from any Campaigns you have activated. Contact triggers ================ -**Modify Contact's Segments** - Add a Contact to or remove a Contact from any Segments you have published. +**Modify Contact's Segments** - Add a Contact to or remove a Contact from any Segments you have activated. **Modify Contact's tags** - Add or remove any Tags on the Contact record. If a Tag doesn't exist, you may create a new one in the edit window for this event. diff --git a/docs/segments/manage_segments.rst b/docs/segments/manage_segments.rst index c794ffc7..57cc03f5 100644 --- a/docs/segments/manage_segments.rst +++ b/docs/segments/manage_segments.rst @@ -37,7 +37,7 @@ Creating a Segment * **Available in Preference Center** - If set to **Yes**, Contacts can see and opt into or out of the Segment on a **Preference Center** page. The Segments display if the Preference Center has the **Segment List** slot type. -* **Published** - If set to **No**, the Segment won't be available for use in filters for other Segments, as a Contact source in Campaigns, modify Segment actions, etc. You'll still see the Segment in your **Segment list**, but it essentially won't exist anywhere else in Mautic. +* **Active** - If set to **No**, the Segment won't be available for use in filters for other Segments, as a Contact source in Campaigns, modify Segment actions, etc. You'll still see the Segment in your **Segment list**, but it essentially won't exist anywhere else in Mautic. On the Details tab, static, and dynamic Segments also have the option to display a different public name for a Segment. @@ -496,15 +496,15 @@ It's necessary to configure the :ref:`cron jobs`. .. vale off -Deleting or unpublishing a Segment +Deleting or deactivating a Segment ********************************** .. vale on -Since :xref:`Mautic 4` there is a step when deleting or unpublishing a Segment to ensure that it's not required as a filter by an existing Segment. +Since :xref:`Mautic 4` there is a step when deleting or deactivating a Segment to ensure that it's not required as a filter by an existing Segment. .. image:: images/deleting-used-segment.png :width: 300 - :alt: Screenshot deleting or unpublishing a Segment + :alt: Screenshot deleting or deactivating a Segment -If you attempt to delete or unpublish a Segment which is in use by a filter in another Segment, an alert prompts you to edit the other Segment, removing the dependency before you delete the Segment. \ No newline at end of file +If you attempt to delete or deactivate a Segment which is in use by a filter in another Segment, an alert prompts you to edit the other Segment, removing the dependency before you delete the Segment. \ No newline at end of file diff --git a/docs/stages/stages.rst b/docs/stages/stages.rst index 19b35927..a1c029ed 100644 --- a/docs/stages/stages.rst +++ b/docs/stages/stages.rst @@ -30,7 +30,7 @@ Navigate to the **Stages** section in the left side menu, and then click **+New* **Category** - Assign a Category to help you organize your Stages. For more information, see :ref:`categories`. -**Publish options** - The dashboard widget doesn't display data for an unpublished Stage. In addition, the Segment filters or Campaign conditions don't display the Stage. To avoid using the Stage while building it, set a future publish date and time. If you want the Stage to become unavailable after a certain time, set the date and time for unpublishing. +**Activation options** - The dashboard widget doesn't display data for an unactive Stage. In addition, the Segment filters or Campaign conditions don't display the Stage. To avoid using the Stage while building it, set a future activation date and time. If you want the Stage to become unavailable after a certain time, set the date and time for deactivating. .. vale off diff --git a/docs/users_roles/managing_roles.rst b/docs/users_roles/managing_roles.rst index 2299e432..62e0732a 100644 --- a/docs/users_roles/managing_roles.rst +++ b/docs/users_roles/managing_roles.rst @@ -57,7 +57,7 @@ To configure a Role, leave the **Full System Access** switch at **No** and click :width: 800 :alt: Screenshot showing Mautic Roles -5. Most permission Categories have options for **View**, **Edit**, **Create**, **Delete**, and **Publish**. Select checkboxes for the appropriate permissions for this Role. To select every checkbox and grant the User all permissions, select the **Full** option. +5. Most permission Categories have options for **View**, **Edit**, **Create**, **Delete**, and **Active**. Select checkboxes for the appropriate permissions for this Role. To select every checkbox and grant the User all permissions, select the **Full** option. Explaining the permission options ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -72,15 +72,15 @@ There are several options for selecting permissions: * **Delete** - this allows the Users with this Role to delete resources in this part of Mautic -* **Publish** - this allows the Users with this Role to make resources in this part of Mautic available by publishing them +* **Activate** - this allows the Users with this Role to make resources in this part of Mautic available by activating them * **Full** - this allows the Users with this Role all of the permissions. There are permission levels relating to resources the User has created themselves, and those created by others: -* **Own** - this allows the Users with this Role to ``view/edit/delete/publish`` their own resources in this part of Mautic, but not those created by others +* **Own** - this allows the Users with this Role to ``view/edit/delete/enable`` their own resources in this part of Mautic, but not those created by others -* **Others** - this allows the Users with this Role to ``view/edit/delete/publish`` their own resources in this part of Mautic, and those created by others +* **Others** - this allows the Users with this Role to ``view/edit/delete/enable`` their own resources in this part of Mautic, and those created by others There are permission levels relating to being able to manage resources: From b6a7c0027b7c83018b6935cbe555ab023a54f1dc Mon Sep 17 00:00:00 2001 From: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu, 13 Jun 2024 10:54:20 -0300 Subject: [PATCH 08/21] Update docs/campaigns/creating_campaigns.rst Co-authored-by: Ruth Cheesley --- docs/campaigns/creating_campaigns.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/campaigns/creating_campaigns.rst b/docs/campaigns/creating_campaigns.rst index d5508c99..bdca0f6a 100644 --- a/docs/campaigns/creating_campaigns.rst +++ b/docs/campaigns/creating_campaigns.rst @@ -51,7 +51,7 @@ To begin creating Campaigns, perform the following steps: - **Category** - Choose a Category to assign your Campaign to. Categories help you organize your Campaigns. To learn more about creating and managing Categories, see :doc:`/categories/categories-overview`. - **Allow Contacts to restart the Campaign** - Click the toggle switch to allow Contacts to restart the Campaign if you're building a Campaign for a recurring message - for example birthdays, subscriptions - or transactional operations - for example activity notifications, updating data. Enabling this option allows Contacts to go through the same Campaign multiple times. -- **Active** - Click the toggle switch to enable or disable the Campaign. Ensure that you don't enable a Campaign until you're actually ready for it to go live. You can also schedule to activate or disable a Campaign at a future date by selecting a time and date. +- **Active** - Click the toggle switch to turn the Campaign on or off. Ensure that you don't activate a Campaign until you're actually ready for it to go live. You can also schedule to activate or deactivate a Campaign at a future date by selecting a time and date. #. Click **Launch Campaign Builder** to start building your Campaign, and add at least one event. For information about how to use the Campaign Builder, see :doc:`/campaigns/creating_campaigns`. From f079cb1d6e18ecbe3431108769fe5be145efdaae Mon Sep 17 00:00:00 2001 From: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu, 13 Jun 2024 10:54:31 -0300 Subject: [PATCH 09/21] Update docs/channels/focus_items.rst Co-authored-by: Ruth Cheesley --- docs/channels/focus_items.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/channels/focus_items.rst b/docs/channels/focus_items.rst index b4a551f0..5256235e 100644 --- a/docs/channels/focus_items.rst +++ b/docs/channels/focus_items.rst @@ -154,7 +154,7 @@ When creating a new Focus Item, you can set the following fields: **Category** - Assign a Category to help you organize your Focus Items. -**Active** - Whether the Focus Item is available for use - active - or not available - unactive +**Active** - Whether the Focus Item is available for use - active - or not available - inactive. .. vale off From 6e68f25721f63b10169ce469d6293946b9f47c02 Mon Sep 17 00:00:00 2001 From: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu, 13 Jun 2024 10:56:04 -0300 Subject: [PATCH 10/21] Update docs/channels/focus_items.rst Co-authored-by: Ruth Cheesley --- docs/channels/focus_items.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/channels/focus_items.rst b/docs/channels/focus_items.rst index 5256235e..faf4495f 100644 --- a/docs/channels/focus_items.rst +++ b/docs/channels/focus_items.rst @@ -195,7 +195,7 @@ You can use the menu on the sidebar to configure the Focus Item to your liking. Using Focus Items ***************** -Once you have created your Focus Item, you're ready to activate it to your website. If you're not quite ready for the Focus Item to go live but you need to get it set up on your website, you can set the Focus Item to unactive. +Once you have created your Focus Item, you're ready to activate it to your website. If you're not quite ready for the Focus Item to go live but you need to get it set up on your website, set the Focus Item to inactive. Deploying to a website ====================== From f817f6e914d3a1635c11f0efed2b8aa4e2b2099e Mon Sep 17 00:00:00 2001 From: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu, 13 Jun 2024 10:56:28 -0300 Subject: [PATCH 11/21] Update docs/configuration/settings.rst Co-authored-by: Ruth Cheesley --- docs/configuration/settings.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/configuration/settings.rst b/docs/configuration/settings.rst index d137ce52..a7c02da9 100644 --- a/docs/configuration/settings.rst +++ b/docs/configuration/settings.rst @@ -378,7 +378,7 @@ Unsubscribe settings * **Show Contact preference settings** - Select **Yes** to direct the unsubscribe link to your configured Preference enter. If you haven't created a Preference Center, Mautic creates a default page based on the next 5 settings. The created page uses the default Theme for styling. -* **Show Contact Segment preferences** - Select **Yes** to allow a Contact to change which Segments they're part of on the Preference Center page. Segments won't display on the Preference Center page if they aren't active and public. +* **Show Contact Segment preferences** - Select **Yes** to allow a Contact to change which Segments they're part of on the Preference Center. Segments won't display on the Preference Center page if they aren't active and public. * **Show Contact frequency preferences** - Select **Yes** to allow an individual to limit the number of Marketing Messages they receive on each Channel from the Preference Center. From c0db79660ea0c82717f7fd0c08906aeaafa5e1c6 Mon Sep 17 00:00:00 2001 From: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu, 13 Jun 2024 10:56:37 -0300 Subject: [PATCH 12/21] Update docs/points/points.rst Co-authored-by: Ruth Cheesley --- docs/points/points.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/points/points.rst b/docs/points/points.rst index 2905a79a..e5acf2bb 100644 --- a/docs/points/points.rst +++ b/docs/points/points.rst @@ -34,7 +34,7 @@ To add a new action: * **Category** - Organize your Point Actions based on their goals, Campaigns, etc. For more information, see :doc:`Categories`. All Points accumulate on a Contact record, regardless of Category. There is one Points score for each Contact. - * **Active and Activate/Deactivate at date/time** - Once you have a Point action, Mautic awards Points when a Contact completes the action. Points aren't given for unactive actions. If you have target behaviors that you want to award Points for within a certain time period, you can set the activate and deactivate dates + * **Active and Activate/Deactivate at date/time** - Once you have a Point action, Mautic awards Points when a Contact completes the action. Points aren't given for inactive actions. If you have target behaviors that you want to award Points for within a certain time period, you can set the activate and deactivate dates * **Is repeatable** - To award Points each time a Contact completes an action, select **Yes**. If you want to award Points **only** the first time someone completes the action, select **No** - this is the default. From 9435e882a9815d6f7523bfdc3f940f8bee83d652 Mon Sep 17 00:00:00 2001 From: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu, 13 Jun 2024 10:56:46 -0300 Subject: [PATCH 13/21] Update docs/users_roles/managing_roles.rst Co-authored-by: Ruth Cheesley --- docs/users_roles/managing_roles.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/users_roles/managing_roles.rst b/docs/users_roles/managing_roles.rst index a4aa254d..edd419f2 100644 --- a/docs/users_roles/managing_roles.rst +++ b/docs/users_roles/managing_roles.rst @@ -78,7 +78,7 @@ There are several options for selecting permissions: There are permission levels relating to resources the User has created themselves, and those created by others: -* **Own** - this allows the Users with this Role to ``view/edit/delete/enable`` their own resources in this part of Mautic, but not those created by others +* **Own** - this allows the Users with this Role to ``view/edit/delete/activate`` their own resources in this part of Mautic, but not those created by others * **Others** - this allows the Users with this Role to ``view/edit/delete/enable`` their own resources in this part of Mautic, and those created by others From 54bc50869503986f65931babdf18e2965413e3bd Mon Sep 17 00:00:00 2001 From: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu, 13 Jun 2024 10:56:55 -0300 Subject: [PATCH 14/21] Update docs/stages/stages.rst Co-authored-by: Ruth Cheesley --- docs/stages/stages.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/stages/stages.rst b/docs/stages/stages.rst index a1c029ed..964fba97 100644 --- a/docs/stages/stages.rst +++ b/docs/stages/stages.rst @@ -30,7 +30,7 @@ Navigate to the **Stages** section in the left side menu, and then click **+New* **Category** - Assign a Category to help you organize your Stages. For more information, see :ref:`categories`. -**Activation options** - The dashboard widget doesn't display data for an unactive Stage. In addition, the Segment filters or Campaign conditions don't display the Stage. To avoid using the Stage while building it, set a future activation date and time. If you want the Stage to become unavailable after a certain time, set the date and time for deactivating. +**Activation options** - The dashboard widget doesn't display data for an inactive Stage. In addition, the Segment filters or Campaign conditions don't display the Stage. To avoid using the Stage while building it, set a future activation date and time. If you want the Stage to become unavailable after a certain time, set the date and time for deactivating. .. vale off From 93e95c339aa2e5b6999d94dc3c86418c4b70643c Mon Sep 17 00:00:00 2001 From: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu, 13 Jun 2024 10:57:02 -0300 Subject: [PATCH 15/21] Update docs/users_roles/managing_roles.rst Co-authored-by: Ruth Cheesley --- docs/users_roles/managing_roles.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/users_roles/managing_roles.rst b/docs/users_roles/managing_roles.rst index edd419f2..3b09aa67 100644 --- a/docs/users_roles/managing_roles.rst +++ b/docs/users_roles/managing_roles.rst @@ -80,7 +80,7 @@ There are permission levels relating to resources the User has created themselve * **Own** - this allows the Users with this Role to ``view/edit/delete/activate`` their own resources in this part of Mautic, but not those created by others -* **Others** - this allows the Users with this Role to ``view/edit/delete/enable`` their own resources in this part of Mautic, and those created by others +* **Others** - this allows the Users with this Role to ``view/edit/delete/activate`` their own resources in this part of Mautic, and those created by others There are permission levels relating to being able to manage resources: From 6bf9e34c1cc0f7ec2a008c5aed5f1b758e4a4e0b Mon Sep 17 00:00:00 2001 From: Ruth Cheesley Date: Thu, 13 Jun 2024 16:15:49 +0100 Subject: [PATCH 16/21] Move section --- docs/getting_started/how_to_update_mautic.rst | 79 ++++++++++--------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/docs/getting_started/how_to_update_mautic.rst b/docs/getting_started/how_to_update_mautic.rst index 6dd7c7c4..9c8d2d7c 100644 --- a/docs/getting_started/how_to_update_mautic.rst +++ b/docs/getting_started/how_to_update_mautic.rst @@ -10,6 +10,9 @@ There are two ways to update Mautic: 1. Using the Command Line - recommended 2. Through the User interface +.. note:: + If you installed Mautic using Composer or switched to a Composer-based install, jump straight to the :ref:`Updating Mautic (Composer based installs)` section below. + If your instance is in production, has a large number of Contacts and/or is on shared hosting, it's **strongly** recommended that you update at the command line. .. warning:: @@ -22,50 +25,12 @@ Before you commence updating Mautic, **please ensure that you have a tested back This means that you have downloaded the files and database of your Mautic instance, and you have re-created it in a test environment somewhere and tested that everything is working as expected. This is your only recourse if there are any problems with the update. Never update without having a working, up-to-date backup. -Updating Mautic (Composer based installs) -***************************************** - -The Recommended Project attempts to keep all of your Mautic core files up-to-date. - -The project ``mautic/core-composer-scaffold`` updates your scaffold files whenever there is an update to ``mautic/core-lib``. - -If you customize any of the 'scaffolding' files - commonly ``.htaccess`` - you may need to merge conflicts if new release of Mautic results in changes to your modified files. - -Follow the steps below to update your core files. - -1. Backup your ``composer.lock`` and ``composer.json`` file. If something doesn't work as expected during the ``composer update`` command, restore them and run ``composer install`` to return your codebase to the state it was in before attempting to update. - -2. Edit the ``composer.json`` file, and change all previous versions with the version you wish to update to for all Mautic packages. - - * If you are running ``5.0.4`` and want to update to ``5.1.0``, replace ``5.0.4`` with ``5.1.0`` for all packages that start with ``mautic/`` and currently use ``5.0.4``. - * You may also need to increase the versions of any other packages you have either manually added or added through :ref:`Mautic Marketplace`. - * If you haven't added any extra packages, you can also replace the entire ``composer.json`` file with the newer version from the `repository `_ that matches your desired target version. - -3. Run ``composer update --with-dependencies`` to update all packages. - -4. Run ``git diff`` to determine if any of the scaffolding files have changed. Review the files for any changes and restore any customizations to ``.htaccess`` or others. - -5. Commit everything all together in a single commit, so the ``docroot`` remains in sync with the core when checking out branches or running ``git bisect``. - -6. In the event that there are non-trivial conflicts in step 2, you may wish to perform these steps on a branch, and use ``git merge`` to combine the updated core files with your customized files. This facilitates the use of a three-way merge tool such as :xref:`kdiff3`. This setup isn't necessary if your changes are simple - keeping all of your modifications at the beginning or end of the file is a good strategy to keep merges easy. - -7. Run the following commands to update your database with any changes from the release: - -.. code-block:: shell - - bin/console cache:clear - bin/console mautic:update:apply --finish - bin/console doctrine:migration:migrate --no-interaction - bin/console doctrine:schema:update --no-interaction --force - bin/console cache:clear - - Checking for updates at the command line ======================================== From Mautic 6, the default way to install, update and manage Mautic changes to Composer. -Since Mautic 4.2 deprecated the update feature within the Mautic User interface, you still receive a notification when a new version of Mautic is available until removal of this feature but it's recommended to update via the command line. +Since Mautic 4.2 deprecated the update feature within the Mautic User interface, you still receive a notification when a new version of Mautic is available until removal of this feature, but it's recommended to update via the command line. .. image:: images/gui-update-deprecated.png :width: 700 @@ -109,6 +74,42 @@ Next, a prompt displays asking you to run the command again with this additional php bin/console mautic:update:apply --finish +Updating Mautic (Composer based installs) +***************************************** + +The Recommended Project attempts to keep all of your Mautic core files up-to-date. + +The project ``mautic/core-composer-scaffold`` updates your scaffold files whenever there is an update to ``mautic/core-lib``. + +If you customize any of the 'scaffolding' files - commonly ``.htaccess`` - you may need to merge conflicts if new release of Mautic results in changes to your modified files. + +Follow the steps below to update your core files. + +1. Backup your ``composer.lock`` and ``composer.json`` file. If something doesn't work as expected during the ``composer update`` command, restore them and run ``composer install`` to return your codebase to the state it was in before attempting to update. + +2. Edit the ``composer.json`` file, and change all previous versions with the version you wish to update to for all Mautic packages. + + * If you are running ``5.0.4`` and want to update to ``5.1.0``, replace ``5.0.4`` with ``5.1.0`` for all packages that start with ``mautic/`` and currently use ``5.0.4``. + * You may also need to increase the versions of any other packages you have either manually added or added through :ref:`Mautic Marketplace`. + * If you haven't added any extra packages, you can also replace the entire ``composer.json`` file with the newer version from the `repository `_ that matches your desired target version. + +3. Run ``composer update --with-dependencies`` to update all packages. + +4. Run ``git diff`` to determine if any of the scaffolding files have changed. Review the files for any changes and restore any customizations to ``.htaccess`` or others. + +5. Commit everything all together in a single commit, so the ``docroot`` remains in sync with the core when checking out branches or running ``git bisect``. + +6. In the event that there are non-trivial conflicts in step 2, you may wish to perform these steps on a branch, and use ``git merge`` to combine the updated core files with your customized files. This facilitates the use of a three-way merge tool such as :xref:`kdiff3`. This setup isn't necessary if your changes are simple - keeping all of your modifications at the beginning or end of the file is a good strategy to keep merges easy. + +7. Run the following commands to update your database with any changes from the release: + +.. code-block:: shell + + bin/console cache:clear + bin/console mautic:update:apply --finish + bin/console doctrine:migration:migrate --no-interaction + bin/console doctrine:schema:update --no-interaction --force + bin/console cache:clear Updating in the browser *********************** From f96a9d911bbae2e52d82c5c50d03db7ee37e863d Mon Sep 17 00:00:00 2001 From: "Anderson, from Dropsolid" <116097999+andersonjeccel@users.noreply.github.com> Date: Thu, 13 Jun 2024 12:51:32 -0300 Subject: [PATCH 17/21] Update docs/channels/focus_items.rst Co-authored-by: Ruth Cheesley --- docs/channels/focus_items.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/channels/focus_items.rst b/docs/channels/focus_items.rst index faf4495f..bbec54b5 100644 --- a/docs/channels/focus_items.rst +++ b/docs/channels/focus_items.rst @@ -160,7 +160,7 @@ When creating a new Focus Item, you can set the following fields: **Activate at (date/time)** - This allows you to define the date and time at which this Text Message is available for sending to Contacts -**Disable at (date/time)** - This allows you to define the date and time at which this Text Message ceases to be available for sending to Contacts. +**Deactivate at (date/time)** - This allows you to define the date and time at which this Text Message ceases to be available for sending to Contacts. .. vale on From 0ea0fc7f2b7c40065c4bac75d1aa9b5658523406 Mon Sep 17 00:00:00 2001 From: "Anderson, from Dropsolid" <116097999+andersonjeccel@users.noreply.github.com> Date: Thu, 13 Jun 2024 12:51:39 -0300 Subject: [PATCH 18/21] Update docs/configuration/settings.rst Co-authored-by: Ruth Cheesley --- docs/configuration/settings.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/configuration/settings.rst b/docs/configuration/settings.rst index a7c02da9..ab79c1ea 100644 --- a/docs/configuration/settings.rst +++ b/docs/configuration/settings.rst @@ -378,7 +378,7 @@ Unsubscribe settings * **Show Contact preference settings** - Select **Yes** to direct the unsubscribe link to your configured Preference enter. If you haven't created a Preference Center, Mautic creates a default page based on the next 5 settings. The created page uses the default Theme for styling. -* **Show Contact Segment preferences** - Select **Yes** to allow a Contact to change which Segments they're part of on the Preference Center. Segments won't display on the Preference Center page if they aren't active and public. +* **Show Contact Segment preferences** - Select **Yes** to allow a Contact to change which Segments they're part of on the Preference Center. Segments won't display on the Preference Center if they aren't active and public. * **Show Contact frequency preferences** - Select **Yes** to allow an individual to limit the number of Marketing Messages they receive on each Channel from the Preference Center. From 75d1b6b98e18bfa0cf7ecd9982fb369c198bad7b Mon Sep 17 00:00:00 2001 From: John Linhart Date: Fri, 14 Jun 2024 09:38:55 +0200 Subject: [PATCH 19/21] vale fix Co-authored-by: Ruth Cheesley --- docs/themes/manage_themes.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/themes/manage_themes.rst b/docs/themes/manage_themes.rst index d299b159..0d8d3867 100644 --- a/docs/themes/manage_themes.rst +++ b/docs/themes/manage_themes.rst @@ -123,7 +123,7 @@ To hide a Theme: 5. Select the drop-down before the Theme, and click **Hide**. -6. Mautic moves the Theme to the bottom of the table and show it in grey. This means the Theme is hidden in the builders. +6. Mautic moves the Theme to the bottom of the table and show it in grey, which hides it within builders. To revert this change open the context menu of the hidden Theme and click **Unhide**. From 5b05a0fdc1189bb7396400461f2ef3cd3c501911 Mon Sep 17 00:00:00 2001 From: Ruth Cheesley Date: Mon, 17 Jun 2024 15:55:36 +0100 Subject: [PATCH 20/21] Update FeatureList.yml --- .github/styles/Mautic/FeatureList.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/styles/Mautic/FeatureList.yml b/.github/styles/Mautic/FeatureList.yml index a0c65bd1..3b807561 100644 --- a/.github/styles/Mautic/FeatureList.yml +++ b/.github/styles/Mautic/FeatureList.yml @@ -49,6 +49,8 @@ swap: point groups: Point Groups plugin: Plugin plugins: Plugins + publish: Activate or Turn On + published: Active or Available report: Report reports: Reports role: Role @@ -59,7 +61,9 @@ swap: stages: Stages theme: Theme themes: Themes + unpublish: Deactivate or Turn Off + unpublished: Unavailable or Deactivated user: User users: Users webhook: Webhook - webhooks: Webhooks \ No newline at end of file + webhooks: Webhooks From 8d2315f816eaca9b26908d6ea4fa059bfd0451b9 Mon Sep 17 00:00:00 2001 From: John Linhart Date: Tue, 18 Jun 2024 11:28:28 +0200 Subject: [PATCH 21/21] Apply suggestions from code review Co-authored-by: Ruth Cheesley --- docs/themes/manage_themes.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/themes/manage_themes.rst b/docs/themes/manage_themes.rst index 0d8d3867..079dd7ae 100644 --- a/docs/themes/manage_themes.rst +++ b/docs/themes/manage_themes.rst @@ -124,8 +124,10 @@ To hide a Theme: 5. Select the drop-down before the Theme, and click **Hide**. 6. Mautic moves the Theme to the bottom of the table and show it in grey, which hides it within builders. +.. vale off To revert this change open the context menu of the hidden Theme and click **Unhide**. +.. vale on .. vale off