Skip to content

Commit 443b86c

Browse files
Merge remote-tracking branch 'origin/7.1' into promptless/notes-permissions
# Conflicts: # docs/contacts/manage_contacts.rst
2 parents 5df0e07 + d420a03 commit 443b86c

32 files changed

Lines changed: 849 additions & 46 deletions

.all-contributorsrc

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,124 @@
122122
"contributions": [
123123
"doc"
124124
]
125+
},
126+
{
127+
"login": "fee-sah-yor",
128+
"name": "fisayo~",
129+
"avatar_url": "https://avatars.githubusercontent.com/u/101174144?v=4",
130+
"profile": "https://github.com/fee-sah-yor",
131+
"contributions": [
132+
"doc"
133+
]
134+
},
135+
{
136+
"login": "pedaars",
137+
"name": "Aaron Pedwell",
138+
"avatar_url": "https://avatars.githubusercontent.com/u/11647950?v=4",
139+
"profile": "https://pedaars.co.uk",
140+
"contributions": [
141+
"doc"
142+
]
143+
},
144+
{
145+
"login": "adiati98",
146+
"name": "Ayu Adiati",
147+
"avatar_url": "https://avatars.githubusercontent.com/u/45172775?v=4",
148+
"profile": "https://adiati.com",
149+
"contributions": [
150+
"doc",
151+
"review"
152+
]
153+
},
154+
{
155+
"login": "beneyalraj",
156+
"name": "Abi beniyal",
157+
"avatar_url": "https://avatars.githubusercontent.com/u/42829681?v=4",
158+
"profile": "https://github.com/beneyalraj",
159+
"contributions": [
160+
"doc"
161+
]
162+
},
163+
{
164+
"login": "favour-chibueze",
165+
"name": "Favour Chibueze ",
166+
"avatar_url": "https://avatars.githubusercontent.com/u/46398983?v=4",
167+
"profile": "https://github.com/favour-chibueze",
168+
"contributions": [
169+
"review"
170+
]
171+
},
172+
{
173+
"login": "adi-ray",
174+
"name": "Aditya Ray",
175+
"avatar_url": "https://avatars.githubusercontent.com/u/96347576?v=4",
176+
"profile": "https://www.adityaray.xyz",
177+
"contributions": [
178+
"doc"
179+
]
180+
},
181+
{
182+
"login": "ashwini2k6",
183+
"name": "Ashwini Kumar",
184+
"avatar_url": "https://avatars.githubusercontent.com/u/217481134?v=4",
185+
"profile": "https://github.com/ashwini2k6",
186+
"contributions": [
187+
"doc"
188+
]
189+
},
190+
{
191+
"login": "Lokesh9106",
192+
"name": "Lokesh9106",
193+
"avatar_url": "https://avatars.githubusercontent.com/u/231150390?v=4",
194+
"profile": "https://github.com/Lokesh9106",
195+
"contributions": [
196+
"doc"
197+
]
198+
},
199+
{
200+
"login": "sudohogan",
201+
"name": "Isreal Hogan",
202+
"avatar_url": "https://avatars.githubusercontent.com/u/101266221?v=4",
203+
"profile": "https://portfolio-dun-one-68.vercel.app",
204+
"contributions": [
205+
"doc"
206+
]
207+
},
208+
{
209+
"login": "mheavey2",
210+
"name": "Margaret",
211+
"avatar_url": "https://avatars.githubusercontent.com/u/85061867?v=4",
212+
"profile": "https://github.com/mheavey2",
213+
"contributions": [
214+
"doc"
215+
]
216+
},
217+
{
218+
"login": "simachines",
219+
"name": "ErnestB",
220+
"avatar_url": "https://avatars.githubusercontent.com/u/70729135?v=4",
221+
"profile": "https://github.com/simachines",
222+
"contributions": [
223+
"doc"
224+
]
225+
},
226+
{
227+
"login": "msoukhomlinov",
228+
"name": "Max Soukhomlinov",
229+
"avatar_url": "https://avatars.githubusercontent.com/u/12015350?v=4",
230+
"profile": "https://github.com/msoukhomlinov",
231+
"contributions": [
232+
"doc"
233+
]
234+
},
235+
{
236+
"login": "stefan-franz",
237+
"name": "Stefan Franz",
238+
"avatar_url": "https://avatars.githubusercontent.com/u/96744684?v=4",
239+
"profile": "https://github.com/stefan-franz",
240+
"contributions": [
241+
"doc"
242+
]
125243
}
126244
],
127245
"contributorsPerLine": 7,

