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

Merge pull request #12005 from JoshuaEstes/TPROD-360/CoreBundle/Update

TPROD-360 - CoreUpdate - Update - Migration PHP Templates to Twig Templates

da6868e285ea0e95d1233ffbaf88fadeabe444c1 authored almost 2 years ago

Merge branch '5.x' into TPROD-332/CitrixBundle

7e05193b70d8844cf973f1afb4c22883943aaa3c authored almost 2 years ago

Merge branch '5.x' into TPROD-360/CoreBundle/Update

95b7be2a97e041b283211acf0cb3cf397074d2a4 authored almost 2 years ago

docs: add LordRembo as a contributor for code (#12019)

* docs: update README.md [skip ci]

* docs: update .all-contributorsrc [skip ci]

---------
...

fbc033f63b4ea13c9da12ddd4c8ac9d54578ce9f authored almost 2 years ago

TPROD-312 - CoreBundle Menu: migrate to twig (#11997)

* add functions to MenuExtension so we can parse attributes on tags

* add Twig templates for ...

f091c9affb1d7b125cdc19ada085cd2158d9db34 authored almost 2 years ago

Merge branch '5.x' into integrationbundle-config-form-notes

77532055c5c9755efd50b8587b0b68685367ebf7 authored almost 2 years ago

Merge pull request #11992 from mabumusa1/add_codeowners

Enable code owners on repo

726141b2e6bed3501e3ae159e38f20c599cc369e authored almost 2 years ago

Merge pull request #11954 from mabumusa1/pr_11887_5.x

Fix: Dynamic Content in emails (legacy builder)- default content - 5.X Version

e7e556dabe17daa33512f2c642a836910c361526 authored almost 2 years ago

Merge pull request #12015 from JoshuaEstes/TPROD-350/CoreBundle/FormTheme

TPROD-350 - CoreBundle - FormTheme

8c2805cd671c9bea5d7881462e44a14398b1dbf9 authored almost 2 years ago

Merge pull request #11976 from jos0405/jos0405-confirmme-fixes

Confirm Me - MJML Fixes

68dc037dc342d290bf4473aaf243428b7047430a authored almost 2 years ago

Merge pull request #12006 from JoshuaEstes/TPROD-357/CoreBundle/Standard

TPROD-357 - CoreBundle - Standard - Migrate PHP Templates to Twig Templates

788a6c29bff6437aa7d88a7d56f99759a9c3943e authored almost 2 years ago

Merge pull request #12018 from escopecz/cleaning-userbundle-from-php-templates

Removing unused UserBundle PHP templates

0ed238142fcae8b873c3f04ad2b67fbd24dfa0e8 authored almost 2 years ago

feat: [DPMMA-1440] email report most clicked links

268da185ea04c1fe2492e431c07f1192b542aa83 authored almost 2 years ago

Removing unused UserBundle PHP templates

4da97dc099d7af8b7f37bc16e6f4bc0817bf58dd authored almost 2 years ago

Merge branch '5.x' into TPROD-357/CoreBundle/Standard

ac0118b6768000b7e08f8b6dd1e4164301d57c55 authored almost 2 years ago

Merge pull request #12017 from LordRembo/TPROD-312/TPROD-358-corebundle-theme-code-review

implement code review suggestions from PR #11971

c6c3f617054dae75f4ca7704a5745b7b4527a77e authored almost 2 years ago

Merge pull request #12011 from JoshuaEstes/TPROD-361/CoreBundle/Variant

TPROD-361 - CoreBundle - Variant

039f2fd1487f0706b13761107cc79a9da235f460 authored almost 2 years ago

Merge branch '5.x' into TPROD-312/TPROD-358-corebundle-theme-code-review

4a9037f5943a264760337e23c302048634ccabe5 authored almost 2 years ago

Merge branch '5.x' into TPROD-361/CoreBundle/Variant

df1c7686adc9507ea3834b274febd80249640ff1 authored almost 2 years ago

Merge pull request #12012 from JoshuaEstes/TPROD-359/CoreBundle/Translation

TPROD-359 - CoreBundle - Translation

40593419b1c1c640008eb7b61e87dd1126639fdc authored almost 2 years ago

Merge branch '5.x' into TPROD-312/TPROD-358-corebundle-theme-code-review

97bcf018d6400386ba415c9ef262b80be1f51a71 authored almost 2 years ago

Merge branch '5.x' into TPROD-359/CoreBundle/Translation

80c0b6ce31e755fae23200a9ab5ce8f09aac208c authored almost 2 years ago

Merge pull request #12014 from JoshuaEstes/TPROD-354/CoreBundle/Sections

TPROD-354 - CoreBundle - Sections

3efe6eadc938df9f41d0b04b5b8ea010615353e5 authored almost 2 years ago

Merge pull request #12013 from JoshuaEstes/TPROD-355/CoreBundle/Slots

TPROD-355 - CoreBundle - Slots

0115003152543588c4c416fafeeac851bf07a8f1 authored almost 2 years ago

Merge branch '5.x' into TPROD-312/TPROD-358-corebundle-theme-code-review

0e4c9cd48ec304db1a2905c81c0cf3154e420dca authored almost 2 years ago

Merge branch '5.x' into TPROD-350/CoreBundle/FormTheme

a3bdd07e94b7b17bd6e38bc3a3065d0a98525d65 authored almost 2 years ago

Merge branch '5.x' into TPROD-354/CoreBundle/Sections

e2096ac5af451f34cbbef4a1d22a2f63ada7cddb authored almost 2 years ago

Merge branch '5.x' into TPROD-361/CoreBundle/Variant

3a99d1c90a46537240ff81eadd3504f973870b8b authored almost 2 years ago

Merge branch '5.x' into TPROD-359/CoreBundle/Translation

95569ada01cbda6b5f07c0f1bebc9031b044f511 authored almost 2 years ago

Merge branch '5.x' into TPROD-355/CoreBundle/Slots

9774204e89992605257c0bfe9e6c01ed965f285d authored almost 2 years ago

Merge pull request #11974 from JoshuaEstes/TPROD-315/EmailBundle

TPROD-315 - EmailBundle - Migrate PHP Templates to Twig Templates

7029f42fe92f1154e7857e4ac3db82badf1a28da authored almost 2 years ago

implement code review suggestions from PR #11971

e4843d3a455774b69c54783537a97c142a46f6f4 authored almost 2 years ago

raw => purify, small bug fix with copy

a4157b75fdd3046c4da8c523640418a81a96bf0b authored almost 2 years ago

raw => purify

e66dea9e6d8d3815c67af4d83ff0e8633e21f6a9 authored almost 2 years ago

updates

2a02f21431e2cb48a9b72dc834676f02301b7f2e authored almost 2 years ago

Merge branch '5.x' into TPROD-357/CoreBundle/Standard

951ae6044082cfc9a0f5ecd34f11a578f6c994f5 authored almost 2 years ago

Merge branch '5.x' into TPROD-332/CitrixBundle

65dfeebfb7c1cd997877b8655515ae23e174ba6b authored almost 2 years ago

feedback

6827a6db604b787570138817be3d74639150a8fd authored almost 2 years ago

updates

888b62e906a1057c1b9eef0876a3741fb2633a1d authored almost 2 years ago

Merge branch '5.x' into TPROD-315/EmailBundle

cb68d2b3d0086b1ff3d4d57d315272a55212a745 authored almost 2 years ago

updates

c8b9ce1e2f397fe36f9a74d0a008be9622cb269d authored almost 2 years ago

TPROD-350 - CoreBundle - FormTheme

251b4334658b563046c81a468719cdd57c2f48f1 authored almost 2 years ago

TPROD-354 - CoreBundle - Sections

da25ed633261417bbeac9043072ed95e593f5575 authored almost 2 years ago

TPROD-355 - CoreBundle - Slots

51c220e281b1b331574cf4a214d0c47a9a9c39da authored almost 2 years ago

TPROD-359 - CoreBundle - Translation

9c4488c92c9ced745b90f7479cde9bf462792ea7 authored almost 2 years ago

TPROD-361 - CoreBundle - Variant

052af6b23728607b6869391c8a350831b19e353a authored almost 2 years ago

TPROD-319 - LeadBundle: migrate views from PHP Engine to Twig (#11793)

* TPROD-319 - LeadBundle: migrate views from PHP Engine to Twig

* checkpoint

* checkpoint
...

8dc18834f92942fab552760983f68d65a7f5e100 authored almost 2 years ago

Merge branch '5.x' into TPROD-315/EmailBundle

3200ac6ae8695b0488c90ad8f17105c5057b0a47 authored almost 2 years ago

Merge pull request #11980 from JoshuaEstes/TPROD-326/ReportBundle

TPROD-326 - ReportBundle - Migrate PHP Templates to Twig Templates

d944c8672502df724d8c10493806382bef2b3b35 authored almost 2 years ago

TPROD-357 - CoreBundle - Standard - Migrate PHP Templates to Twig

1c26469a478a93d567423f944ebad017690a2341 authored almost 2 years ago

removed dead templates

a612457651d2643e4fba993cc28354b01b0dd676 authored almost 2 years ago

TPRO-360 - CoreUpdate - Update - Migration PHP Templates to Twig

19433e06ee0c19f67c12fcb80c74ad1bafb295eb authored almost 2 years ago

test

45a8c58cc39c1bb0885c15f518ddd98bced718ce authored almost 2 years ago

typo

e27ddd4369b65aa4f06fa2199d2fa0e53c56337c authored almost 2 years ago

test

017f62532f8f07560295fffdadfaa8eaa30113cc authored almost 2 years ago

bug fix

bb0b08ce79a017ad0bcb32709a373d992c8f1f99 authored almost 2 years ago

bug fix

790c0f91d728ac3c6af4aa2177334336a6f58f61 authored almost 2 years ago

Update app/bundles/ReportBundle/Tests/Controller/ReportControllerTest.php

Co-authored-by: John Linhart <[email protected]>

2abec131c0704e929af14dd6e970d65f1f325fd2 authored almost 2 years ago

Merge branch '5.x' into TPROD-315/EmailBundle

f7fe284700cb3b55f8c3145174a2d8291a8ef3ca authored almost 2 years ago

Merge branch '5.x' into pr_11887_5.x

0bc430411734baebcad0f681db744ec840df5494 authored almost 2 years ago

Merge branch '5.x' into TPROD-326/ReportBundle

11cbbb3fab2affdb4d80e66b434d34fa8f6890a9 authored almost 2 years ago

Merge pull request #11971 from LordRembo/TPROD-312/TPROD-358-corebundle-theme-migrate-views-from-php-engine-to-twig

TRPOD 312 - TPROD 358 - CoreBundle Theme: migrate views from php engine to twig

a6659d5ac65a328abfc276e39905c3b4aa99b657 authored almost 2 years ago

Merge remote-tracking branch 'upstream/5.x' into Support_lock_for_mautic_custom-field_create-column_command

# Conflicts:
# app/bundles/LeadBundle/Field/Command/CreateCustomFieldCommand.php

3faccdf7b21ee5b052f5bcde5e262055cadac58a authored almost 2 years ago

Support lock for mautic:custom-field:create-column command

17a6afc18858db3f9ac504e34c03dccacf60147e authored almost 2 years ago

Merge branch '5.x' into integrationbundle-config-form-notes

207873f877d5387037a672856e27e647460bc6dc authored almost 2 years ago

Merge branch '5.x' into TPROD-326/ReportBundle

4e540d47ffc0a4a1fc46b97d7aeb04da37b8d2e6 authored almost 2 years ago

Merge branch 'TPROD-315/EmailBundle' of github.com:JoshuaEstes/mautic into TPROD-315/EmailBundle

* 'TPROD-315/EmailBundle' of github.com:JoshuaEstes/mautic:
TPROD-323 - PluginBundle - Migrate...

85caaf841ccee9f4f5614ebc86cf643dcae06114 authored almost 2 years ago

bug fix

58bdefe7c3a8751177b3642b90fa47866e3535ef authored almost 2 years ago

Merge branch '5.x' into TPROD-312/TPROD-358-corebundle-theme-migrate-views-from-php-engine-to-twig

baf04933e54a0bdeb2929b2f5856652a25d85f1a authored almost 2 years ago

Merge branch '5.x' into jos0405-confirmme-fixes

ecdc48a35036243462ec694763db9be99c19ea57 authored almost 2 years ago

Merge branch '5.x' into TPROD-315/EmailBundle

337887ff29935fbef465c9dfa69d291cb863fdce authored almost 2 years ago

TPROD-323 - PluginBundle - Migrate PHP templates to Twig templates (#11960)

* TPROD-323 - PluginBundle - Migrate PHP templates to Twig templates

* grid.html.twig

* re...

2711699d1fead4adbb06c8939488440404cd1cb0 authored almost 2 years ago

smoke tests

d507c6672196626722108bf8cc33f86d6b7663bb authored almost 2 years ago

bug fix

a66b1faf94ff21513fb490e66ae107f43105726d authored almost 2 years ago

check

45fe3a1ce217e86ae37f4c33deab1fbfba298a4b authored almost 2 years ago

Merge branch '5.x' into TPROD-315/EmailBundle

6cea6608c4ed9cd09c846ce6a52003bee0648f49 authored almost 2 years ago

bug fix

5b17c97850a3cc6777755ffa673ec709575f120f authored almost 2 years ago

fix: [DPMMA-1999] leagues twig templates in point bundle

b3891a60a63e8eaa8e2968c6973c7dcd2a96d8ee authored almost 2 years ago

cleanup

aeb91ebf756042ae61390f64460be32cbf7bdfc8 authored almost 2 years ago

Merge branch 'TPROD-326/ReportBundle' of github.com:JoshuaEstes/mautic into TPROD-326/ReportBundle

* 'TPROD-326/ReportBundle' of github.com:JoshuaEstes/mautic: (36 commits)
TPROD-314 - DynamicC...

ae050b27b229723c27a0c89bf9883235b4aa6c25 authored almost 2 years ago

bug fix

1e0b49deb94c0dba01ed1d0931191536cae27d6f authored almost 2 years ago

Merge branch '5.x' into TPROD-326/ReportBundle

37ab20dfbbe68c8452f51723675b92e4f4c34ac1 authored almost 2 years ago

Merge branch '5.x' into add_codeowners

2897bb18872b57b6a83b33b08aa175a00f0fade0 authored almost 2 years ago

TPROD-314 - DynamicContentBundle - Migrate PHP Templates to Twig Templates (#11979)

* checkpoint

* bug fix

* bugs

* bug

* cleanup

* typo

* test

* ...

a7605e3b4ffbf9423eaa535041de7a423bf4c2c6 authored almost 2 years ago

Merge branch '5.x' into DPMMA-1132_point-leagues

99638c43c7b63541feaec28b5cb95330dc6334c4 authored almost 2 years ago

fix: [DPMMA-1999] points log event name

8004ba8bfa7244f7a083b3eedf78cd9b61b2f12c authored almost 2 years ago

Merge branch 'form-export-submission-lead-ids' of https://github.com/annamunk/mautic into form-export-submission-lead-ids

313f7768138cd3ac3077563024e5b286805d7a57 authored almost 2 years ago

feat: [DPMMA-1977] Typo removed

b38f16d32b64156938031706e30f076cfba0c172 authored almost 2 years ago

feat: [DPMMA-1977] Moved submission ID and lead ID to twig templates

ec99f9237613f1a63875d00bb36931b7a443adc3 authored almost 2 years ago

merge branch '5.x' into 'form-export-submission-lead-ids'

1a31760785f909edca48b7f910f2426842340be2 authored almost 2 years ago

Updated form.html.twig for the note changes.

279258cce7f80d4fec41fd3f3a56d5dae0b5d084 authored almost 2 years ago

add inital owners

81c47c2d69fbd4b4cb2a60b055ab22d56d95e19b authored almost 2 years ago

Corrected tests.

54b85cffc450e9bc1a6327b778057f6a52756508 authored almost 2 years ago

Updated the integration form section note in more generic way.

02381c537266592ab9211da7b279ad6017c8f355 authored almost 2 years ago

Updated type.

eefd8982b4f10aa4b28a5f691218f76bc85b3282 authored almost 2 years ago

Added test case for ConfigFormNotesTrait

cb77a8cd788d69f80bc33d6c0b90a87d7bdcb2c7 authored almost 2 years ago

Updated config form notes.

fbd6541e49b0e9038de2ba39a97e476c6678052b authored almost 2 years ago

Added support to add notes to any section of the integration form.

e7876f403ce4b534338dbcd9da71fb277e068cda authored almost 2 years ago

Merge branch '5.x' into TPROD-312/TPROD-358-corebundle-theme-migrate-views-from-php-engine-to-twig

5d496a876407108684148034d393647b17d4e1d4 authored almost 2 years ago

Merge pull request #11931 from JoshuaEstes/TPROD-336

TPROD-336 - FocusBundle - Convert PHP Templates to Twig Templates

25134e97fedce85fa534b79241a6c7f0308617a1 authored almost 2 years ago