github.com/mautic/mautic commits | Ecosyste.ms: OpenCollective

Starting to use Twig templates instead of PHP templates

8feff60946e6c7cb78456061c053e66312ca8111 authored almost 2 years ago by John Linhart <[email protected]>

Fixing form templates in the CoreBundle

03978b63e33fd138b48729c7a2b7d297d2de0885 authored almost 2 years ago by John Linhart <[email protected]>

Rest of the SMS bundle PHP files refactored to Twig

f073ba0627901936317046f29b85ed0912255929 authored almost 2 years ago by John Linhart <[email protected]>

json_decode Twig filter added

aae2ef42d2f9de7226f5061f004485b452d1398f authored almost 2 years ago by John Linhart <[email protected]>

feat: [DPMMA-1132] point triggers with league

1c58412b4c50b7d45a7fcd800a1e1c84428752be authored almost 2 years ago by Patryk Gruszka <[email protected]>

Form template for SMS bundle refactored to Twig

b4a77cdf94db1f935b019c40f042793e5221eb55 authored almost 2 years ago by John Linhart <[email protected]>

More core templates have twig versions

9ed8df1939b4a76d7dd2c93878581d93d3afd591 authored almost 2 years ago by John Linhart <[email protected]>

SMS uses also this page template, so added a Twig version of it too

601198951889ab017008b90e44ef526233548eca authored almost 2 years ago by John Linhart <[email protected]>

First batch of SMS twig refactoring

29b47ce70dfdf897bb7be3df42f1fc9a0bbf38f3 authored almost 2 years ago by John Linhart <[email protected]>

Merge branch '5.x' into contact-field-value-multiselct

45d7a636e98543b031eef7de977f86e156c6a82c authored almost 2 years ago by Patryk Gruszka <[email protected]>

Merge pull request #11863 from escopecz/integrations-bundle-cleanup

Removing files that are not needed anymore...

4f27ea711fb02a9ba97975d6b0cad0c74ad5371c authored almost 2 years ago by John Linhart <[email protected]>

Add unit tests

a087488da7ca23c59f06c81e9cb7bfa27bc6751f authored almost 2 years ago by Zdeno Kuzmany <[email protected]>

Add support for tokens for SMS

e28413d947b31d41d28fac8e9c1c6fa1a9a90988 authored almost 2 years ago by Zdeno Kuzmany <[email protected]>

Merge branch '5.x' into TPROD-317

502535d0604a8d7347605d88587e95f505359dea authored almost 2 years ago by Jason Warner <[email protected]>

Removing files that are not needed anymore...

... those files were used when the bundle was an independent plugin

a92346e724868a96caf50a764e8f73ed93c50b8a authored almost 2 years ago by John Linhart <[email protected]>

Converting PHP templates for the IntegrationsBundle to Twig

c34d36491a62a0cbfae15ad9980835f71e3784de authored almost 2 years ago by John Linhart <[email protected]>

Fix PHPStan

8155fe5d844c6451e3ee6bee0d886fd21651ecd4 authored almost 2 years ago by Zdeno Kuzmany <[email protected]>

Merge pull request #11853 from escopecz/twig-api-bundle

TPROD-305 Twig refactoring for Api bundle

7b048fcf66ad9b59c25b580260d1b73b1a0d227c authored almost 2 years ago by John Linhart <[email protected]>

Merge branch '5.x' into fix_report_table_alias_issue

80dcc5c498780d718ab5878140b064fd0a12c387 authored almost 2 years ago by Saurabh Gupta <[email protected]>

Merge branch '5.x' into feature/email-in-campaigns-ignore-the-DNC-setting

091aab7c59e07ae53769637b9806fbf0c37fa4d1 authored almost 2 years ago by Ruth Cheesley <[email protected]>

Removing old unused PHP templates

3117fa18a21edf82ba1fde97f0449556e7e395d9 authored almost 2 years ago by John Linhart <[email protected]>