.github/styles/config/vocabularies/Mautic/accept.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ boolean
1717
booleans
1818
cc
1919
CCPA
20+
CKEditor
2021
Citrix
2122
Clearbit
2223
CloudAMQP
@@ -123,6 +124,7 @@ SMTP
123124
SNS
124125
SparkPost
125126
SSO
127+
strikethrough
126128
sublicense
127129
SugarCRM
128130
Suhosin

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
5858
<td align="center" valign="top" width="14.28%"><a href="https://portfolio-dun-one-68.vercel.app"><img src="https://avatars.githubusercontent.com/u/101266221?v=4?s=100" width="100px;" alt="Isreal Hogan"/><br /><sub><b>Isreal Hogan</b></sub></a><br /><a href="https://github.com/mautic/user-documentation/commits?author=sudohogan" title="Documentation">📖</a></td>
5959
<td align="center" valign="top" width="14.28%"><a href="https://github.com/mheavey2"><img src="https://avatars.githubusercontent.com/u/85061867?v=4?s=100" width="100px;" alt="Margaret"/><br /><sub><b>Margaret</b></sub></a><br /><a href="https://github.com/mautic/user-documentation/commits?author=mheavey2" title="Documentation">📖</a></td>
6060
<td align="center" valign="top" width="14.28%"><a href="https://github.com/simachines"><img src="https://avatars.githubusercontent.com/u/70729135?v=4?s=100" width="100px;" alt="ErnestB"/><br /><sub><b>ErnestB</b></sub></a><br /><a href="https://github.com/mautic/user-documentation/commits?author=simachines" title="Documentation">📖</a></td>
61+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/msoukhomlinov"><img src="https://avatars.githubusercontent.com/u/12015350?v=4?s=100" width="100px;" alt="Max Soukhomlinov"/><br /><sub><b>Max Soukhomlinov</b></sub></a><br /><a href="https://github.com/mautic/user-documentation/commits?author=msoukhomlinov" title="Documentation">📖</a></td>
62+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/stefan-franz"><img src="https://avatars.githubusercontent.com/u/96744684?v=4?s=100" width="100px;" alt="Stefan Franz"/><br /><sub><b>Stefan Franz</b></sub></a><br /><a href="https://github.com/mautic/user-documentation/commits?author=stefan-franz" title="Documentation">📖</a></td>
6163
</tr>
6264
</tbody>
6365
</table>

docs/authentication/authentication.rst

Lines changed: 52 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,38 +32,50 @@ To turn on SAML support in Mautic, you first need the IDP's metadata XML which t
3232
:width: 800
3333
:alt: Screenshot of the User Role Permission
3434

35+
.. vale off
36+
3537
Configuring the IDP
3638
===================
39+
40+
.. vale on
41+
3742
The IDP may ask for the following settings:
3843

39-
#. Entity ID - this is site URL, displayed at the top of User/Authentication Settings. Copy this exactly 'as is' to the IDP.
44+
.. vale off
45+
46+
#. **Entity ID** - This is the site URL, displayed at the top of **User/Authentication Settings**. Copy this exactly as is to the IDP.
4047

41-
#. Service Provider Metadata - if the provider requires a URL, use ``https://example.com/saml/metadata.xml``. To use as a file rather than a URL, browse to that URL and save the content as an XML file.
48+
.. note::
4249

43-
#. Assertion Consumer Service - Use ``https://example.com/s/saml/login_check``.
50+
If you use a custom domain, set the site URL in **Configuration** > **System Settings** to match it. This keeps your SAML setup working correctly.
4451

