Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
26be57b
move lost grapesjs documentation to docs, small improves
adiux Jun 8, 2022
8de94d8
Fix vale errors and warnings
RCheesley Jun 24, 2022
6703c1c
Fix incorrect link ref
RCheesley Jun 24, 2022
f9a3dc2
Fix case-sensitive link
RCheesley Jun 24, 2022
20e691b
REST API: port forms documentation
Jul 25, 2023
60ba7f4
Add menu item + small fixes
Jul 25, 2023
25e4854
REST API: Add Companies documentation
Jul 25, 2023
8163fc3
Tiny fix
Jul 25, 2023
a1449d4
Update A/B testing link
Jul 25, 2023
0ccad7a
Fix final linting errors
Jul 25, 2023
83d3d24
Fix final linting errors
Jul 25, 2023
534045f
Final linting fixes
Jul 25, 2023
067d6c0
Fix broken link on dev env section
RCheesley Jul 25, 2023
3c20226
Merge pull request #138 from mautic/update-ab-testing-link
RCheesley Jul 25, 2023
67ddcb8
Merge branch 'main' into port-forms-documentation
RCheesley Jul 25, 2023
afa30f7
Merge pull request #136 from mautic/port-forms-documentation
RCheesley Jul 25, 2023
1b6475c
Merge branch 'main' into port-companies-documentation
RCheesley Jul 25, 2023
ce39d8e
Merge pull request #137 from mautic/port-companies-documentation
RCheesley Jul 25, 2023
cc5bf85
Fix "anchor not found" error (#142)
dennisameling Jul 29, 2023
98d3e70
Add various REST API docs (emails, files, marketing messages, notes, …
dennisameling Jul 29, 2023
e1cf2c8
Another bunch of REST API docs
Jul 29, 2023
7fab843
Add links to menu and fix Companies heading
Jul 29, 2023
02ac35b
More REST API docs!
Jul 30, 2023
6f62a6e
Apply suggestions from code review
RCheesley Aug 8, 2023
0672426
Merge pull request #143 from mautic/another-bunch-of-rest-api-docs
RCheesley Aug 8, 2023
967d17c
Apply suggestions from code review
RCheesley Aug 8, 2023
4a80bf8
Apply suggestions from code review
RCheesley Aug 8, 2023
548542e
Merge branch 'main' into almost-final-batch-of-rest-api-docs
RCheesley Aug 8, 2023
fd9483c
Merge pull request #144 from mautic/almost-final-batch-of-rest-api-docs
RCheesley Aug 8, 2023
ccc1026
REST API: Add list contacts by email example
thmclellan Aug 15, 2023
b298650
docs: update README.md [skip ci]
allcontributors[bot] Aug 15, 2023
ffd600a
docs: update .all-contributorsrc [skip ci]
allcontributors[bot] Aug 15, 2023
f8417cf
Merge pull request #147 from mautic/all-contributors/add-thmclellan
RCheesley Aug 15, 2023
cb7e86b
Merge branch 'main' into rest-api-contacts-by-email
RCheesley Aug 15, 2023
e8fdc42
Update docs/rest_api/contacts.rst
thmclellan Aug 15, 2023
23ca797
Update docs/rest_api/contacts.rst
thmclellan Aug 15, 2023
0049fa2
Getting Started and auth docs
Jul 30, 2023
a795b65
Finalize Getting Started and Auth docs
Aug 19, 2023
d2117ad
Final Vale fixes
Aug 19, 2023
acae422
Add "Run in Postman" button
Aug 19, 2023
6ac0c62
Merge pull request #146 from thmclellan/rest-api-contacts-by-email
RCheesley Aug 23, 2023
ec8092b
Merge branch 'main' into getting-started-and-auth-rest-api
RCheesley Aug 23, 2023
d821439
added 2 new params to email.rst
Aug 25, 2023
a38e47d
Merge pull request #145 from mautic/getting-started-and-auth-rest-api
escopecz Aug 28, 2023
6918ffc
Apply suggestions from code review
RCheesley Aug 30, 2023
c2c6350
Merge branch 'main' into added-2-new-params-to-email
RCheesley Aug 30, 2023
a303f2d
docs: update README.md [skip ci]
allcontributors[bot] Aug 30, 2023
a43b5bd
docs: update .all-contributorsrc [skip ci]
allcontributors[bot] Aug 30, 2023
5ca7184
Merge pull request #152 from mautic/all-contributors/add-Entrepositive
RCheesley Aug 30, 2023
eff0c5e
Merge pull request #150 from Entrepositive/added-2-new-params-to-email
RCheesley Aug 30, 2023
2b99655
Completing Report API docs (#153)
escopecz Sep 14, 2023
c0ca4c4
GitHub Actions: update Actions versions (#154)
dennisameling Sep 14, 2023
8a18a93
Password complexity
RCheesley Dec 22, 2023
6082143
Password complexity for ddev page
RCheesley Dec 22, 2023
ca7a379
Merge pull request #156 from mautic/password-complexity
RCheesley Jan 16, 2024
7005f92
Merge branch 'main' into init-grapesjs
RCheesley Jan 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,24 @@
"doc",
"review"
]
},
{
"login": "thmclellan",
"name": "Tom McLellan",
"avatar_url": "https://avatars.githubusercontent.com/u/9682900?v=4",
"profile": "https://www.growthclick.com",
"contributions": [
"doc"
]
},
{
"login": "Entrepositive",
"name": "Entrepositive",
"avatar_url": "https://avatars.githubusercontent.com/u/74878645?v=4",
"profile": "https://entrepositive.com",
"contributions": [
"doc"
]
}
],
"contributorsPerLine": 7,
Expand All @@ -40,5 +58,6 @@
"repoType": "github",
"repoHost": "https://github.com",
"skipCi": true,
"commitConvention": "angular"
"commitConvention": "angular",
"commitType": "docs"
}
2 changes: 2 additions & 0 deletions .github/styles/Mautic/FeatureList.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ swap:
marketing messages: Marketing Messages
page: Landing Page
pages: Landing Pages
point action: Point Action
point actions: Point Actions
point trigger: Point Trigger
point triggers: Point Triggers
points: Points
plugin: Plugin
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dev_merge_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ jobs:
if: ${{ github.event.workflow_run.conclusion == 'success' }}
steps:
- name: 'Checkout development'
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
ref: development
fetch-depth: 0
token: ${{ secrets.MAUTIBOT_PAT }}