Converting API bundle PHP templates to Twig

39d79d678dd0e4c240b93eedb5b2f924227bd3f1 authored almost 2 years ago by John Linhart <[email protected]>

Fix ReplyTest

3d04711f36288987f713c0e7afa2b2ffa2ce730d authored almost 2 years ago by Zdeno Kuzmany <[email protected]>

Merge pull request #11852 from volha-pivavarchyk/feature/improve-message-for-contact-import

If a user tries to upload a file to import contacts and something goes wrong, the user gets a me...

872b72f2ceb7a8a5f62075a45aef44282b10835e authored almost 2 years ago by John Linhart <[email protected]>

Merge pull request #11859 from dadarya0/trim_campaign_id_while_dending_email

Trim campaign id while sending email

b8c91154ccba98107feb70845d68bdc9d420c6e4 authored almost 2 years ago by John Linhart <[email protected]>

Merge pull request #11668 from SalemCode8/twig-channel-bundle

#TPROD-310 - Migrate ChannelBundle to twig templates

5e4bc429f640c292b1b29b823ba031b435d68bc6 authored almost 2 years ago by John Linhart <[email protected]>

Merge branch '5.x' into twig-channel-bundle

f8b6bd67b173095f035d2f0fad6c82ff35e9a53c authored almost 2 years ago by John Linhart <[email protected]>

Add mautic.helper.email.address service to use in Replies constructor

76142447b4b1af93e8e1be178a1838f16bb5ea9a authored almost 2 years ago by Zdeno Kuzmany <[email protected]>

Merge pull request #11856 from biozshock/rollback-b1bb8f4

Revert b1bb8f4fe6016c1fab98

b814d4a739ae2011252a8459646af7cb8589a899 authored almost 2 years ago by John Linhart <[email protected]>

Merge branch '5.x' into fix-limit-batch-broadcast-email-command-

e9c0a9b17351037fe1740ad71df3a754e19e9e98 authored almost 2 years ago by Mohammad Abu Musa <[email protected]>

Merge branch '5.x' into twig-channel-bundle

ef206694a79fa195bc479114cd6ae87eb2c23a6d authored almost 2 years ago by Mohammad Abu Musa <[email protected]>

Add unit tests

e87254064f69c9b15df929b123ba94ee36eaf75a authored almost 2 years ago by Zdeno Kuzmany <[email protected]>

Remove Reply class from EmailAddressHelper.php

8dbbfa2667328fa02a9e979e97237829aebe99fc authored almost 2 years ago by Zdeno Kuzmany <[email protected]>

Add array_unique

291a929c64fd8c85f53b393c5878b0f438bcc9b5 authored almost 2 years ago by Zdeno Kuzmany <[email protected]>

cut string based on byte

c22911411eba6ad760e6951fa382036f95bde0f3 authored almost 2 years ago by Saurabh Gupta <[email protected]>

Fix multibyte char issue

0e04b86567a59223218513a1af8bef2809395e40 authored almost 2 years ago by Saurabh Gupta <[email protected]>

Merge branch '5.x' into Fix_reply_for_emails_with_suffix

a515f3da538da34520851769eaf6f5c646e88ba9 authored almost 2 years ago by Zdeno Kuzmany <[email protected]>

Refactor with EmailAddressHelper usage

1612acd9001e97a45debe12695245443583f6abf authored almost 2 years ago by Zdeno Kuzmany <[email protected]>

Revert b1bb8f4fe6016c1fab98

2c5521035e56ee72d56684dede7f70e6266393b2 authored almost 2 years ago by Artem Lopata <[email protected]>

Merge branch '5.x' into TPROD-317

02590867aecdb8ff3e70b5b02b384d5081e5ef80 authored almost 2 years ago by Jason Warner <[email protected]>

Fixing hiding the channel select if the channel is disabled right after save