45-
#. Issuer - this should come from the IDP but is often configurable. If it's a URL, be sure that the scheme - ``http://`` and ``https://`` - aren't part of it.
52+
#. **Service Provider Metadata** - If the provider requires a URL, use ``https://example.com/saml/metadata.xml``. If it needs a file instead of a URL, open the URL in a browser and save the content as an XML file.
53+
#. **Assertion Consumer Service** - Use ``https://example.com/s/saml/login_check``.
54+
#. **Issuer** - It should come from the IDP but is often configurable. If it's a URL, be sure that the scheme - ``http://`` or ``https://`` - isn't part of it.
55+
#. **Verify request signatures or an SSL certificate** - If the IDP supports encrypting and validating request signatures from Mautic to the IDP, generate a self-signed SSL certificate. Upload the certificate and private key through Mautic's **Configuration** > **User/Authentication Settings** under the "**Use a custom X.509 certificate and private key to secure communication between Mautic and the IDP**" section. Then upload the certificate to the IDP.
56+
#. **Custom attributes** - Mautic requires three custom attributes in the IDP responses - email, first name, and last name - and can optionally include a username. Configure the attribute names used by the IDP in Mautic's **Configuration** > **User/Authentication Settings** under the "**Enter the names of the attributes the configured IDP uses for the following Mautic User fields**" section.
4657

47-
#. Verify request signatures or a SSL certificate - If the IDP supports encrypting and validating request signatures from Mautic to the IDP, generate a self signed SSL certificate. Upload the certificate and private key through Mautic's Configuration > User/Authentication Settings under the 'Use a custom X.509 certificate and private key to secure communication between Mautic and the IDP' section. Then upload the certificate to the IDP.
58+
.. vale on
4859
49-
#. Custom attributes - Mautic requires three custom attributes in the IDP responses for the User Email, first name and last name. Username is also supported but is optional. Configure the attribute names used by the IDP in Mautic's Configuration > User/Authentication Settings under the 'Enter the names of the attributes the configured IDP uses for the following Mautic User fields' section.
60+
.. vale off
5061
5162
Example - Azure SAML SSO
5263
========================
5364

54-
1) Register new Enterprise applications by navigating to ``Create your own Application`` and then ``Integrate any other application you don't find in the gallery (Non-gallery)``
55-
2) Go to Single Sign-On
56-
3) ``Identifier (Entity ID)`` - this is the site URL located at the top of User/Authentication Settings. Copy this exactly as is to the IDP.
57-
4) ``Reply URL (Assertion Consumer Service URL)`` - Use ``https://example.com/s/saml/login_check``
58-
5) Download Federation Metadata XML from 3. SAML Certificates
59-
6) Upload the downloaded Federation Metadata XML to Mautic
60-
7) X.509-Certificate isn't required
61-
8) Use the following for the custom attributes fields:
65+
#. Register a new application by going to **Enterprise Applications**, clicking **Create your own application**, and selecting **Integrate any other application you don't find in the gallery (Non-gallery)**.
66+
#. Go to the **Single sign-on** menu.
67+
#. **Entity ID** - This is the site URL, displayed at the top of **User/Authentication Settings**. Copy this exactly as is to the IDP.
68+
#. **Reply URL (Assertion Consumer Service URL)** - Use ``https://example.com/s/saml/login_check``.
69+
#. In the **SAML Certificates** section, download the **Federation Metadata XML**.
70+
#. Upload the downloaded **Federation Metadata XML** file to the **Identity provider metadata file** field in Mautic, and leave the **X.509 Certificate** field blank.
71+
#. Use the following for the custom attributes fields:
6272

63-
E-Mail: ``http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress``
64-
First Name: ``http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname``
65-
Last Name: ``http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname``
66-
Username (optional): ``http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress``
73+
* **E-Mail**: ``http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress``
74+
* **First Name**: ``http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname``
75+
* **Last Name**: ``http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname``
76+
* **Username (optional)**: ``http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name``
77+
78+
.. vale on
6779
6880
Logging in
6981
==========
@@ -72,6 +84,28 @@ Once configured with the IDP and the IDP with Mautic, Mautic redirects all login
7284

