Skip to content

Commit 812c0e1

Browse files
adiati98adiati98
authored
Merge branch '5.x' into adding-flash-messages
2 parents bfd1194 + 5d81b74 commit 812c0e1

19 files changed

Lines changed: 1661 additions & 68 deletions

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ cron
4242
Cron
4343
CTRL
4444
datetime
45+
DBAL
4546
DDEV
4647
DNC
4748
Do Not Contact
@@ -81,6 +82,7 @@ initialisms
8182
ISO
8283
JavaScript
8384
Joomla
85+
jQuery
8486
Legacy Builder
8587
Libre
8688
Licensor

‎docs/index.rst‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,25 @@ Welcome to the Mautic Developer Documentation. The documentation broadly covers
1717

1818
This documentation has multiple versions for different releases of Mautic starting from Mautic 4.x - the switcher is in the bottom left which allows you to change between versions.
1919

20+
.. vale off
21+
2022
Submitting code to Mautic
2123
*************************
2224

25+
.. vale on
26+
2327
Development is open and available to any member of the Mautic community. All fixes and improvements happen through pull requests to the code on :xref:`Mautic's GitHub Repo`. This code is open source and publicly available.
2428

2529
Read all about contributing to Mautic as a Developer in the :xref:`Mautic Developer Contribution Guide`.
2630

2731
Read more about Mautic's :xref:`Mautic Code Governance` and the :xref:`Mautic Project Governance` model.
2832

33+
.. vale off
34+
2935
Your code must follow the :xref:`Symfony coding standards`. You can find details about where Mautic deviates from these standards documented in the :doc:`/plugins/mautic_vs_symfony` section.
3036

37+
.. vale on
38+
3139
Where to get help
3240
*****************
3341

@@ -206,8 +214,8 @@ There are several ways to support Mautic other than contributing with code.
206214
:caption: REST API
207215
:hidden:
208216

209-
rest_api/api_intro
210-
rest_api/authorization
217+
rest_api/getting_started
218+
rest_api/authentication
211219
rest_api/assets
212220
rest_api/campaigns
213221
rest_api/categories

‎docs/links/client_credentials_support.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
from . import link
2+
3+
link_name = "Client Credentials Support"
4+
link_text = "Client Credentials Support"
5+
link_url = "https://github.com/mautic/api-library/pull/269"
6+
7+
link.xref_links.update({link_name: (link_text, link_url)})

‎docs/links/mautic-api-obtain-access-token.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
from . import link
2+
3+
link_name = "Obtaining an access token"
4+
link_text = "Obtaining an access token"
5+
link_url = "https://github.com/mautic/api-library?tab=readme-ov-file#obtaining-an-access-token"
6+
7+
link.xref_links.update({link_name: (link_text, link_url)})

‎docs/links/mautic-api-using-basic-auth.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
from . import link
2+
3+
link_name = "using basic auth"
4+
link_text = "Using Basic Authentication"
5+
link_url = "https://github.com/mautic/api-library?tab=readme-ov-file#using-basic-authentication-instead"
6+
7+
link.xref_links.update({link_name: (link_text, link_url)})

‎docs/links/mauticReportBuilder_52.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
from . import link
2+
3+
link_name = "MauticReportBuilder"
4+
link_text = "MauticReportBuilder"
5+
link_url = "https://github.com/mautic/mautic/blob/5.2/app/bundles/ReportBundle/Builder/MauticReportBuilder.php"
6+
7+
link.xref_links.update({link_name: (link_text, link_url)})

‎docs/links/mautic_chart_helpers_folder_52.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
from . import link
2+
3+
link_name = "Mautic CoreBundle Chart Helpers"
4+
link_text = "Mautic CoreBundle Chart Helpers"
5+
link_url = "https://github.com/mautic/mautic/tree/5.2/app/bundles/CoreBundle/Helper/Chart"
6+
7+
link.xref_links.update({link_name: (link_text, link_url)})

‎docs/links/mautic_reportGeneratorEvent_52.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
from . import link
2+
3+
link_name = "Mautic ReportGeneratorEvent"
4+
link_text = "Mautic ReportGeneratorEvent"
5+
link_url = "https://github.com/mautic/mautic/blob/5.2/app/bundles/ReportBundle/Event/ReportGeneratorEvent.php"
6+
7+
link.xref_links.update({link_name: (link_text, link_url)})

‎docs/links/symfony_api_cache.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
from . import link
2+
3+
link_name = "Symfony Cache Documentation"
4+
link_text = "Symfony Cache Documentation"
5+
link_url = "https://symfony.com/doc/5.4/cache.html#configuring-cache-with-frameworkbundle"
6+
7+
link.xref_links.update({link_name: (link_text, link_url)})

‎docs/links/symfony_controller_accessing_services_docs.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
from . import link
2+
3+
link_name = "fetching services"
4+
link_text = "fetching services"
5+
link_url = "https://symfony.com/doc/current/controller.html#controller-accessing-services"
6+
7+
link.xref_links.update({link_name: (link_text, link_url)})

0 commit comments

Comments
 (0)