ea937dba0070de55d38a107f7893b68387d12aee authored almost 2 years ago by John Linhart <[email protected]>

Improving formating

45171751bf79bda52160be73cc1796024e167ccc authored almost 2 years ago by John Linhart <[email protected]>

Fixing pagination in the list of contacts on the channel detail page

051c5252d3a2736ad425bfbc80385944a9ff2024 authored almost 2 years ago by John Linhart <[email protected]>

Merge pull request #11847 from mautic/dependabot/npm_and_yarn/plugins/GrapesJsBuilderBundle/json5-1.0.2

Bump json5 from 1.0.1 to 1.0.2 in /plugins/GrapesJsBuilderBundle

c91e18108c3e302d2b12c7b09a2b9e4aefd5191d authored almost 2 years ago by John Linhart <[email protected]>

Fix locked category

c31f30c220d18b51a46d4db45845fafa3972a94f authored almost 2 years ago by NormanPracht <[email protected]>

Merge pull request #11818 from patrykgruszka/DPMMA-1941_grapesjs-async-asset-loading-gh

Fix: GrapesJS assets transfer is slowing admin panel view loading

4beaa23ba6e0d16dc3e225e11dc319aeaa500b7b authored almost 2 years ago by John Linhart <[email protected]>

Making the if same as in the PHP version

7e866f6c8169bfe3c1d190b90f882978ff8836de authored almost 2 years ago by John Linhart <[email protected]>

Merge branch '5.x' into DPMMA-1941_grapesjs-async-asset-loading-gh

4ec92277306b71b5cc4415c02f22aaacce6b82a2 authored almost 2 years ago by John Linhart <[email protected]>

Setting twig template is not necessary. It's done automatically

cf0c075a789d99ad558edb1c15a5164962a0a3ec authored almost 2 years ago by John Linhart <[email protected]>

Fixing marketing message list page by using if closer to the PHP version

ab63955dbc33401ecbe65908dad73adeb3241fce authored almost 2 years ago by John Linhart <[email protected]>

feat: [DPMMA-1132] adjust point action with league

f7990cf1a9bad49b57b3f09339303c8f12f66970 authored almost 2 years ago by Patryk Gruszka <[email protected]>

Merge branch '5.x' into feature/improve-message-for-contact-import

4d321093b1df7fedaf4e9f9b7672a53c6e3ac606 authored almost 2 years ago by Volha Pivavarchyk <[email protected]>

add a flash message if textStatus is error

a22afca0390187a24ce28085eef65bc6bc5b7def authored almost 2 years ago by Volha Pivavarchyk <[email protected]>

Merge pull request #11841 from escopecz/report-date-fix-m5

Report: The Segment Activity Log Report shows the correct entries M5

33ae7176d5c58e2a2ef3625f59f30433902a0cc6 authored almost 2 years ago by John Linhart <[email protected]>

add a clearer message when importing contacts

5aaa660b501510eda6bd9b3d6d87a783d30c59a6 authored almost 2 years ago by Volha Pivavarchyk <[email protected]>

grapesjs asset action returned type suggestion

d2b9eb0dd5974f39c7b145a650c506565659b824 authored almost 2 years ago by Patryk Gruszka <[email protected]>

grapesjs asset action functional test

0446c0a8db3b957025fc5b1bd5ffac07bee65d14 authored almost 2 years ago by Patryk Gruszka <[email protected]>

fix stan

e4d4957cc7334b01acbc2edbb38186719402834d authored almost 2 years ago by Mohammad Abu Musa <[email protected]>

Merge branch '5.x' into fix_leads_list

fc1ca3e4de1b820396251cddfa6675211e994acf authored almost 2 years ago by Mohammad Abu Musa <[email protected]>

fix code

26d3d3f634c50a50398f596150d975b4a78acb1d authored almost 2 years ago by Mohammad Abu Musa <[email protected]>

Merge branch '5.x' into report-date-fix-m5

