Merge branch 'features' of github.com:mautic/mautic into fix-winner-c…

…riteria-ab-tests * 'features' of github.com:mautic/mautic: (269 commits) Add background-position and background-image to section content and wrapper (mautic#7211) Fix API set multiselect empty value (mautic#9506) docs: add hluchas as a contributor (mautic#10039) Sync leaking memory (mautic#9299) docs: add incentfit as a contributor (mautic#10038) docs: add gabepri as a contributor (mautic#10037) form actions that register gotowebinar registrants now save join urls (mautic#9477) docs: add kuzmany as a contributor (mautic#10036) Add readme for Tag Manager repo (mautic#10035) Safe join company table (mautic#9973) docs: add fedys as a contributor (mautic#10034) docs: add anton-vlasenko as a contributor (mautic#10033) docs: add rcheesley as a contributor (mautic#10032) docs: add luguenth as a contributor (mautic#10031) docs: add snoblucha as a contributor (mautic#10030) docs: add stevedrobinson as a contributor (mautic#10029) Add stage name and stage date added to contacts report (mautic#8173) Fix DNC report channel link (mautic#10010) Revert the incorrect changes from previous commits. Fix PR comments. ...
ts-navghane · May 17, 2021 · 85daa4c · 85daa4c
2 parents 08f50d0 + 8699293
commit 85daa4c
Show file tree

Hide file tree

Showing 256 changed files with 32,013 additions and 7,080 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -32,6 +32,113 @@
       "contributions": [
         "userTesting"
       ]
+    },
+    {
+      "login": "npracht",
+      "name": "Norman Pracht - Webmecanik",
+      "avatar_url": "https://avatars.githubusercontent.com/u/14075239?v=4",
+      "profile": "https://www.webmecanik.com",
+      "contributions": [
+        "userTesting"
+      ]
+    },
+    {
+      "login": "kuzmany",
+      "name": "Zdeno Kuzmany",
+      "avatar_url": "https://avatars.githubusercontent.com/u/462477?v=4",
+      "profile": "https://webmecanik.com",
+      "contributions": [
+        "userTesting",
+        "review",
+        "code"
+      ]
+    },
+    {
+      "login": "stevedrobinson",
+      "name": "Steve Robinson",
+      "avatar_url": "https://avatars.githubusercontent.com/u/866855?v=4",
+      "profile": "https://github.com/stevedrobinson",
+      "contributions": [
+        "userTesting"
+      ]
+    },
+    {
+      "login": "snoblucha",
+      "name": "Petr Šnobl",
+      "avatar_url": "https://avatars.githubusercontent.com/u/265586?v=4",
+      "profile": "https://github.com/snoblucha",
+      "contributions": [
+        "code",
+        "bug"
+      ]
+    },
+    {
+      "login": "luguenth",
+      "name": "Lukas Günther",
+      "avatar_url": "https://avatars.githubusercontent.com/u/9964009?v=4",
+      "profile": "https://github.com/luguenth",
+      "contributions": [
+        "code",
+        "doc"
+      ]
+    },
+    {
+      "login": "rcheesley",
+      "name": "Ruth Cheesley",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2930593?v=4",
+      "profile": "https://www.ruthcheesley.co.uk",
+      "contributions": [
+        "userTesting",
+        "review"
+      ]
+    },
+    {
+      "login": "anton-vlasenko",
+      "name": "Anton Vlasenko",
+      "avatar_url": "https://avatars.githubusercontent.com/u/43744263?v=4",
+      "profile": "https://github.com/anton-vlasenko",
+      "contributions": [
+        "code",
+        "test"
+      ]
+    },
+    {
+      "login": "fedys",
+      "name": "Miroslav Fedeleš",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6388925?v=4",
+      "profile": "https://www.linkedin.com/in/miroslavfedeles",
+      "contributions": [
+        "code",
+        "test"
+      ]
+    },
+    {
+      "login": "gabepri",
+      "name": "gabepri",
+      "avatar_url": "https://avatars.githubusercontent.com/u/73728034?v=4",
+      "profile": "https://github.com/gabepri",
+      "contributions": [
+        "bug",
+        "code"
+      ]
+    },
+    {
+      "login": "incentfit",
+      "name": "incentfit",
+      "avatar_url": "https://avatars.githubusercontent.com/u/13243272?v=4",
+      "profile": "https://incentfit.com",
+      "contributions": [
+        "userTesting"
+      ]
+    },
+    {
+      "login": "hluchas",
+      "name": "Lukáš Drahý",
+      "avatar_url": "https://avatars.githubusercontent.com/u/12815758?v=4",
+      "profile": "http://drahy.net",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

diff --git a/.ddev/.env.dist b/.ddev/.env.dist
@@ -0,0 +1,9 @@
+DB_HOST=db
+DB_PORT=3306
+DB_NAME=db
+DB_USER=db
+DB_PASSWD=db
+MAUTIC_TABLE_PREFIX=
+MAUTIC_ENV=test
+MAUTIC_ADMIN_USERNAME=admin
+MAUTIC_ADMIN_PASSWORD=mautic
diff --git a/.ddev/mautic-setup.sh b/.ddev/mautic-setup.sh
@@ -5,6 +5,7 @@ setup_mautic() {
     composer install
 
     cp ./.ddev/local.config.php.dist ./app/config/local.php
+    cp ./.env.dist ./.env
 
     printf "Installing Mautic...\n"
     php bin/console mautic:install https://${DDEV_HOSTNAME} \

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -53,6 +53,7 @@ jobs:
         php-version: ${{ matrix.php-versions }}
         extensions: mbstring, xml, ctype, iconv, intl, pdo_sqlite, mysql, pdo_mysql
         coverage: pcov
+        ini-values: pcov.directory=., pcov.exclude="~tests|themes|vendor~"
 
     - name: Set SYMFONY_ENV to test
       run: echo "SYMFONY_ENV=test" >> $GITHUB_ENV

diff --git a/.gitignore b/.gitignore
@@ -79,6 +79,7 @@
 !/media/images/.htaccess
 
 /plugins/*
+!/plugins/GrapesJsBuilderBundle
 !/plugins/MauticCitrixBundle
 !/plugins/MauticClearbitBundle
 !/plugins/MauticCloudStorageBundle
@@ -91,6 +92,7 @@
 !/plugins/MauticOutlookBundle
 !/plugins/MauticSocialBundle
 !/plugins/MauticZapierBundle
+!/plugins/MauticTagManagerBundle
 !/plugins/index.html
 !/plugins/.gitkeep
 

diff --git a/README.md b/README.md
@@ -1,15 +1,32 @@
 [![codecov](https://codecov.io/gh/mautic/mautic/branch/features/graph/badge.svg)](https://codecov.io/gh/mautic/mautic)
 <!-- 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-14-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
-Mautic Introduction
-===========
+About Mautic
+============
+Mautic is the world’s largest open source marketing automation project. With over 200,000 organisations using Mautic and over 1,000 community volunteers, we empower businesses by making it easy to manage their marketing across a range of channels. Stay up to date about initiatives, releases and strategy via our [blog][mautic-blog].
+
+Marketing automation has historically been difficult to implement within organisations. The Mautic Community is an example of open source at its best, offering great software and a vibrant and caring community in which to learn and share knowledge.
+
+Open source means more than open code. Open source provides equality for all and a chance for everyone to improve.
+
 ![Mautic](.github/readme_image.png "Mautic Open Source Marketing Automation")
 
+Get Involved
+=============
+Before we tell you how to install and use Mautic, we like to shamelessly plug our awesome user and developer communities! Users, start [here][get-involved] for inspiration, or follow us on Twitter [@MauticCommunity][twitter] or Facebook [@MauticCommunity][facebook]. Once you’re familiar with using the software, maybe you will share your wisdom with others in our [Slack][slack] channel.
+
+Calling all devs, testers and tech writers! Technical contributions are also welcome. First, read our [general guidelines][contributing] about contributing. If you want to contribute code, read our [CONTRIBUTING.md][contributing-md] or [Contributing Code][contribute-developer] docs then check out the issues with the [T1 label][t1-isssues] to get stuck in quickly and show us what you’re made of.
+
+If you have questions, the Mautic Community can help provide the answers.
+
+Installing and using Mautic
+============================
+
 ## Supported Versions
 
-| Branch | RC Release | Initial Release | Active Support Until | Security Support Until *
+| Branch | RC Release | Initial Release | Active Support Until | Security Support Until*
 |--|--|--|--|--|
 |2.15  | 27 Sep 2019 | 8 Oct 2019 | 8 Oct 2019 | 8 Oct 2019
 |2.16  | 30 Jan 2020 | 13 Feb 2020 | 15 June 2020 | 15 December 2020
@@ -19,65 +36,36 @@ Mautic Introduction
 |3.3   | 16 Feb 2021 | 22 Feb 2021 | 17 May 2021 | 24 May 2021
 |4.x   | 17 May 2021 | 24 May 2021 | 24 May 2022 | 20 Dec 2022
 
-* = Security Support for 2.16 will only be provided for Mautic itself, not for core dependencies that are EOL like Symfony 2.8.
-
-## Getting Started
-
-The GitHub version is recommended for development or testing. Production package ready for install with all the libraries is at [https://www.mautic.org/download](https://www.mautic.org/download).
-
-Documentation on how to use Mautic is available at [https://docs.mautic.org](https://docs.mautic.org).
-
-This is a simple 3 step installation process. You'll want to make sure you already have [Composer v1](http://getcomposer.org) available on your computer as this is a development release and you'll need to use Composer to download the vendor packages. Note that v2 is not yet supported.
-
-<table width="100%" border="0">
-	<tr>
-		<td>
-			<center><b>Step 1</b></center>
-		</td>
-		<td>
-			<center><b>Step 2</b></center>
-		</td>
-		<td>
-			<center><b>Step 3</b></center>
-		</td>
-	</tr>
-	<tr>
-		<td align="center" width="33.3%">
-			<a href="https://github.com/mautic/mautic/archive/master.zip">Download the repository zip</a><br />Extract this zip to your web root.
-		</td>
-		<td align="center" width="33.3%">
-			Run the following command to install required packages.<br /> <code>composer install</code>
-		</td>
-		<td align="center" width="33.3%">
-			Open your browser and complete the installation through the web installer.
-		</td>
-	</tr>
-</table>
+`*`Security support for 2.16 will only be provided for Mautic itself, not for core dependencies that are EOL, such as Symfony 2.8.
+
+## Software Downloads
+The GitHub version is recommended for both development and testing. The production package (including all libraries) is available at [mautic.org/download][download-mautic].
 
-**Get stuck?** *No problem. Check out [general troubleshooting](https://docs.mautic.org/en/troubleshooting) and if it won't solve your issue join us at the <a href="https://www.mautic.org/community">Mautic community</a> for help and answers.*
+## Installation
+### Disclaimer
+*Install from source only if you are comfortable using the command line. You'll be required to use various CLI commands to get Mautic working and keep it working. If the source/database schema gets out of sync with Mautic releases, the release updater may not work and will require manual updates. For production, we recommend the pre-packaged Mautic which is available at [mautic.org/download][download-mautic].*
 
-## Disclaimer
-Installing from source is only recommended if you are comfortable using the command line. You'll be required to use various CLI commands to get Mautic working and to keep it working. If the source and/or database schema gets out of sync with Mautic's releases, the release updater may not work and will require manual updates. For production the pre-packaged Mautic available at [mautic.org/download](https://www.mautic.org/download) is recommended.
+*Also note that source code outside of a [tagged release][tagged-release] should be considered ‘alpha’. It may contain bugs, cause unexpected results, data corruption or loss, and is not recommended for use in a production environment. Use at your own risk.*
 
-*Also note that the source outside <a href="https://github.com/mautic/mautic/releases">a tagged release</a> should be considered "alpha" and may contain bugs, cause unexpected results, data corruption or loss, and is not recommended for use in a production environment. Use at your own risk.*
+### How to install Mautic
+You must already have [Composer v1][composer-v1] available on your computer because this is a development release and you'll need Composer to download the vendor packages. Note that Composer v2 is not yet supported.
 
-## Ready to Install from Source and/or Contribute?
-That's fantastic! 
+Also note that if you have DDEV installed, you can run 'ddev config' followed by 'ddev start'. This will kick off the Mautic first-run process which will automatically install dependencies and configure Mautic for use. ✨ 🚀 Read more [here][ddev-mautic]
 
-If you want to contribute to Mautic's **code**, please read our [CONTRIBUTING.md](https://github.com/mautic/mautic/blob/feature/.github/CONTRIBUTING.md) or [Contributing Code](https://contribute.mautic.org/contributing-to-mautic/developer) docs. Then, check out the issues with the [L1 label](https://github.com/mautic/mautic/issues?q=is%3Aissue+is%3Aopen+label%3AL1) to get started quickly :rocket:
+Installing Mautic is a simple three-step process:
 
-If you want to contribute in **other areas** of Mautic, please read our general [Contributing](https://contribute.mautic.org/contributing-to-mautic) guide.
+1. [Download the repository zip][download-zip] then extract the zip to your web root.
+2. Run the `composer install` command to install the required packages.
+3. Open your browser and complete the installation through the web installer.
 
-## FAQ and Contact Information
-Marketing automation has historically been a difficult tool to implement in a business. The Mautic community is a rich environment for you to learn from others and share your knowledge as well. Open source means more than open code. Open source is providing equality for all and a chance to improve. If you have questions then the Mautic community can help provide the answers.
+If you get stuck, check our our [general troubleshooting][troubleshooting] page. Still no joy? Join our lively [Mautic Community][community] for support and answers.
 
-**Ready to get started with the community?** You can get <a href="https://www.mautic.org/community/get-involved">more involved</a> on the <a href="https://www.mautic.org">Mautic</a> website. Or follow Mautic on social media just to stay current with what's happening!
+### User Documentation
+Documentation on how to use Mautic is available at [docs.mautic.org][mautic-docs].
 
-### Contact Info
+### Developer Docs
+Developer documentation, including API reference docs, is available at [developer.mautic.org][dev-docs].
 
-* <a href="https://www.mautic.org">https://www.mautic.org</a>
-* <a href="https://twitter.com/MauticCommunity">@MauticCommunity</a> [Twitter]
-* <a href="https://www.facebook.com/MauticCommunity/">@MauticCommunity</a> [Facebook]
 
 ## Contributors ✨
 
@@ -91,6 +79,19 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://twitter.com/dennisameling"><img src="https://avatars.githubusercontent.com/u/17739158?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dennis Ameling</b></sub></a><br /><a href="https://github.com/mautic/mautic/commits?author=dennisameling" title="Code">💻</a> <a href="#userTesting-dennisameling" title="User Testing">📓</a></td>
     <td align="center"><a href="https://steercampaign.com"><img src="https://avatars.githubusercontent.com/u/12627658?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mohammad Abu Musa</b></sub></a><br /><a href="https://github.com/mautic/mautic/commits?author=mabumusa1" title="Code">💻</a></td>
     <td align="center"><a href="http://johnlinhart.com"><img src="https://avatars.githubusercontent.com/u/1235442?v=4?s=100" width="100px;" alt=""/><br /><sub><b>John Linhart</b></sub></a><br /><a href="#userTesting-escopecz" title="User Testing">📓</a></td>
+    <td align="center"><a href="https://www.webmecanik.com"><img src="https://avatars.githubusercontent.com/u/14075239?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Norman Pracht - Webmecanik</b></sub></a><br /><a href="#userTesting-npracht" title="User Testing">📓</a></td>
+    <td align="center"><a href="https://webmecanik.com"><img src="https://avatars.githubusercontent.com/u/462477?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Zdeno Kuzmany</b></sub></a><br /><a href="#userTesting-kuzmany" title="User Testing">📓</a> <a href="https://github.com/mautic/mautic/pulls?q=is%3Apr+reviewed-by%3Akuzmany" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/mautic/mautic/commits?author=kuzmany" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/stevedrobinson"><img src="https://avatars.githubusercontent.com/u/866855?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Steve Robinson</b></sub></a><br /><a href="#userTesting-stevedrobinson" title="User Testing">📓</a></td>
+    <td align="center"><a href="https://github.com/snoblucha"><img src="https://avatars.githubusercontent.com/u/265586?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Petr Šnobl</b></sub></a><br /><a href="https://github.com/mautic/mautic/commits?author=snoblucha" title="Code">💻</a> <a href="https://github.com/mautic/mautic/issues?q=author%3Asnoblucha" title="Bug reports">🐛</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/luguenth"><img src="https://avatars.githubusercontent.com/u/9964009?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lukas Günther</b></sub></a><br /><a href="https://github.com/mautic/mautic/commits?author=luguenth" title="Code">💻</a> <a href="https://github.com/mautic/mautic/commits?author=luguenth" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://www.ruthcheesley.co.uk"><img src="https://avatars.githubusercontent.com/u/2930593?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ruth Cheesley</b></sub></a><br /><a href="#userTesting-rcheesley" title="User Testing">📓</a> <a href="https://github.com/mautic/mautic/pulls?q=is%3Apr+reviewed-by%3Archeesley" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://github.com/anton-vlasenko"><img src="https://avatars.githubusercontent.com/u/43744263?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Anton Vlasenko</b></sub></a><br /><a href="https://github.com/mautic/mautic/commits?author=anton-vlasenko" title="Code">💻</a> <a href="https://github.com/mautic/mautic/commits?author=anton-vlasenko" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://www.linkedin.com/in/miroslavfedeles"><img src="https://avatars.githubusercontent.com/u/6388925?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Miroslav Fedeleš</b></sub></a><br /><a href="https://github.com/mautic/mautic/commits?author=fedys" title="Code">💻</a> <a href="https://github.com/mautic/mautic/commits?author=fedys" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/gabepri"><img src="https://avatars.githubusercontent.com/u/73728034?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gabepri</b></sub></a><br /><a href="https://github.com/mautic/mautic/issues?q=author%3Agabepri" title="Bug reports">🐛</a> <a href="https://github.com/mautic/mautic/commits?author=gabepri" title="Code">💻</a></td>
+    <td align="center"><a href="https://incentfit.com"><img src="https://avatars.githubusercontent.com/u/13243272?v=4?s=100" width="100px;" alt=""/><br /><sub><b>incentfit</b></sub></a><br /><a href="#userTesting-incentfit" title="User Testing">📓</a></td>
+    <td align="center"><a href="http://drahy.net"><img src="https://avatars.githubusercontent.com/u/12815758?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lukáš Drahý</b></sub></a><br /><a href="https://github.com/mautic/mautic/commits?author=hluchas" title="Code">💻</a></td>
   </tr>
 </table>
 
@@ -99,4 +100,24 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
-This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
+This project follows the [all-contributors][all-contributors] specification. Contributions of any kind welcome!
+
+[mautic-blog]: <https://www.mautic.org/blog>
+[get-involved]: <https://www.mautic.org/community/get-involved>
+[twitter]: <https://twitter.com/MauticCommunity>
+[facebook]: <https://www.facebook.com/MauticCommunity/>
+[slack]: <https://www.mautic.org/community/get-involved/communication-channels>
+[contributing]: <https://contribute.mautic.org/contributing-to-mautic>
+[contributing-md]: <https://github.com/mautic/mautic/blob/feature/.github/CONTRIBUTING.md>
+[contribute-developer]: <https://contribute.mautic.org/contributing-to-mautic/developer>
+[t1-issues]: <https://github.com/mautic/mautic/issues?q=is%3Aissue+is%3Aopen+label%3AT1>
+[download-mautic]: <https://www.mautic.org/download>
+[tagged-release]: <https://github.com/mautic/mautic/releases>
+[composer-v1]: <http://getcomposer.org/>
+[download-zip]: <https://github.com/mautic/mautic/archive/refs/heads/features.zip>
+[ddev-mautic]: <https://kb.mautic.org/knowledgebase/development/how-to-install-mautic-using-ddev>
+[troubleshooting]: <https://docs.mautic.org/en/troubleshooting>
+[community]: <https://www.mautic.org/community>
+[mautic-docs]: <https://docs.mautic.org>
+[dev-docs]: <https://developer.mautic.org>
+[all-contributors]: <https://github.com/all-contributors/all-contributors>