- name: 'Download approved PR number'
uses: actions/github-script@v3.1.0
uses: actions/github-script@v6
with:
script: |
var artifacts = await github.actions.listWorkflowRunArtifacts({
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/dev_validate_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ jobs:
merge-branch:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: 'Prevent merging into development if the PR is not approved'
if: github.event.review.state != 'approved'
uses: actions/github-script@v3
uses: actions/github-script@v6
with:
script: |
core.setFailed('The PR is not approved to be merged into development')
Expand All @@ -21,7 +21,7 @@ jobs:
echo ${{ github.event.pull_request.number }} > ./pr/NR
- name: 'Store the PR number if approved'
if: github.event.review.state == 'approved'
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: pr
path: pr/
6 changes: 3 additions & 3 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -23,9 +23,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- uses: actions/setup-python@v2
- uses: actions/setup-python@v4
with:
python-version: '3.x'
cache: 'pip'
Expand Down
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![Documentation Status][RTD badge URL]][RTD URL]
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-3-orange.svg?style=flat-square)](#contributors-)
[![All Contributors](https://img.shields.io/badge/all_contributors-5-orange.svg?style=flat-square)](#contributors-)
<!-- ALL-CONTRIBUTORS-BADGE:END -->

[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/mautic/developer-documentation-new)
Expand Down Expand Up @@ -120,9 +120,11 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<table>
<tbody>
<tr>
<td align="center"><a href="https://robert-parker.me"><img src="https://avatars.githubusercontent.com/u/25473863?v=4?s=100" width="100px;" alt="Robert Parker"/><br /><sub><b>Robert Parker</b></sub></a><br /><a href="https://github.com/mautic/developer-documentation-new/commits?author=diaboloshogunate" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/shinde-rahul"><img src="https://avatars.githubusercontent.com/u/1046788?v=4?s=100" width="100px;" alt="Rahul Shinde"/><br /><sub><b>Rahul Shinde</b></sub></a><br /><a href="https://github.com/mautic/developer-documentation-new/commits?author=shinde-rahul" title="Documentation">📖</a></td>
<td align="center"><a href="https://dennisameling.com"><img src="https://avatars.githubusercontent.com/u/17739158?v=4?s=100" width="100px;" alt="Dennis Ameling"/><br /><sub><b>Dennis Ameling</b></sub></a><br /><a href="https://github.com/mautic/developer-documentation-new/commits?author=dennisameling" title="Documentation">📖</a> <a href="https://github.com/mautic/developer-documentation-new/pulls?q=is%3Apr+reviewed-by%3Adennisameling" title="Reviewed Pull Requests">👀</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://robert-parker.me"><img src="https://avatars.githubusercontent.com/u/25473863?v=4?s=100" width="100px;" alt="Robert Parker"/><br /><sub><b>Robert Parker</b></sub></a><br /><a href="https://github.com/mautic/developer-documentation-new/commits?author=diaboloshogunate" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/shinde-rahul"><img src="https://avatars.githubusercontent.com/u/1046788?v=4?s=100" width="100px;" alt="Rahul Shinde"/><br /><sub><b>Rahul Shinde</b></sub></a><br /><a href="https://github.com/mautic/developer-documentation-new/commits?author=shinde-rahul" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://dennisameling.com"><img src="https://avatars.githubusercontent.com/u/17739158?v=4?s=100" width="100px;" alt="Dennis Ameling"/><br /><sub><b>Dennis Ameling</b></sub></a><br /><a href="https://github.com/mautic/developer-documentation-new/commits?author=dennisameling" title="Documentation">📖</a> <a href="https://github.com/mautic/developer-documentation-new/pulls?q=is%3Apr+reviewed-by%3Adennisameling" title="Reviewed Pull Requests">👀</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://www.growthclick.com"><img src="https://avatars.githubusercontent.com/u/9682900?v=4?s=100" width="100px;" alt="Tom McLellan"/><br /><sub><b>Tom McLellan</b></sub></a><br /><a href="https://github.com/mautic/developer-documentation-new/commits?author=thmclellan" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://entrepositive.com"><img src="https://avatars.githubusercontent.com/u/74878645?v=4?s=100" width="100px;" alt="Entrepositive"/><br /><sub><b>Entrepositive</b></sub></a><br /><a href="https://github.com/mautic/developer-documentation-new/commits?author=Entrepositive" title="Documentation">📖</a></td>
</tr>
</tbody>
</table>
Expand Down
74 changes: 74 additions & 0 deletions docs/components/grapesjs.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
GrapesJS Builder
################

Currently, Mautic uses the GrapesJS Builder for Emails and Landing pages.

Setup
*****
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need to be a bit more verbose here. Where exactly do they run npm install? Do they have to have Mautic installed first?

We need to assume that people reading this are completely new to using the builder and may not know where to start.


.. code-block:: BASH

npm install

.. vale off

Configure Babel, ESLint, Prettier
=================================

.. vale on

Use the template files provided. For example .eslintrc.temp
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And do what with them? Can we be a bit more helpful here? Even if we point people out to documentation on external sites, it would be helpful to folks who might not know what to do with the template files.


How to test standalone
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does it mean to test standalone? This isn't very clear. Perhaps we could explain why you would do this and what it would allow you to do?

**********************

.. code-block:: BASH

npm run start-helloWorld
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As above I think we need to be clear - are we in Mautic's root? In the plugin folder? What is the difference between the two commands and why might you use one rather than the other?

or
npm run start-mautic

In order for ``start-mautic`` to work, a running DDEV container has to be present.

If you are using another development environment you need to update some paths in ``Demo/mautic/index.html``.
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's be kind and give some examples here? You can use code blocks to include code samples.


How to build for production
***************************

.. code-block:: BASH

npm run build
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As above, state where to run this.


Code architecture
*****************

There is PHP and the JavaScript code.

All the JavaScript code lives in the Assets/library folder. This handles the UI of the builder.

In addition to the code in this repository, there is also the :xref:`GrapesJS Preset`.
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
In addition to the code in this repository, there is also the :xref:`GrapesJS Preset`.
In addition to the code in this `plugins/GrapesJsBuilderBundle` folder, there is also the :xref:`GrapesJS Preset`.

We aren't referring to a separate repo at this time.


This repository handles the basic Mautic specific code. The general idea is that this preset repository is a base for various Mautic builder Plugins.
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
This repository handles the basic Mautic specific code. The general idea is that this preset repository is a base for various Mautic builder Plugins.
This code in the `plugins/GrapesJsBuilderBundle` folder handles the basic Mautic specific code. The general idea is that the GrapesJS Preset repository is a base for various Mautic builder Plugins.


E.g one where the Rich Text Editor is CKEditor, or where there is some very customer or industry specific features.
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
E.g one where the Rich Text Editor is CKEditor, or where there is some very customer or industry specific features.
Examples might include if you wanted to have the Rich Text Editor is CKEditor, or where there is some very customer or industry specific features. These can be done with a custom preset.


```
- It's a pack of configurable feautures:
- Adds the function to edit source code
- Extends the original image and add a confirm dialog before removing it
- Add the option to hide/show the Layers Manager
- Add the option to enable/disable the import code button
- Moves the Settings panel inside Style Manager panel
- Opens the Block Manager at launch
- Add Dynamic Content Block for HTML used in Mautic
```

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that we need to add here some instructions on how to roll your own custom preset. For example how to create a fork of the Mautic preset, and how to ship it with your own Mautic instance. I think that a few people do that already so hopefully we can get that documented.

I would also like to see some basic examples of:

How to create a new block
How to create a new section

These could link out to external documentation or be included here as our own docs.

Issues
******

Report issues in the main Mautic repository, labelled as :xref:`GrapesJS issue queue`

PRs
***

Contributions to improve the GrapesJS Plugin happen in the main Mautic repository as :xref:`GitHub PRs`
2 changes: 1 addition & 1 deletion docs/development-environment/environments.rst
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ The first one is the default file ``.env.test`` that includes credentials used t
MAUTIC_TABLE_PREFIX=test_
MAUTIC_ENV=test
MAUTIC_ADMIN_USERNAME=admin
MAUTIC_ADMIN_PASSWORD=mautic
MAUTIC_ADMIN_PASSWORD=Maut1cR0cks!

The second one, ``.env.test.local`` includes values for the DDEV local development environment, overriding the ``.env.test`` values.
It's recommended making any changes to this file with its values.
Expand Down
7 changes: 5 additions & 2 deletions docs/development-environment/how_to_install_with_ddev.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ Installing Mautic is a two-step process:
* - Username
- Password
* - ``admin``
- ``mautic``
- ``Maut1cR0cks!``
* - ``sales``
- ``mautic``
- ``Maut1cR0cks!``

.. Note:: Versions of Mautic prior to 5.1 use the password ``mautic``


25 changes: 25 additions & 0 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,39 @@ This is a work in progress. More to come soon. In the meantime, go to :xref:`Leg
:caption: REST API
:hidden:

.. Added the "Getting Started" and "Authentication" docs to the top for better visibility

rest_api/getting_started
rest_api/authentication

rest_api/assets
rest_api/campaigns
rest_api/categories
rest_api/companies
rest_api/contacts
rest_api/dashboard_widget_data
rest_api/dynamic_content
rest_api/emails
rest_api/fields
rest_api/files
rest_api/forms
rest_api/marketing_messages
rest_api/notes
rest_api/notifications
rest_api/pages
rest_api/point_actions
rest_api/point_triggers
rest_api/reports
rest_api/roles
rest_api/segments
rest_api/stages
rest_api/stats
rest_api/tags
rest_api/text_messages
rest_api/themes
rest_api/tweets
rest_api/users
rest_api/webhooks

Indices and tables
==================
Expand Down
2 changes: 1 addition & 1 deletion docs/links/ab_testing.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

link_name = "A/B testing"
link_text = "A/B testing"
link_url = "https://kb.mautic.org/knowledgebase/emails/how-does-mautic-do-ab-testing"
link_url = "https://kb.mautic.org/article/how-to-create-an-a-b-test-for-emails-in-mautic.html"

link.xref_links.update({link_name: (link_text, link_url)})
2 changes: 1 addition & 1 deletion docs/links/ddev_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

link_name = "ddev install"
link_text = "Install DDEV"
link_url = "https://ddev.readthedocs.io/en/stable/#installation"
link_url = "https://ddev.readthedocs.io/en/stable/"

link.xref_links.update({link_name: (link_text, link_url)})
2 changes: 1 addition & 1 deletion docs/links/excluded_by_default_autowiring.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

link_name = "excluded_directories"
link_text = "excluded by default"
link_url = "https://github.com/mautic/mautic/blob/HEAD/app/bundles/CoreBundle/DependencyInjection/MauticCoreExtension.php#L12"
link_url = "https://github.com/mautic/mautic/blob/HEAD/app/bundles/CoreBundle/DependencyInjection/MauticCoreExtension.php"

link.xref_links.update({link_name: (link_text, link_url)})
7 changes: 7 additions & 0 deletions docs/links/github_mautic_prs.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
from . import link

link_name = "GitHub PRs"
link_text = "GitHub PRs"
link_url = "https://github.com/mautic/mautic/pulls"

link.xref_links.update({link_name: (link_text, link_url)})
7 changes: 7 additions & 0 deletions docs/links/grapesjs_issues.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
from . import link

link_name = "GrapesJS issue queue"
link_text = "GrapesJS builder issues"
link_url = "https://github.com/mautic/mautic/issues?q=is%3Aopen+is%3Aissue+label%3Abuilder-grapesjs"

link.xref_links.update({link_name: (link_text, link_url)})
7 changes: 7 additions & 0 deletions docs/links/grapesjs_preset.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
from . import link

link_name = "GrapesJS Preset"
link_text = "GrapesJS Preset"
link_url = "https://github.com/mautic/grapesjs-preset-mautic"

link.xref_links.update({link_name: (link_text, link_url)})
7 changes: 7 additions & 0 deletions docs/links/symfony_api_cache.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
from . import link

link_name = "Symfony Cache"
link_text = "Symfony Cache"
link_url = "https://symfony.com/doc/5.4/cache.html#configuring-cache-with-frameworkbundle"

link.xref_links.update({link_name: (link_text, link_url)})
4 changes: 2 additions & 2 deletions docs/plugins/continuous-integration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ This file creates the GitHub Action jobs based on the definitions in it. You can

steps:
- name: Checkout Mautic 4
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: mautic/mautic
ref: ${{ matrix.mautic-versions }}

- name: Checkout this plugin
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: ${{ env.PLUGIN_DIR }}

Expand Down
Loading