2a26cf68e93394647b3fb027e89e23b6f7a10035 authored almost 2 years ago by Mohammad Abu Musa <[email protected]>

Merge pull request #11842 from escopecz/page-search-fix

Global search fix

7a9112ff99be6d3ba5ff9858ad2746bcdf6c72f5 authored almost 2 years ago by John Linhart <[email protected]>

Merge pull request #11697 from escopecz/make-dedup-fast-again

Making the deduplicate command fast

0cce224a6b5442b07f0b8b27e4ea62c8c103c1b6 authored almost 2 years ago by John Linhart <[email protected]>

Merge pull request #11846 from escopecz/asset-removing-php-templates

Asset removing php templates

3aa5d03cd837fe0584ab416aa97cdad2c0344c7c authored almost 2 years ago by John Linhart <[email protected]>

Merge branch '5.x' into make-dedup-fast-again

c26b59c476ef2cd464c199ef3ac327e5755d4c2a authored almost 2 years ago by John Linhart <[email protected]>

Merge branch '5.x' into page-search-fix

b671e535148da7665cfd9393e63e87cd95759ef7 authored almost 2 years ago by Mohammad Abu Musa <[email protected]>

Merge branch '5.x' into asset-removing-php-templates

257987807410f8edd1e2fcfb5dc0071f46faac85 authored almost 2 years ago by Mohammad Abu Musa <[email protected]>

Merge pull request #11711 from ts-navghane/fix-email-send-with-company-tokens

Fix email send with company tokens

8e3a95b4f92b0348d0b88f3a0dae850309dff273 authored almost 2 years ago by John Linhart <[email protected]>

Merge pull request #11651 from mautic/Fix_ActivityListType_array_flip

Fix ActivityListType array flip

dae82375e59a955b2431c9cccd4aa232f1da0724 authored almost 2 years ago by John Linhart <[email protected]>