7385
Login to the IDP, which then redirects you back to Mautic. If the exchange is successful Mautic creates a User if it doesn't already exist, and logs the User into the system.
7486

87+
.. vale off
88+
89+
Managing passwords for SAML-authenticated Users
90+
===============================================
91+
92+
.. vale on
93+
94+
.. vale off
95+
96+
Mautic hides the password fields on the Account page and User edit form for SAML-authenticated Users. SAML-authenticated Users log in through the identity provider, so they manage their passwords there, not in Mautic.
97+
98+
.. vale on
99+
100+
Recovering from a login error
101+
=============================
102+
103+
.. vale off
104+
105+
A SAML login can fail if the session expires or if Mautic receives an unexpected response from the IDP, such as the intermittent 'Unknown Response' error. When this happens, Mautic clears the session and shows a retry screen. Select the login button to try again. If the error keeps happening, contact your administrator.
106+
107+
.. vale on
108+
75109
Turning off SAML
76110
================
77111

docs/builders/email_landing_page.rst

Lines changed: 48 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,28 @@ Asset manager
6060

6161
With the Asset Manager is easier to organize your media files and it's enough to double click the image to change it.
6262

63+
Editing text
64+
============
65+
66+
GrapesJS uses inline text editing powered by CKEditor. Double click a text Component to open the inline editor and edit directly on the canvas.
67+
68+
The inline editor includes standard formatting options:
69+
70+
* Bold, italic, underline and strikethrough
71+
* Font family, font color and font background color
72+
* Text alignment
73+
* Ordered and unordered lists
74+
* Headings
75+
* Links and anchors
76+
* Tables
77+
* Tokens for personalization
78+
79+
You can paste content from external sources like Microsoft Word or Google Docs. The editor keeps basic formatting and adapts it for Email and Landing Page layouts.
80+
81+
.. tip::
82+
83+
Click outside the text Component to finish editing and return to the canvas.
84+
6385
About the builder
6486
*****************
6587

@@ -125,12 +147,35 @@ Themes
125147

126148
If you search through the list of available Themes, the new MJML Themes ``Brienz``, ``Paprika`` and ``Confirm Me`` display only with the new Builder.
127149

128-
To learn more about creating Themes please :doc:`check the documentation</builders/creating_themes>`.
150+
To learn more about creating Themes, see :doc:`/builders/creating_themes`.
151+
152+
Typography
153+
**********
154+
155+
The Style Manager includes a Typography section for styling text Components. Select a text Component on the canvas, then open the Style panel to reach these controls:
156+
157+
* **Font family** - choose from the available fonts
158+
* **Font size** - set the text size in pixels
159+
* **Font weight** - adjust the weight from light to bold
160+
* **Letter spacing** - control the spacing between characters
161+
* **Color** - set the text color
162+
* **Line height** - adjust the vertical spacing between lines
163+
* **Text align** - align text left, center, right, or justify
164+
* **Text decoration** - apply none, underline, or strikethrough
165+
* **Font style** - switch between normal and italic
166+
167+
Mautic resolves typography across three levels, where each level overrides the one before it:
168+
169+
#. **Theme defaults** - the base styles defined by the Theme.
170+
#. **Component typography** - the Style Manager settings listed in this section, which apply to the selected Component.
171+
#. **Inline editor** - the formatting you apply to individual characters or words with the CKEditor inline toolbar when you double click a text Component.
172+
173+
Use the Component typography controls to fine-tune headings, paragraphs, and other text elements in legacy Themes that lack modern styling flexibility.
129174

130175
Custom fonts
131-
************
176+
============
132177

133-
From Mautic 5.x you can extend the Style Manager > Typography > Fonts list to include custom fonts.
178+
You can extend the **Typography** > **Fonts** list to include custom fonts.
134179

135180
.. image:: images/editorfonts.jpg
136181
:width: 280

0 commit comments

Comments
 (0)