Bump json5 from 1.0.1 to 1.0.2 in /plugins/GrapesJsBuilderBundle

Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2.
- [Release notes](https://git...

eb28cd3a8a822141623fcf9a47d14e78fa7606cf authored almost 2 years ago by dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Merge pull request #11844 from escopecz/twig-lint

Adding Twig lint command to GH Actions to catch invalid TWIG syntax

7cbdcced76906efc79dde1f1ffcbf69d653e0bb3 authored almost 2 years ago by John Linhart <[email protected]>

Merge branch '5.x' into DPMMA-1941_grapesjs-async-asset-loading-gh

07bd6f4b00b653a161b464cd095e120f6578aa80 authored almost 2 years ago by Mohammad Abu Musa <[email protected]>

Fixing the escaping of HTML tags for asset description

e2c97bb56e950efb32cc411f96450c52fb2c06a2 authored almost 2 years ago by John Linhart <[email protected]>

Merge branch '5.x' into make-dedup-fast-again

0f2feb821d9cc06565722c690ec2d7d773eac8f9 authored almost 2 years ago by Mohammad Abu Musa <[email protected]>

Merge branch '5.x' into Fix_ActivityListType_array_flip

6bc43c293088789ea835ba931288866c77fa4d03 authored almost 2 years ago by Mohammad Abu Musa <[email protected]>

Merge branch '5.x' into twig-lint

e6233b69fb7db7d6d02b8d5464a1a8bb3d84f18d authored almost 2 years ago by Mohammad Abu Musa <[email protected]>

Merge branch '5.x' into twig-channel-bundle

7a9714e21f134f7150e1c294212e690eafbf5749 authored almost 2 years ago by Mohammad Abu Musa <[email protected]>

2 more forgotten PHP templates removed

b7077efc93dba1c7e611e7422494d8b987b039f9 authored almost 2 years ago by John Linhart <[email protected]>

Fixing a bug flagged by a test

80ce515d36e156dd7369d7d09c6f6704c12b9ac3 authored almost 2 years ago by John Linhart <[email protected]>

Removing index.html.twig as it's unused

55b138a011e9d1d11fab862ab96582aebe00cd9f authored almost 2 years ago by John Linhart <[email protected]>

Replacing index.html.php with index.html.twig

6fbfd4c35500e1f3a0fa5d7041515812ebff1049 authored almost 2 years ago by John Linhart <[email protected]>

Removing AssetBundle's PHP templates that already have a Twig replacement

67aa78bbff82d876f3be9d59aee8678dfc048fd9 authored almost 2 years ago by John Linhart <[email protected]>

Merge branch '5.x' into TPROD-317

d95e1d4db738822ec04c58d231f8cac2691a19f4 authored almost 2 years ago by Jason Warner <[email protected]>

Merge pull request #11791 from JoshuaEstes/TPROD-313

TPROD-313 - DashboardBundle: migrate views from PHP Engine to Twig

ea2484c162c817d3e3961438d66872f19cc04f92 authored almost 2 years ago by John Linhart <[email protected]>

Fixing an issue reported by Twig Lint in the Asset Bundle

53c83cc217618446347f8ce9930c4ee4383cfe50 authored almost 2 years ago by John Linhart <[email protected]>

Adding Twig lint command to GH Actions to catch invalid TWIG syntax

8bfb18147038d7916d24badb16f23add478948bc authored almost 2 years ago by John Linhart <[email protected]>

Merge branch '5.x' into TPROD-313

9d6cb134d2341c7b73d4cd24f9b95efd38591ee6 authored almost 2 years ago by John Linhart <[email protected]>

feat: [DPMMA-1132] add leagues to points and triggers

45c3ed584bb685cb096ac43e97cdcf2ad8dbc698 authored almost 2 years ago by Patryk Gruszka <[email protected]>

Returning a bad change that got in with the previous merge.

1a6105a62f5994938e97295ea0f2b47885854e81 authored almost 2 years ago by John Linhart <[email protected]>

Copying changes from the original offline.php to the scaffold one

365367c370337e2ee20e51975fab90167e56c895 authored almost 2 years ago by John Linhart <[email protected]>

Twig syntax fixes

874f5df6147745ed67bb6ce7bff6d8d49a26efab authored almost 2 years ago by John Linhart <[email protected]>

Merge remote-tracking branch 'origin/5.x' into pr/SalemCode8/11668

d5376387606d4f5399003da69481380fa720fb23 authored almost 2 years ago by John Linhart <[email protected]>

Merge pull request #11837 from dadarya0/fix-api-limit-issue

Fix api limit issue

4ed05d227bca6a4335f247cad9529f824c269820 authored almost 2 years ago by John Linhart <[email protected]>

feat: [DPMMA-1132] league permissions

2933cdf75939719fb60f53733e24bc752e605878 authored almost 2 years ago by Patryk Gruszka <[email protected]>

Add the form submission join only if requested

81b41eb96daacb7722b7adf72cfbee7cbf519042 authored almost 2 years ago by John Linhart <[email protected]>

Adding functional test for global search

84337bbd603f4cda1ac93de4294d239186c0f426 authored almost 2 years ago by John Linhart <[email protected]>

Merge branch '5.x' into fix-api-limit-issue

f07ef7830d428f46d4a8ea04f5273cb042954b98 authored almost 2 years ago by Saurabh Gupta <[email protected]>

Merge pull request #11815 from JoshuaEstes/company/TPROD-319

TPROD-319 - LeadBundle - Companies

32c04c4c764ae182046ecba6be90c3ee7a200ed9 authored almost 2 years ago by John Linhart <[email protected]>

Merge branch '5.x' into company/TPROD-319

2c930e986051faace85674c0d1dd6c464c920cca authored almost 2 years ago by John Linhart <[email protected]>

Using functional test rather than unit

e9552678e7954c6b3d02234cd8ef8e502773687e authored almost 2 years ago by John Linhart <[email protected]>