TPROD-196: Updated the image references to pick from the right place. #2

shinde-rahul · 2021-04-04T13:44:25Z

Ticket: https://mautic.atlassian.net/browse/TPROD-196

Many image files are not referenced correctly yet. The references still go to media/images, they should go to app/assets/images. This is alleviated by having the files double

nickveenhof · 2021-04-06T07:58:23Z

assets/scaffold/files/example.gitignore

+!/app/assets/images/avatar.png
+!/app/assets/images/favicon.ico
+!/app/assets/images/mautic_logo*
+!/app/assets/images/.htaccess


If we're not deleting those files yet - for sake of testing I would leave the media/images in the example gitignore. Also, the assets from app/assets are totally fine to commit, as those won't change by the user.So I think this entire gitignore change is not needed.

nickveenhof · 2021-04-06T07:58:49Z

bundles/NotificationBundle/Views/Popup/index.html.php

This change seems unnecessary

The new line character added at the end of the file.

nickveenhof · 2021-04-24T05:02:06Z

@shinde-rahul I am not sure if this is still relevant ( i can't recall) but the PR should be filed against mautic/mautic

RCheesley · 2021-05-22T10:46:14Z

@shinde-rahul @nickveenhof is this one still relevant? I think that it may not be.

nickveenhof · 2021-06-04T08:35:01Z

It certainly is still relevant as we now have the files in 2 places, but it should be filed against mautic/mautic and it should remove the files from media/* and refer to the files in app/assets/*

nickveenhof · 2021-06-04T08:39:18Z

I'm closing this PR as it should not be posted here but in mautic/mautic, it will propagate as such :)

…is deprecated

…eprecated

…ing is deprecated

…s deprecated

…is deprecated

…g is deprecated

…e int is deprecated

…string is deprecated

…is deprecated

…eprecated

…is deprecated

[rector] [dead-code] Remove few ifs that are always true - part #2

…xpected exception "UnexpectedValueException". Message was: "Symfony\Component\HttpFoundation\Request::__construct(): Argument #2 ($request) must be of type array, null given"

* Webhook configurable email details exclusion * JMS API metadriver fixed (got broken via mautic/mautic#12396) * Fixed: JMS\Serializer\Handler\DateHandler::serializeDateTime(): Argument #2 ($date) must be of type DateTime, DateTimeImmutable given

* download dnc info from salesforce for new records * cs fixes * Update plugins/MauticCrmBundle/Integration/SalesforceIntegration.php * enable sf optout only for leads * cs fix * use contact only for opted-out * fix handling * wip: add error handling for optout fields in sf * work in progress, add upsert method, add notification transformer * add transformer, add helper methods for user, add method to notify administrators, add messages translation * add transformer, add helper methods for user, add method to notify administrators, add messages translation, commit #2 * wip * wip * Update wording according to rowlands suggestion. * Prevent a cycle of requests if the error is not related to the HasOptedOutOfEmail field * Unset HasOptedOutOfEmail for getPerson as it's not used and will cause issues for Salesforce instances without the field enabled on Contact * Fixed owner fields from overriding all fields * fix cs * removed unused files * fix test case * Fixed API test warnings * Exclude deleted SF leads/contacts in order to prevent them from being re-created in Mautic after being deleted. * Fix warnings after PHP8 upgrade * Fixed plugin field mapping pages --------- Co-authored-by: Jan Kozak <galvani78@gmail.com> Co-authored-by: Don Gilbert <don.gilbert@mautic.com> Co-authored-by: Alan Hartless <alan@devkardia.com> Co-authored-by: Tejas Navghane <ts.navghane@gmail.com> Co-authored-by: mtshaw3 <mike.shaw@acquia.com>

* new twig variables * variables on html * translation strings * Default messages improvement * description removed * html * updated messages * list styles * run grunt compile-less * css to less * making sure nothing breaks for resources without specified differences * Squashed commit of the following: commit 9aea3c90d8d84b750d7e69eec1fede57c292d1b8 Author: Priyanshi Gaur <95358802+nox1134@users.noreply.github.com> Date: Tue Mar 26 21:28:43 2024 +0530 add the upload_dir to the DDEV config (#13545) Signed-off-by: Priyanshi Gaur <noxdot1134@gmail.com> commit e256e06e7b033093748a18d48b583a85d42cb36e Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Tue Mar 26 12:56:12 2024 -0300 Update messages.ini (#13495) commit e709ce9236640f924ed0798ecb4fd773aeabdfb1 Author: Tim Mallezie <tim.mallezie@gmail.com> Date: Tue Mar 26 16:54:52 2024 +0100 Improve no campaings lead modal message. (#13549) * Improve no campaings lead modal message. * Adjust test to new text value. --------- Co-authored-by: Tim Mallezie <tim.mallezie@dropsolid.com> commit 2e77180cf0629fbd0c230e50213a11dab092c31d Author: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue Mar 26 12:30:28 2024 +0000 docs: add markusVJH as a contributor for review (#13579) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> commit 0c026a861661eb43a2bcea01f84b6f5318f2ff6a Author: Ruth Cheesley <ruth@ruthcheesley.co.uk> Date: Thu Mar 21 13:53:37 2024 +0000 Revert "update ddev configuration (#12818)" (#13567) This reverts commit 5e4dbf7370c43995b78947117033bfd41f00a2ee. commit 8c7365332bb8816be5b287f6d316aba112079b61 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Wed Mar 20 09:08:39 2024 -0300 [UX] Add a tooltip to explain what is Enclosure, Escape and Delimiter on Contacts import (#13487) * tooltip * Update messages.ini * symbol change * cs fix * character --------- Co-authored-by: John Linhart <admin@escope.cz> commit 9bcbf69b416653edc9d2dc08c55a58c9f038a34a Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Tue Mar 19 10:56:48 2024 -0300 [UX] Create a tooltip for "Custom CSS" to make sure the user does not include <style> HTML tags (#13440) * tooltip * Update messages.ini --------- Co-authored-by: John Linhart <admin@escope.cz> commit 132d6c6cdfe571d53ef6c1c2eb16b2c9c3ccc728 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Tue Mar 19 10:47:01 2024 -0300 [UX] Change "System Report?" to "Visible for other users" (#13496) * Update messages.ini * Update app/bundles/ReportBundle/Translations/en_US/messages.ini Co-authored-by: Rahul Shinde <shinde.r.a@gmail.com> * Visible for all logged-in users --------- Co-authored-by: Rahul Shinde <shinde.r.a@gmail.com> Co-authored-by: John Linhart <admin@escope.cz> commit 5e4dbf7370c43995b78947117033bfd41f00a2ee Author: Ruth Cheesley <ruth@ruthcheesley.co.uk> Date: Tue Mar 19 13:46:42 2024 +0000 update ddev configuration (#12818) commit be10b63201b94c83f76d671401808496c79ebf39 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Tue Mar 19 09:32:18 2024 -0300 Update messages.ini (#13497) commit f2b59efe000ba4a2dc30ce8f6512d0a12952f1c8 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Tue Mar 19 09:30:38 2024 -0300 [UX] Add a tooltip on "How often to engage?" to explain what means to select "Once per session" (#13491) * tooltip * update --------- Co-authored-by: Ruth Cheesley <ruth@ruthcheesley.co.uk> commit 711f04ca6bdfc67bc243a333fe1860c582c0e503 Author: Priyanshi Gaur <95358802+nox1134@users.noreply.github.com> Date: Mon Mar 18 17:51:02 2024 +0530 Update redis-commander to a newer image (#13550) Signed-off-by: Priyanshi Gaur <noxdot1134@gmail.com> Co-authored-by: Ruth Cheesley <ruth@ruthcheesley.co.uk> commit d604f5d4fdee07a7bf3d3ad26add383f50182224 Author: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon Mar 18 10:42:05 2024 +0000 docs: add magician7 as a contributor for bug (#13557) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> commit a2fdd85f48359496969c085f3720bc7ef76e9291 Author: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon Mar 18 10:41:23 2024 +0000 docs: add magician7 as a contributor for review (#13556) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> commit 6653b84c583e32b2fd824d2418344fbd61ee3a97 Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Mon Mar 18 14:15:35 2024 +0530 Hide twitter related item if disabled (#12778) * remove social monitoring * fix cs * add test cases * remove interface * fix cs issue * skip test case * comment code as it was failing in phpstan * reoved untestable code * remove extra code * used php8 syntax commit 1bf73cce081f948c1945e4679a455d6cb508435c Author: Tim Mallezie <tim.mallezie@gmail.com> Date: Fri Mar 15 11:49:40 2024 +0100 Allow form_help for form elements (#13536) * Allow form_help function. * Change raw filter to purify filter. --------- Co-authored-by: Tim Mallezie <tim.mallezie@dropsolid.com> commit c1fc44678f729a16932bfbfdcb88c0813421d0bb Author: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Date: Thu Mar 14 14:36:44 2024 +0000 docs: add nox1134 as a contributor for code (#13547) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> commit bdffa3ef1a6e41ca5c800c69c1a4e12f4d5793fc Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Wed Mar 13 19:47:29 2024 +0530 Merge pull request #910 from mautic-inc/MAUT-3807-campaign-builder-fixes (#13533) MAUT-3807 / Waiting for Ajax to stop Co-authored-by: lukassykora <lukas.sykora@acquia.com> commit 032a462e40f64d2bf3c90824903cfec309a65f84 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Tue Mar 12 07:31:58 2024 -0300 Update navbar.html.twig (#13525) commit 0e0a851efb335fbf97dc5c968843a6301b731a4b Author: John Linhart <admin@escope.cz> Date: Fri Mar 8 14:48:32 2024 +0100 Merging 5.0 to 5.x to fix API Library tests (#13457) * fix: [DPMMA-1079] URL hit point action fixed * fix: [DPMMA-1079] additional tests and refactor * Fix replace entity with reference for detached lists * Update preview form script source path for dev enviroment * Focus first invalid element of form on validation error * fix incorrect version of the SpBundle * Fix incorrect checks in twig for defined or non-empty fields * Fix using messenger DSN with special characters * CS and test fixes * fix incorrect migration from old mail config to mailer_dsn config * fix incorrect DSN in tests * Pass mauticTemplateVars to templates * Refactor getCustomContent function to simplify viewName assignment. * Refactor customContent function call to use default filter. * add missing translations for flash messages * Fix incorrect occurrences of dns where it should be dsn * fix missing filter on contact grid display * Fix more calls to warn * Fix call to logger warn method. warn is not a method, warning appears to be correct. * bump jms/serializer-bundle dependency and ensure compatibility * Fix incorrect PSR-4 namespaces * phpstan fixes * fix: [DPMMA-2566] support old contactId type migration for point groups * Fixing Array to string conversion * bump doctrine packages to the latest releases * Adapt tests to be compatible to the changes in the QueryBuilder:: getSQLForSelect() method * bump symfony packages to the latest releases * Adapt tests to be compatible with the changes in Symfony mailer * bump and restrict phpoffice/phpspreadsheet to a version compatible with Mautic * bump other packages * phpcs fixes needed due to update * bump rector for compatibility with the phpstan update * revert bumping dev dependencies as they cause too many side effects * temp restrict doctrine/dbal version to prevent large deprecation refactor * Bump version to 5.0.3 * fix: [DPMMA-2401] Use object's timezone when comparing with 'now' in DateTimeHelper * fix: [DPMMA-2401] DateTimeHelper unit tests * fix: [DPMMA-2401] DateTimeHelperTest Phpstan * Fixed gitpod installation for Mautic 5.0. * Add new entity action to check for existing post action. * Remove unrelated comment Co-authored-by: Mattias Michaux <mattias.michaux@gmail.com> * Fix Form API to handle postAction parameter * PHP Stan fixes --------- Co-authored-by: Patryk Gruszka <patryk.gruszka@comarch.pl> Co-authored-by: Zdeno Kuzmany <zdeno@kuzmany.biz> Co-authored-by: Mattias Michaux <mattias.michaux@dropsolid.com> Co-authored-by: Adam Bark <adam@learnopen.tech> Co-authored-by: Ajit Shinde <ajitdev25@gmail.com> Co-authored-by: Mattias Michaux <mattias.michaux@gmail.com> commit b3c209980e52dfb9e3ed355a4aebc354ea7fa239 Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Fri Mar 8 16:58:18 2024 +0530 Connectwise: Replace appcookie with clientid for authentication (#13408) * replace appcookie with clientid for authentication * fix cs --------- Co-authored-by: Jan Kozak <galvani78@gmail.com> commit 025f0a7ce59bbf6d3245134e4809c3bd15026bf9 Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Thu Mar 7 21:37:02 2024 +0530 New sf contacts dnc sync (#13411) * download dnc info from salesforce for new records * cs fixes * Update plugins/MauticCrmBundle/Integration/SalesforceIntegration.php * enable sf optout only for leads * cs fix * use contact only for opted-out * fix handling * wip: add error handling for optout fields in sf * work in progress, add upsert method, add notification transformer * add transformer, add helper methods for user, add method to notify administrators, add messages translation * add transformer, add helper methods for user, add method to notify administrators, add messages translation, commit #2 * wip * wip * Update wording according to rowlands suggestion. * Prevent a cycle of requests if the error is not related to the HasOptedOutOfEmail field * Unset HasOptedOutOfEmail for getPerson as it's not used and will cause issues for Salesforce instances without the field enabled on Contact * Fixed owner fields from overriding all fields * fix cs * removed unused files * fix test case * Fixed API test warnings * Exclude deleted SF leads/contacts in order to prevent them from being re-created in Mautic after being deleted. * Fix warnings after PHP8 upgrade * Fixed plugin field mapping pages --------- Co-authored-by: Jan Kozak <galvani78@gmail.com> Co-authored-by: Don Gilbert <don.gilbert@mautic.com> Co-authored-by: Alan Hartless <alan@devkardia.com> Co-authored-by: Tejas Navghane <ts.navghane@gmail.com> Co-authored-by: mtshaw3 <mike.shaw@acquia.com> commit 7203ec93a846e80c31f0fbaa68d86135fa878c6c Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Thu Mar 7 14:15:45 2024 +0530 Refactoring and Added test case for segment change event (#13445) * merge conflict * fix test case * fix phpstan * mark deprecated insted delete file commit bcef611386dd72a1e348f7a2a36d288c14b537f3 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu Mar 7 05:21:39 2024 -0300 [UX] Create tooltips for the "Script inside Head/Footer" labels (#13436) * tooltip * Update messages.ini * Update messages.ini * cs fix --------- Co-authored-by: Ruth Cheesley <ruth@ruthcheesley.co.uk> commit a1d40765a0a0b309f596f0f2146fc5b2799514ed Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Wed Mar 6 12:02:36 2024 -0300 [UX] Put a placeholder on Alias and Public name when creating Segment to indicate that they’re auto-generated (#13489) * placeholder * alignment * cs fix --------- Co-authored-by: John Linhart <admin@escope.cz> commit 8aa1bf75111941b050bddb0a3934a4ef79b4a422 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Wed Mar 6 11:58:47 2024 -0300 [UX] Add the same user account helper on the user settings page (#13498) * helper * duplicate fix commit 496ae2e2177945d007cd18e556d796efc41918f3 Author: Artem Lopata <biozshock@gmail.com> Date: Wed Mar 6 15:58:36 2024 +0100 Add autoconfiguration of tags for integration. (#13521) Co-authored-by: John Linhart <admin@escope.cz> commit 67de6bbc4fda38095d1a11fc87407a18d15593fd Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Wed Mar 6 11:51:56 2024 -0300 tooltip (#13493) Co-authored-by: John Linhart <admin@escope.cz> commit 2ba9a61e13e5333f0139ef2aca4d9975340f6f83 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Wed Mar 6 11:07:41 2024 -0300 reorder (#13488) commit 52835310feb5b5e104bf9a1d8961f00122c58f45 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Wed Mar 6 10:56:31 2024 -0300 Update messages.ini (#13501) commit f94dc207606b9d41a0a6d2e19499e6c996232ef0 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Wed Mar 6 10:54:42 2024 -0300 [UX] Change "Published" to "Active" in user settings and add a tooltip (#13503) * Update UserType.php * Update messages.ini commit 3f723daa4cf8a110f6ccd2e44bc0218bd5730768 Author: Patryk Gruszka <patryk.gruszka@comarch.pl> Date: Wed Mar 6 14:52:57 2024 +0100 feat: DPMMA-1572 Clone campaign events (#12752) * feat: [DPMMA-1572] clone campaign events draft * feat: [DPMMA-1572] paste cloned events * feat: [DPMMA-1572] use localStorage for cloned event sync * feat: [DPMMA-1572] event clone styles * fix: [DPMMA-1572] campaign event add/edit functional tests * fix: [DPMMA-1572] EventController refactor * fix: [DPMMA-1572] ux improvments, refactor * fix: [DPMMA-1572] fix event edit and ux improvements * fix: [DPMMA-1572] event clone functional tests * fix: [DPMMA-1572] undefined clone details * feat: [DPMMA-1572] clone campaign node restrictions * fix: [DPMMA-1572] event clone meessage --------- Co-authored-by: John Linhart <admin@escope.cz> commit 3521cf2f28f39c209f99993e4fe7632870f9e90b Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Wed Mar 6 08:17:28 2024 -0300 nap (#13473) commit 0796409bdc97d23124867cf301099f5210edacb1 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Tue Mar 5 13:40:48 2024 -0300 [UX] Improve the explanation of the Automatic way to implement the form (#13477) * Update messages.ini * Update details.html.twig * Revert "Update details.html.twig" This reverts commit 98f15a4c56f8ad31f5d8b00c405f6294e192efc3. * revert translation keys commit 8f326451063a28a778e93a6c6374088df615b4f1 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Tue Mar 5 13:28:49 2024 -0300 [UX] Place the tip modal (the one that asks the website to generate preview) more below for Focus Items (#13494) * remove margin top class * less commit 34c14fc8f94251701857e79f19882755a83e4881 Author: Aarohi Prasad <aarohi.prasad@acquia.com> Date: Tue Mar 5 14:55:00 2024 +0530 Dnc segment sql optimization (#13413) * DNC segment SQL optimization * DNC segment SQL optimization * DNC segment SQL optimization - fixed if statement according to coding standards. * Update app/migrations/Version20190410143658.php I have tried it with missing index, it is working. Co-Authored-By: ondrejsibl <ondrej.sibl@mautic.com> * fixed changed exception and fixed styling and code standars * added index in entity as well * cs fixer * corrected the name of index --------- Co-authored-by: Ondrej Sibl <ondrej@sibl.info> Co-authored-by: John Linhart <jan@linhart.email> Co-authored-by: ondrejsibl <ondrej.sibl@mautic.com> commit d62c2a31d840adef9a46d4bc8846b977200d0a91 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue Mar 5 10:01:30 2024 +0100 Bump phpseclib/phpseclib from 3.0.35 to 3.0.37 (#13519) Bumps [phpseclib/phpseclib](https://github.com/phpseclib/phpseclib) from 3.0.35 to 3.0.37. - [Release notes](https://github.com/phpseclib/phpseclib/releases) - [Changelog](https://github.com/phpseclib/phpseclib/blob/master/CHANGELOG.md) - [Commits](https://github.com/phpseclib/phpseclib/compare/3.0.35...3.0.37) --- updated-dependencies: - dependency-name: phpseclib/phpseclib dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit 45659c57bc438e5dedece5da34eb065709b50b52 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Mon Mar 4 06:22:50 2024 -0300 Update messages.ini (#13504) commit af39d04c336c89e43edf7507ab335452ba18734f Author: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sun Mar 3 16:29:14 2024 +0000 docs: add magdalenaleonow as a contributor for bug (#13513) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> commit 169512c1116a181c563e65d5548b8eba401f7f11 Author: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sun Mar 3 08:10:14 2024 +0000 docs: add Esthertests as a contributor for review (#13512) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> commit 2f37c9ac5ffc9c40378baf89758e29a2baa461f5 Author: Rahul Shinde <shinde.r.a@gmail.com> Date: Fri Mar 1 17:30:55 2024 +0530 Updated CommonController::delegateView to include "mauticTemplate" value in "mauticTemplateVars" for rendering (#13509) commit 4a3cfb7c16c0551490cc598508d935cc3b31969d Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Fri Mar 1 14:15:25 2024 +0530 Catch ClientException's to account for validation errors. (#13482) * Catch ClientException's to account for validation errors. * fix cs --------- Co-authored-by: Don Gilbert <don@dongilbert.net> Co-authored-by: John Linhart <admin@escope.cz> commit 811ded8b6a5e658256bc857627f00978bfdbeb90 Author: Miroslav Fedeleš <miroslav.fedeles@gmail.com> Date: Fri Mar 1 09:28:40 2024 +0100 Add batching to notification campaign subscriber (#13451) * Add batching to notification campaign subscriber * BC break reverted commit 85c32326632adff247d6075a47e6ca549c4b6675 Author: Alan Syrgak <96595532+Syrgak-Alan@users.noreply.github.com> Date: Thu Feb 29 17:12:22 2024 +0100 Enhanced user information (#13074) * completed enhanced_user_information update * solving possible phpstan issue * fixed PHPSTAN issue * resolved phpstan return type issue * solved updated and created logs for user auditlog * Update app/bundles/CoreBundle/Entity/AuditLogRepository.php Co-authored-by: John Linhart <jan@linhart.email> * getting request error in test scenario * checking whether response contains audit information * passed assertions * Update AuditLogRepository.php * solved phpstan and cs issues * space between methods in repo * made visible user status in list page * separation of templates for better understanding * solved issues caused by roles, improved text readility * hidden switch for currently logged in user --------- Co-authored-by: DDEV User <nobody@example.com> Co-authored-by: John Linhart <jan@linhart.email> Co-authored-by: John Linhart <admin@escope.cz> commit efed000e82b7c2017b4f578bf9437402aa733e89 Author: Rohit Pavaskar <rohitpavaskar.19@gmail.com> Date: Thu Feb 29 18:16:12 2024 +0530 Fix missing count (#13463) * Fix missing count * Test case * Fix test case --------- Co-authored-by: Rohit Pavaskar <rohit.pavaskar@acquia.com> commit 4e3c4493402342e2f3d06fd04ce9bd569e638e89 Author: Rohit Pavaskar <66303837+rohitp19@users.noreply.github.com> Date: Thu Feb 29 18:14:24 2024 +0530 Fix migration generated columns (#13455) * Run generated column migrations after the console terminates rather than before the command runs * Use correct event class * Fix --------- Co-authored-by: Don Gilbert <don@dongilbert.net> commit e26f47f21876a0677046e52f09c4ae37f00152d9 Author: Rohit Pavaskar <rohitpavaskar.19@gmail.com> Date: Thu Feb 29 18:13:21 2024 +0530 Use the tmp path instead of the cache path when zipping themes for do… (#13483) * Use the tmp path instead of the cache path when zipping themes for download. * PHPSTAN --------- Co-authored-by: Don Gilbert <don@dongilbert.net> Co-authored-by: Rohit Pavaskar <rohit.pavaskar@acquia.com> commit c5e5167de17cdfbeb7af51c66da6e46cc37ef642 Author: John Linhart <admin@escope.cz> Date: Thu Feb 29 13:18:39 2024 +0100 Display UI warnings when a segment that is used in campaign gets unpublished (#13460) * Merge pull request #1359 from acquia/MAUT-5603 [MAUT-5603] Display UI warnings when a segment that is used in campaign gets unpublished * Changes needed after rebase to M5 --------- Co-authored-by: Anton Vlasenko <43744263+anton-vlasenko@users.noreply.github.com> commit d98d7f00b1cf05412d13e3a19cea7711ba9706cd Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Thu Feb 29 17:33:38 2024 +0530 Removed unnecessary join (#13481) * Merge pull request #798 from mautic-inc/MAUT-2787 Removed unnecessary join * Catch ClientException's to account for validation errors. * Revert "Catch ClientException's to account for validation errors." This reverts commit 098779e1921949f03e3980bf67b456df9af040c8. * fix test case --------- Co-authored-by: John Linhart <admin@escope.cz> Co-authored-by: Don Gilbert <don@dongilbert.net> commit 85f5c1eeaca0cb07cc3fc6fc4f8effc353a66492 Author: John Linhart <jan@linhart.email> Date: Wed Feb 28 16:57:29 2024 +0100 STAN fix (deprecated method updated) commit cf75b969502b839b621393405b011fe223792311 Author: John Linhart <jan@linhart.email> Date: Wed Feb 28 15:54:19 2024 +0100 Fixing a test broken by 13340 commit 211cce3e3e25cdbab09aa6d477424192f6dca41e Author: Tejas Navghane <ts.navghane@gmail.com> Date: Wed Feb 28 18:11:02 2024 +0530 Add merge filter query (#13484) commit ca3dd73201a00dddb419150b817a9e053c2e2947 Author: Rohit Pavaskar <rohitpavaskar.19@gmail.com> Date: Wed Feb 28 17:54:43 2024 +0530 Fix integration sync for deleted contacts (#13340) * Fetch the records if lead exists while generating the sync report * Added clean integration data command * Fixed test cases with added join scenario * Added test case for cleanup command * Removed unnecessary typecasting * Added limit of 100o in worst case scenario * Addressed review changes * Added hard limit of deletion * CS Fixer * Fixed failures * Rector Suggestions * Fix --------- Co-authored-by: Rohit Pavaskar <rohit.pavaskar@acquia.com> commit 881dc83f157146b292bd38b71a6d8ad3b26d16a9 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Wed Feb 28 09:22:50 2024 -0300 removed (#13480) commit e894a8ad0d6db19afcb5d398e2f8df97728062aa Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Wed Feb 28 17:47:36 2024 +0530 Fix dnc contact issue whilesync with salesforce (#13444) * Fix bug in SalesforceIntegration::pushLeadDoNotContactByDate. We should process DoNotContact Salesforce records in ascending order, otherwise the first record will be processed last and it will cause wrong DNC status in Mautic. * Update the test. We now use getDoNotContactHistory instead of getDncHistory method. * fix cs * fix rector issue --------- Co-authored-by: Anton Vlasenko <vlasenko.anton@gmail.com> commit 61374143c9148e7a7ce2965977b4f7079f27bd0c Author: John Linhart <jan@linhart.email> Date: Wed Feb 28 10:01:24 2024 +0100 CS fix commit 20f3fcdeaba85edca66bab3b2b98dcb7929d2af0 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Wed Feb 28 05:59:51 2024 -0300 [UX] Change the 3-dot icon to a drag icon (#13475) * replace fa classes on js and php * new drag icon * grab cursor for sortable items commit c0c0e8474ebb065f8a82190366eafb2a00f18a3a Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Wed Feb 28 05:55:15 2024 -0300 [UX] Improve the explanation of the Manual Copy way to implement the form (#13478) * Update messages.ini * Update details.html.twig commit b0008fac7e94fac8ce361b3c18076a6b716f6928 Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Wed Feb 28 14:17:15 2024 +0530 Set user in token storage during import process (#13469) * Merge pull request #791 from mautic-inc/MAUT-3532 MAUT-3532: Set user in token storage during command based import processing * fix test case --------- Co-authored-by: John Linhart <admin@escope.cz> commit 5210980d987b271971849179afb2298779616671 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Wed Feb 28 05:45:31 2024 -0300 tooltip (#13479) commit d2f1900e494b6c034f0c88341d707fc5c5684c3a Author: Rohit Pavaskar <rohitpavaskar.19@gmail.com> Date: Wed Feb 28 14:11:02 2024 +0530 Fix case senitive search (#13466) * Fixed bug where JSON fields werent doing case insensitive search * CS FIXER * Added test case * PHPSTAN --------- Co-authored-by: mtshaw3 <mike.shaw@acquia.com> Co-authored-by: Rohit Pavaskar <rohit.pavaskar@acquia.com> commit c5fa90f9f48622368478673796a85f98cee5ae2b Author: Miroslav Fedeleš <miroslav.fedeles@gmail.com> Date: Wed Feb 28 09:34:38 2024 +0100 Added an option for excluding segments when creating/updating segment emails (#13458) commit 0c53b53c1f4016ce3800ebb7d709f0a54895c898 Author: John Linhart <admin@escope.cz> Date: Tue Feb 27 12:30:51 2024 +0100 Range processing of webhooks (#13448) * Range processing of webhooks * Covering the webhook processing command with tests commit 0961dc55472c6e587dae89872ec3d2d0647af104 Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Tue Feb 27 14:40:59 2024 +0530 Add html custom field (#13428) * Merge pull request #644 from mautic-inc/beta.MAUT-2707.html-custom-field-type Custom HTML type field * add support of html field in custom field * fix phpstan * add html type class * add class name * MAUT-3728: HTML type custom field cause exception in contact edit * fix exception * fix rendering issue * MAUT-3728: HTML type custom field cause exception in contact edit * 1. Refactor Mautic\LeadBundle\Form\Type::validateDefaultValue method. 2. Add a validation message when the length of a default custom field value exceeds the database limit for utfmb4 varchar fields. * Increase code coverage. * Increase code coverage. * Fix the code according to https://github.com/mautic-inc/mautic-cloud/pull/1007#discussion_r490242808 * Remove unused class. * Fix static analysis error. * fix test case * fix cs issue --------- Co-authored-by: Ondřej Šíbl <ondrej.sibl@mautic.com> Co-authored-by: Liju P M <liju.pm@acquia.com> Co-authored-by: Anton Vlasenko <vlasenko.anton@gmail.com> commit 71acf7c5c7399929fbfafa9cb156a5837eaeef37 Author: Miroslav Fedeleš <miroslav.fedeles@gmail.com> Date: Tue Feb 27 10:08:56 2024 +0100 Webhook email content exclusion (#13447) * Webhook configurable email details exclusion * JMS API metadriver fixed (got broken via https://github.com/mautic/mautic/pull/12396) * Fixed: JMS\Serializer\Handler\DateHandler::serializeDateTime(): Argument #2 ($date) must be of type DateTime, DateTimeImmutable given commit f968ff08741840508fb2735da85fb4b2c76a7dcb Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Mon Feb 26 11:48:52 2024 -0300 new messages (#13372) commit 8e5b815601cc1dfc390a9010f12ff793b9cbedb2 Author: John Linhart <admin@escope.cz> Date: Mon Feb 26 14:33:57 2024 +0100 IntegrationBundle bug fixes (#13454) * Merge pull request #1213 from acquia/MAUT-5072 Segments are very slow to build * Adding the index also to the entity * Merge pull request #889 from mautic-inc/MAUT-3552 Impossible for a marketer to know why an object did not sync due to validation issues * Merge pull request #1000 from mautic-inc/MAUT-4181 MAUT-4181: IntegrationsBundle: don't sync other object types if IDs for particular objects are specified * Fixes after rebase to M5 * Merge pull request #1060 from mautic-inc/MAUT-4362 MAUT-4362: Scoring - SFDC clearing out new data from ACS * Merge pull request #1093 from mautic-inc/MAUT-4640 MAUT-4640: The field change log queue is not processed entirely during a single integration sync * Chages needed after rebase to M5 * Merge pull request #1486 from acquia/MAUT-6230-syncing-sf MAUT-6230 / Removed last sync date time from ObjectDAO and Integratio… * Merge pull request #1706 from acquia/MAUT-6264 MAUT-6264 "Push to Salesforce" Campaign Action showing wrong count * Merge pull request #1758 from acquia/MAUT-7063-Salesforce-Integration-referenceValueDAO-is-causing-sync-issues MAUT-7063: salesforce integration reference value dao is causing sync issues * Merge pull request #1802 from acquia/MAUT-7700 MAUT-7700 - Fixing incorrect timeline URL for salesforce * Fix new line issue * Fixes after rebase to M5 * Merge pull request #1968 from acquia/MAUT-5271 MAUT-5271: Plugin Credentials Change Bug Fix * Changes needed after rebase to M5 --------- Co-authored-by: Anton Vlasenko <43744263+anton-vlasenko@users.noreply.github.com> Co-authored-by: Alan Hartless <alan@devkardia.com> Co-authored-by: lukassykora <lukas.sykora@acquia.com> Co-authored-by: Rohit Pavaskar <66303837+rohitp19@users.noreply.github.com> Co-authored-by: Robert Parker <diaboloshogunate@gmail.com> Co-authored-by: Miroslav Fedeleš <miroslav.fedeles@gmail.com> Co-authored-by: Saurabh Gupta <saurabh.gupta@acquia.com> Co-authored-by: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> commit cb5b3c729bf898051274d5d434b25e766a963cd7 Author: Aarohi Prasad <aarohi.prasad@acquia.com> Date: Mon Feb 26 14:56:32 2024 +0530 Segment permission changes 5x (#13321) * Updated permissions for lead list (segment). * Initial migration script to map the permissions. * Updated listing page for permissions. * cs fixer * Updated permission for Edit, Delete, Clone and other operations. * Updated the list api permission. * Added the custom field related permission back. * Added list controller function tests for permissions. * Added permission tests for clone and edit. * Updated testcases for delete and batchDelete action. * Added test for view action. * Added functional test to check for permissions availability. * Made test classes final * Added test cases for clone and edit invalid id segment. * Corrected urls for delete action. * Updated test case names. * Added tests to cover addLead and removeLead actions. * Corrected delete action permission * Added test case for delete action. * Updated migration. * Updated test case for more coverage for delete action. * Updated migration. * Updated, added new test for coveerage. * Updated tests for covering Cancel and Apply button on new action. * Updated tests for covering Cancel and Apply button for edit action. * False negative SonarCube coverage repost bypassed CS Fixer applied * Updated code to remove duplicates. * Updated migration to improve the lists permissions. * Added generic view permission. * Updated the permission to work as other listings. * Updated test for list controller. * Updated Segment clon permission and funnctionality. * Added strict_types declaration. * Updated the permission to same for all places. * Updated permission for clone operation. * Updated segment list to show all global or created by user when user don''t have view other permission * Updated permission to show clone link on listing page * Update app/bundles/LeadBundle/Tests/Security/LeadPermissionsFunctionalTest.php Co-authored-by: Tejas Navghane <tejas.navghane@acquia.com> * Updated listing page for permissions. * False negative SonarCube coverage repost bypassed CS Fixer applied * Updated Segment clon permission and funnctionality. * Updated the permission to same for all places. * Updated permission for clone operation. * Updated segment list to show all global or created by user when user don''t have view other permission * Updated the code to fix the rebase traces. * Updated the clon permission * Removed incorrect inclusion while rebasing the branch * Fixed cs :( * Updated testcase for permission, flashes are working differntly * Updated permission test case * CS fixes * cs fixer changes * cs fixer changes * phpstan fixes * fixed some more phpstan issues * used asserequals instead of assertsame * put false in a string * removed phpdoc * added baack instanceof assertion * fixed listController * cs fixer * fixed differences with original branch * cs fixer agai * uggh cs fixer again * removed redundant function call * changed value from false to 0 * made corrections in twig file * modified twig for details and deleted .html.php file * corected twig file * modified twig for list_row and deleted list.html.php file * modified twig list.html and deleted index.html.php file --------- Co-authored-by: Rahul Shinde <shinde.r.a@gmail.com> Co-authored-by: fedys <miroslav.fedeles@gmail.com> Co-authored-by: Tejas Navghane <tejas.navghane@acquia.com> commit e5a0521679f8d6c9dede30498e097e0a44b816a2 Author: John Linhart <admin@escope.cz> Date: Mon Feb 26 09:56:52 2024 +0100 Ensure all form fields are included within the form tag (#11442) * Update CoC (#11413) Co-authored-by: John Linhart <admin@escope.cz> Don't use end() as we're handling the closing form tag ourselves. Should have done this in smaller commits. Here we add support for wrapping all inputs in a form tag to ensure that we capture the CSRF token when submitting the unsubscribe form. There is also some heavy refactoring of private methods. Further refactoring to reduce method size and add clarity. Refactor renderLanguageBar and reduce duplication WIP on test case No need to recount pages, just use the count Complete tests These test ensure that the form tag correctly wraps all inputs for the frequency form. We must always include the _token and save button within the form tag. Do not attempt to perform replacement operations if the page has no content. Add better logging to test error message. Forgot the placeholders Use the crawler output instead of just form output Also setCustomHtml when creating the page Update save prefs selector Set show_contact_preferences to 1 for this test Check for presense of token before performing rendering to reduce database load where possible. Add tests for default preference center page. Had to add a data-contact-frequency attribute to the default preference center layout in order to have something to search for and confirm that it exists. Count the available choices, not the form children Remove static results variable in CategoryModel getLookupResults The static here was causing issues with tests. Add back the view parameters. Refactor how they are calculated. STAN fixes Test fixes * Fixes after rebase on M5 * Fixes after rebase to M5 * Adding back code missing from Twig refactoring * Try running in a separate process so it wouldn't conflict with other tests * Load the Grapes JS assets only in administration It threw a JS error on the unsubscribe pages * Hide buttons as we did in M4 * Fixing legacy builder pref center preview * Adding test --------- Co-authored-by: Ruth Cheesley <ruth.cheesley@acquia.com> commit 0d68a66f8647db21dd538c34ecebb85fd3faf4e8 Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Mon Feb 26 14:07:26 2024 +0530 optimize query (#13420) Co-authored-by: John Linhart <admin@escope.cz> commit e0ffc1c7132b44325793fd590c4a098f750c6cc8 Author: John Linhart <admin@escope.cz> Date: Fri Feb 23 12:07:09 2024 +0100 Fixing embedded images (#13449) commit 2768e1ce12e8d070d72c72ee4455c214ebe3452e Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Fri Feb 23 05:55:18 2024 -0300 update icon (#13375) Co-authored-by: Zdeno Kuzmany <zdeno@kuzmany.biz> commit 5f5ecf31a00779a8372072ed472bd18b5f66a799 Author: John Linhart <admin@escope.cz> Date: Fri Feb 23 09:44:11 2024 +0100 Support a custom country and region list through a local file (#13430) * Support a custom country and region list through a local file * Added a new line at the end of the json test files * Changes needed for M5 --------- Co-authored-by: Alan Hartless <alan@devkardia.com> commit beaaf00233b403aaa06e7f4303711a732ff0a5ce Author: jamsch <12927717+jamsch@users.noreply.github.com> Date: Fri Feb 23 08:32:56 2024 +1300 fix: avoid page refresh on remote asset browser (#13442) commit bab305c0ec74d7e736f9e6e12ad4014b77456780 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu Feb 22 10:57:21 2024 -0300 [UI/UX] New icon pack (#13318) * add files * add library * fix prod path * npm fix * libraries fix * revert * scaffold fix --------- Co-authored-by: John Linhart <admin@escope.cz> commit 496a0bdc229631561c6a149c9865b8430812379e Author: John Linhart <admin@escope.cz> Date: Thu Feb 22 14:24:41 2024 +0100 Create temp directories if they don't exist (#13415) * Cherry-picked updates to PathsHelper from community M3 to minimize conflicts with tests * is_writable returns false if the file or directory doesn't exist to start with (no idea why it was here to start with?) * Reverting changes that shouldn't be made by the cherry-pick * Fixing CI checks --------- Co-authored-by: Alan Hartless <alan@devkardia.com> commit 6f114945d9a2f5c50009c85ebc8564b3e2fda68f Author: Adrian Schimpf <adrian@aivie.ch> Date: Thu Feb 22 13:52:14 2024 +0100 also prefill form fields with the type number (#12668) Co-authored-by: John Linhart <admin@escope.cz> commit a4aa11c125f51a45cae3cb63d6fef0f0b68b9667 Author: Zdeno Kuzmany <zdeno@kuzmany.biz> Date: Thu Feb 22 13:41:55 2024 +0100 Focus: Remove click event anywhere to close modal (#12705) * Remove click event anywhere to close modal * Remove redundant event listener for closing focus modal on click on document --------- Co-authored-by: Mattias Michaux <mattias.michaux@dropsolid.com> commit 3630317cb663799fee4934a6636c1bc9624d95c6 Author: Zdeno Kuzmany <zdeno@kuzmany.biz> Date: Thu Feb 22 13:40:54 2024 +0100 Report: add date added to contact's data (#12841) * Report: add date added to contact's data * Fix unit tests --------- Co-authored-by: John Linhart <admin@escope.cz> commit b28be98f48cb9e7ff48f2905108962f8041462fb Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu Feb 22 09:27:47 2024 -0300 tooltip (#13366) commit 4d045f546508cde907f908dc7447988b69a45fe5 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu Feb 22 09:21:32 2024 -0300 Update messages.ini (#13364) commit 72972e3a4799995fc1898fb7a1774dad90af90d1 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu Feb 22 09:21:05 2024 -0300 new icon (#13365) commit 1e010bc988d1d244a02f4018e9885b2bf479a364 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu Feb 22 09:17:33 2024 -0300 Update messages.ini (#13369) commit d968447d720f295e2c1a1cc623869aa3b7908417 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu Feb 22 09:17:03 2024 -0300 Update messages.ini (#13370) commit bf8dd69679d7e09dfba60172420441dafb4d43c9 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu Feb 22 09:16:16 2024 -0300 Update messages.ini (#13371) commit b9f9da7a70bf5cd8fc8b03b626bbccb3020a69d2 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu Feb 22 09:13:40 2024 -0300 update label (#13377) commit 55412cac39cafde5f22f782d94331625b0591763 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu Feb 22 09:11:44 2024 -0300 Update messages.ini (#13439) commit 2d1c05aeb39b1b021ea68f502efc3e1968a86513 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu Feb 22 09:10:43 2024 -0300 Update messages.ini (#13438) commit 65c9d14200cf90a7cd8b36739ec25450cb1ff550 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu Feb 22 09:09:01 2024 -0300 Update messages.ini (#13437) commit 99fb0ec3da3c047ed052b9399d3ee1c8fe14e35b Author: John Linhart <admin@escope.cz> Date: Thu Feb 22 12:26:52 2024 +0100 Replaces the `manipulator` entry in the audit log with something useful (#13432) * Add description to the LeadManipulator when a campaign modifies a contact. * Add getters to LeadManipulator for information to log to the audit log * Prevent a memory leak when processing large batches of contacts because the keys are never reset between contacts. * Don't log the manipulator 0/1 but instead log something useful * Fixed CampaignSubscriberFunctionalTest * Changes after rebase to M5 * Show all fields in the audit log tab this was broken since the Twig refactoring --------- Co-authored-by: Alan Hartless <alan@devkardia.com> commit 54b660e61bf0c1c4695a02c1e4955f874a2b3e79 Author: John Linhart <admin@escope.cz> Date: Thu Feb 22 12:24:43 2024 +0100 Prevent duplicate contacts or companies from being created during integration syncs when new objects are mapped to multiple integration object IDs (#13435) * Prevent duplicate contacts or companies from being created if they are included in the same batch mapped to different integration object IDs * Fix CS * Change PHPDoc argument type Co-authored-by: John Linhart <admin@escope.cz> * Change PHPDoc argument type Co-authored-by: John Linhart <admin@escope.cz> * Change PHPDoc argument type Co-authored-by: John Linhart <admin@escope.cz> * Change PHPDoc argument type Co-authored-by: John Linhart <admin@escope.cz> * Fixing typehints * Fixing typehints * Changes after M5 rebase * Changes needed after M5 rebase --------- Co-authored-by: Alan Hartless (he/him) <alan@devkardia.com> Co-authored-by: Tejas Navghane <tejas.navghane@acquia.com> commit 15df3dae7d748d77bb556b0aa98826d8b266ecaa Author: John Linhart <admin@escope.cz> Date: Thu Feb 22 12:22:50 2024 +0100 Attribute changes made by the integration to the integration in the audit log (#13426) * Attribute changes made by the integration to the integration in the audit log * Prevent test issues with MAUTIC_AUDITLOG_USER already being defined --------- Co-authored-by: Alan Hartless <alan@devkardia.com> commit 0861c02950f44c5131c183f6e774dd2bac7a6d72 Author: Rohit Pavaskar <66303837+rohitp19@users.noreply.github.com> Date: Thu Feb 22 16:39:58 2024 +0530 Failed Event Notifications (#13402) * PATCHED * Fixed PHPSTAN issues * CSFIXER * Gix test cases * Gix test cases * Fixed Multiple notifications * Fix test case * Added strict type * CSFIXER commit a5b200623b38538efb1cf324c0dcece5469b1130 Author: Rohit Pavaskar <rohitpavaskar.19@gmail.com> Date: Thu Feb 22 16:31:51 2024 +0530 Support contact tokens in unsubscribe text (#13421) * add token replacements to unsubscribe string and cover with tests * Fix tests * Fix test case * Improvement --------- Co-authored-by: Jan Kozak <galvani78@gmail.com> Co-authored-by: Rohit Pavaskar <rohit.pavaskar@acquia.com> commit bab02becefcc3cf7b167393565edba2f0989c747 Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Thu Feb 22 14:17:39 2024 +0530 Fix plugin update (#13423) * Enable plugin updates when version is newly specified * fix plugin update --------- Co-authored-by: Lukas Drahy <lukas@drahy.net> commit fc164050e3ef1cad36355cc3564be1e1f46b96ef Author: John Linhart <admin@escope.cz> Date: Thu Feb 22 09:42:39 2024 +0100 Enable an integration to set a default expiration for access tokens (#13429) * Enable an integration to set a default expiration for access tokens * Fix restoring the correct expiration to IntegrationToken * Consider the token expired if it is missing the access token in order to trigger the middleware to fetch a new token * CS fix --------- Co-authored-by: Alan Hartless <alan@devkardia.com> commit 517bd4a6f5a658e259e5c886eace2390f7c78006 Author: John Linhart <admin@escope.cz> Date: Thu Feb 22 09:40:40 2024 +0100 New event for plugins INTEGRATION_CONFIG_ON_GENERATE_AUTH_URL (#13434) * Provide a way for hosts to rewrite the auth URL for a plugin built on the IntegrationBundle's OAuth2 http client to be able to proxy requests through a single point of entry * Updates for M5 --------- Co-authored-by: Alan Hartless (he/him) <alan@devkardia.com> commit 3bc89975e1f523a7e81507266294a77e398d31b7 Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Wed Feb 21 19:42:14 2024 +0530 fix undefined variable issue (#13419) commit e4d0ccb4a1796ac2ebffc4c5b3182489db5fedd2 Author: Rahul Dhande <68939488+rahuld-dev@users.noreply.github.com> Date: Wed Feb 21 18:44:32 2024 +0530 fix for lose all existing company when create from lookup field (#13398) commit cdf9a3d7f0f549f3193116d570de881934e9377d Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Wed Feb 21 18:42:50 2024 +0530 Cleanup exported reports (#13405) * Cleanup exported reports - removing csv and zip files after email is being sent * Cleanup exported reports * Cleanup exported reports - tests * Cleanup exported reports - updating tests * Update app/bundles/ReportBundle/Scheduler/Model/FileHandler.php Co-Authored-By: John Linhart <admin@escope.cz> * Update app/bundles/ReportBundle/Scheduler/Model/SendSchedule.php Removing testing comment Co-Authored-By: John Linhart <admin@escope.cz> * Update app/bundles/ReportBundle/Model/ReportCleanup.php Cleanup exported reports - we want to keep the file fo 7 days Co-Authored-By: John Linhart <admin@escope.cz> * Update app/bundles/ReportBundle/Event/PermanentReportFileCreated.php Removing a comment for constructor Co-Authored-By: John Linhart <admin@escope.cz> * Cleanup exported reports - renaming event class * Cleanup exported reports - removing unnecessary condition * Cleanup exported reports - changing condition for empty zipFilePath * Cleanup exported reports - removing additional space * Cleanup exported reports - adding condition if file exists * fix test cases --------- Co-authored-by: Ondrej Sibl <ondrej@sibl.info> Co-authored-by: John Linhart <admin@escope.cz> commit 20710b39b6261e34d449a5a627490b9f8811a5fe Author: John Linhart <admin@escope.cz> Date: Wed Feb 21 13:59:28 2024 +0100 Translate option label (#13427) commit f8ce7d3d65e3d030f6a33ca2018a2be5f93b72ed Author: Patryk Gruszka <patryk.gruszka@comarch.pl> Date: Wed Feb 21 13:58:55 2024 +0100 DPMMA-2588 Change List-Unsubscribe order to favour one-click unsubscribe (#13407) * fix: [DPMMA-2588] change list-unsubsribe values order * fix: [DPMMA-2588] MailHelper usubscribe parameter order test * fix: [DPMMA-2588] mail tests fix commit 77c24e86d4e0c676efacac74bd6a9299609c8d83 Author: John Linhart <jan@linhart.email> Date: Wed Feb 21 11:57:06 2024 +0100 Fixing STAN commit 41d34dedf343032869f80428d8dd0258c6bbc258 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Wed Feb 21 07:52:06 2024 -0300 [UX] Change category Published label to “Available for use” (#13374) * new label * new helper commit 8285f3125fe06b0fd95e4ea106db0cdd696d9891 Author: Mattias Michaux <mattias.michaux@dropsolid.com> Date: Wed Feb 21 11:48:29 2024 +0100 Ensure lockfile aligns with the installed packages and constraints (#13401) commit 75e780c212c834a15c94633abe43f38aa2eee59d Author: Artem Lopata <biozshock@gmail.com> Date: Wed Feb 21 11:47:21 2024 +0100 Trailing slash handling. (#13388) commit 96ff70c3d57d7a9cf5502411926a82623bdc16f8 Author: Artem Lopata <biozshock@gmail.com> Date: Wed Feb 21 11:46:10 2024 +0100 Allow to exclude campaigns and segments from processing. (#13383) Commands: mautic:campaigns:trigger, mautic:campaigns:rebuild, mautic:segments:update allow to exclude processed entities. commit bbd21eb6bedfab57094a9a3262ae4a346f2ded26 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Wed Feb 21 07:44:00 2024 -0300 [UX] Rename Order to Field order and add a tooltip (#13417) * label * tooltip commit ffe71dd1f109fdf44bbb7384ba519207af078ff1 Author: John Linhart <jan@linhart.email> Date: Wed Feb 21 11:34:33 2024 +0100 Fixing the `mautic:reports:scheduler` command "There is currently no session available" commit c7235c08efcdf81d259dfe8cd2fea8ed5458999c Author: John Linhart <admin@escope.cz> Date: Wed Feb 21 11:32:07 2024 +0100 Fixed cleaning up the field change table if it happens that a contact or company is deleted before a sync can happen (#13422) * Fixed cleaning up the field change table if it happens that a contact or company is deleted before a sync can happen * Adding one more test --------- Co-authored-by: Alan Hartless <alan@devkardia.com> commit cd57d835232cf450e8ee933d41372b6a9f6c1733 Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Wed Feb 21 14:54:33 2024 +0530 Fix link to absolute url (#13403) * Fix link to be absolute url in campaign unpublish email. * fix cs --------- Co-authored-by: Don Gilbert <don@dongilbert.net> commit 0aaeba2292397926d948d029143a244c9f3f1dc2 Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Tue Feb 20 17:43:38 2024 +0530 Add standard API endpoints for reports (#13378) * Added missing report API endpoints * CS fixes * Prevent notice on patch * Add functional tests * Test Jenkins test loop - POST * Test Jenkins test loop - POST * Test Jenkins test loop - GET * Test Jenkins test loop - GET * Test Jenkins test loop - disabled * add all standard api for report --------- Co-authored-by: Alan Hartless <alan@devkardia.com> commit fe4e4547de7ca99259057a7422ab878a50975f6d Author: Rohit Pavaskar <rohitpavaskar.19@gmail.com> Date: Tue Feb 20 15:49:47 2024 +0530 Dashboard ajax improvements (#13392) * Fix typo in docblock * Imporovements sketches - TODO * Remove duplicate method * Fix docblock * Show widgets with no data and spinner * Add doc and remove unused exception * Remove unused condition * Fix docblock * Remove unused empty data from view * Add changes to twig file * Add changes to twig file * Deleted unused files * CSFIXER --------- Co-authored-by: Lukas Drahy <lukas@drahy.net> Co-authored-by: Rohit Pavaskar <rohit.pavaskar@acquia.com> commit 5943c0d19d9b968dbde7fa0b449c2991a6e7e99d Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Tue Feb 20 14:42:27 2024 +0530 Add primary company field in dynamic content (#13393) * add primary company fields to dynamic content * cs fixes * remove method returning array of primary companies as there is just one primary * fix phpdoc * remake a little the primaryCompany function * add tests to company dynamic fields * cs fixes * draft test, not working at() * improve and fix the test * bloody cs fixess * change the extended class for test * fix php stan, testcase --------- Co-authored-by: Jan Kozak <galvani78@gmail.com> * list styles * new list style * Update app/bundles/FormBundle/Translations/en_US/messages.ini Co-authored-by: Ruth Cheesley <ruth@ruthcheesley.co.uk> * Update app/bundles/FormBundle/Translations/en_US/messages.ini Co-authored-by: Ruth Cheesley <ruth@ruthcheesley.co.uk> * added variables + grunt compile-less * fix panel height * cleanup * fix variables * Revert "fix variables" This reverts commit 94c7deb72d226f8534b20dfb804cb8e3d3e0874b. * fix again * set another alignment * function instead of raw html * set wrap to fix hidden columns width --------- Co-authored-by: Mattias Michaux <mattias.michaux@dropsolid.com> Co-authored-by: Ruth Cheesley <ruth@ruthcheesley.co.uk>

* new twig variables * variables on html * translation strings * Default messages improvement * description removed * html * updated messages * list styles * run grunt compile-less * css to less * making sure nothing breaks for resources without specified differences * making sure nothing breaks for resources without specified differences * description removed / differences added * add + remove translation * Squashed commit of the following: commit 9aea3c90d8d84b750d7e69eec1fede57c292d1b8 Author: Priyanshi Gaur <95358802+nox1134@users.noreply.github.com> Date: Tue Mar 26 21:28:43 2024 +0530 add the upload_dir to the DDEV config (#13545) Signed-off-by: Priyanshi Gaur <noxdot1134@gmail.com> commit e256e06e7b033093748a18d48b583a85d42cb36e Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Tue Mar 26 12:56:12 2024 -0300 Update messages.ini (#13495) commit e709ce9236640f924ed0798ecb4fd773aeabdfb1 Author: Tim Mallezie <tim.mallezie@gmail.com> Date: Tue Mar 26 16:54:52 2024 +0100 Improve no campaings lead modal message. (#13549) * Improve no campaings lead modal message. * Adjust test to new text value. --------- Co-authored-by: Tim Mallezie <tim.mallezie@dropsolid.com> commit 2e77180cf0629fbd0c230e50213a11dab092c31d Author: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue Mar 26 12:30:28 2024 +0000 docs: add markusVJH as a contributor for review (#13579) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> commit 0c026a861661eb43a2bcea01f84b6f5318f2ff6a Author: Ruth Cheesley <ruth@ruthcheesley.co.uk> Date: Thu Mar 21 13:53:37 2024 +0000 Revert "update ddev configuration (#12818)" (#13567) This reverts commit 5e4dbf7370c43995b78947117033bfd41f00a2ee. commit 8c7365332bb8816be5b287f6d316aba112079b61 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Wed Mar 20 09:08:39 2024 -0300 [UX] Add a tooltip to explain what is Enclosure, Escape and Delimiter on Contacts import (#13487) * tooltip * Update messages.ini * symbol change * cs fix * character --------- Co-authored-by: John Linhart <admin@escope.cz> commit 9bcbf69b416653edc9d2dc08c55a58c9f038a34a Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Tue Mar 19 10:56:48 2024 -0300 [UX] Create a tooltip for "Custom CSS" to make sure the user does not include <style> HTML tags (#13440) * tooltip * Update messages.ini --------- Co-authored-by: John Linhart <admin@escope.cz> commit 132d6c6cdfe571d53ef6c1c2eb16b2c9c3ccc728 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Tue Mar 19 10:47:01 2024 -0300 [UX] Change "System Report?" to "Visible for other users" (#13496) * Update messages.ini * Update app/bundles/ReportBundle/Translations/en_US/messages.ini Co-authored-by: Rahul Shinde <shinde.r.a@gmail.com> * Visible for all logged-in users --------- Co-authored-by: Rahul Shinde <shinde.r.a@gmail.com> Co-authored-by: John Linhart <admin@escope.cz> commit 5e4dbf7370c43995b78947117033bfd41f00a2ee Author: Ruth Cheesley <ruth@ruthcheesley.co.uk> Date: Tue Mar 19 13:46:42 2024 +0000 update ddev configuration (#12818) commit be10b63201b94c83f76d671401808496c79ebf39 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Tue Mar 19 09:32:18 2024 -0300 Update messages.ini (#13497) commit f2b59efe000ba4a2dc30ce8f6512d0a12952f1c8 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Tue Mar 19 09:30:38 2024 -0300 [UX] Add a tooltip on "How often to engage?" to explain what means to select "Once per session" (#13491) * tooltip * update --------- Co-authored-by: Ruth Cheesley <ruth@ruthcheesley.co.uk> commit 711f04ca6bdfc67bc243a333fe1860c582c0e503 Author: Priyanshi Gaur <95358802+nox1134@users.noreply.github.com> Date: Mon Mar 18 17:51:02 2024 +0530 Update redis-commander to a newer image (#13550) Signed-off-by: Priyanshi Gaur <noxdot1134@gmail.com> Co-authored-by: Ruth Cheesley <ruth@ruthcheesley.co.uk> commit d604f5d4fdee07a7bf3d3ad26add383f50182224 Author: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon Mar 18 10:42:05 2024 +0000 docs: add magician7 as a contributor for bug (#13557) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> commit a2fdd85f48359496969c085f3720bc7ef76e9291 Author: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon Mar 18 10:41:23 2024 +0000 docs: add magician7 as a contributor for review (#13556) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> commit 6653b84c583e32b2fd824d2418344fbd61ee3a97 Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Mon Mar 18 14:15:35 2024 +0530 Hide twitter related item if disabled (#12778) * remove social monitoring * fix cs * add test cases * remove interface * fix cs issue * skip test case * comment code as it was failing in phpstan * reoved untestable code * remove extra code * used php8 syntax commit 1bf73cce081f948c1945e4679a455d6cb508435c Author: Tim Mallezie <tim.mallezie@gmail.com> Date: Fri Mar 15 11:49:40 2024 +0100 Allow form_help for form elements (#13536) * Allow form_help function. * Change raw filter to purify filter. --------- Co-authored-by: Tim Mallezie <tim.mallezie@dropsolid.com> commit c1fc44678f729a16932bfbfdcb88c0813421d0bb Author: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Date: Thu Mar 14 14:36:44 2024 +0000 docs: add nox1134 as a contributor for code (#13547) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> commit bdffa3ef1a6e41ca5c800c69c1a4e12f4d5793fc Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Wed Mar 13 19:47:29 2024 +0530 Merge pull request #910 from mautic-inc/MAUT-3807-campaign-builder-fixes (#13533) MAUT-3807 / Waiting for Ajax to stop Co-authored-by: lukassykora <lukas.sykora@acquia.com> commit 032a462e40f64d2bf3c90824903cfec309a65f84 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Tue Mar 12 07:31:58 2024 -0300 Update navbar.html.twig (#13525) commit 0e0a851efb335fbf97dc5c968843a6301b731a4b Author: John Linhart <admin@escope.cz> Date: Fri Mar 8 14:48:32 2024 +0100 Merging 5.0 to 5.x to fix API Library tests (#13457) * fix: [DPMMA-1079] URL hit point action fixed * fix: [DPMMA-1079] additional tests and refactor * Fix replace entity with reference for detached lists * Update preview form script source path for dev enviroment * Focus first invalid element of form on validation error * fix incorrect version of the SpBundle * Fix incorrect checks in twig for defined or non-empty fields * Fix using messenger DSN with special characters * CS and test fixes * fix incorrect migration from old mail config to mailer_dsn config * fix incorrect DSN in tests * Pass mauticTemplateVars to templates * Refactor getCustomContent function to simplify viewName assignment. * Refactor customContent function call to use default filter. * add missing translations for flash messages * Fix incorrect occurrences of dns where it should be dsn * fix missing filter on contact grid display * Fix more calls to warn * Fix call to logger warn method. warn is not a method, warning appears to be correct. * bump jms/serializer-bundle dependency and ensure compatibility * Fix incorrect PSR-4 namespaces * phpstan fixes * fix: [DPMMA-2566] support old contactId type migration for point groups * Fixing Array to string conversion * bump doctrine packages to the latest releases * Adapt tests to be compatible to the changes in the QueryBuilder:: getSQLForSelect() method * bump symfony packages to the latest releases * Adapt tests to be compatible with the changes in Symfony mailer * bump and restrict phpoffice/phpspreadsheet to a version compatible with Mautic * bump other packages * phpcs fixes needed due to update * bump rector for compatibility with the phpstan update * revert bumping dev dependencies as they cause too many side effects * temp restrict doctrine/dbal version to prevent large deprecation refactor * Bump version to 5.0.3 * fix: [DPMMA-2401] Use object's timezone when comparing with 'now' in DateTimeHelper * fix: [DPMMA-2401] DateTimeHelper unit tests * fix: [DPMMA-2401] DateTimeHelperTest Phpstan * Fixed gitpod installation for Mautic 5.0. * Add new entity action to check for existing post action. * Remove unrelated comment Co-authored-by: Mattias Michaux <mattias.michaux@gmail.com> * Fix Form API to handle postAction parameter * PHP Stan fixes --------- Co-authored-by: Patryk Gruszka <patryk.gruszka@comarch.pl> Co-authored-by: Zdeno Kuzmany <zdeno@kuzmany.biz> Co-authored-by: Mattias Michaux <mattias.michaux@dropsolid.com> Co-authored-by: Adam Bark <adam@learnopen.tech> Co-authored-by: Ajit Shinde <ajitdev25@gmail.com> Co-authored-by: Mattias Michaux <mattias.michaux@gmail.com> commit b3c209980e52dfb9e3ed355a4aebc354ea7fa239 Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Fri Mar 8 16:58:18 2024 +0530 Connectwise: Replace appcookie with clientid for authentication (#13408) * replace appcookie with clientid for authentication * fix cs --------- Co-authored-by: Jan Kozak <galvani78@gmail.com> commit 025f0a7ce59bbf6d3245134e4809c3bd15026bf9 Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Thu Mar 7 21:37:02 2024 +0530 New sf contacts dnc sync (#13411) * download dnc info from salesforce for new records * cs fixes * Update plugins/MauticCrmBundle/Integration/SalesforceIntegration.php * enable sf optout only for leads * cs fix * use contact only for opted-out * fix handling * wip: add error handling for optout fields in sf * work in progress, add upsert method, add notification transformer * add transformer, add helper methods for user, add method to notify administrators, add messages translation * add transformer, add helper methods for user, add method to notify administrators, add messages translation, commit #2 * wip * wip * Update wording according to rowlands suggestion. * Prevent a cycle of requests if the error is not related to the HasOptedOutOfEmail field * Unset HasOptedOutOfEmail for getPerson as it's not used and will cause issues for Salesforce instances without the field enabled on Contact * Fixed owner fields from overriding all fields * fix cs * removed unused files * fix test case * Fixed API test warnings * Exclude deleted SF leads/contacts in order to prevent them from being re-created in Mautic after being deleted. * Fix warnings after PHP8 upgrade * Fixed plugin field mapping pages --------- Co-authored-by: Jan Kozak <galvani78@gmail.com> Co-authored-by: Don Gilbert <don.gilbert@mautic.com> Co-authored-by: Alan Hartless <alan@devkardia.com> Co-authored-by: Tejas Navghane <ts.navghane@gmail.com> Co-authored-by: mtshaw3 <mike.shaw@acquia.com> commit 7203ec93a846e80c31f0fbaa68d86135fa878c6c Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Thu Mar 7 14:15:45 2024 +0530 Refactoring and Added test case for segment change event (#13445) * merge conflict * fix test case * fix phpstan * mark deprecated insted delete file commit bcef611386dd72a1e348f7a2a36d288c14b537f3 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu Mar 7 05:21:39 2024 -0300 [UX] Create tooltips for the "Script inside Head/Footer" labels (#13436) * tooltip * Update messages.ini * Update messages.ini * cs fix --------- Co-authored-by: Ruth Cheesley <ruth@ruthcheesley.co.uk> commit a1d40765a0a0b309f596f0f2146fc5b2799514ed Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Wed Mar 6 12:02:36 2024 -0300 [UX] Put a placeholder on Alias and Public name when creating Segment to indicate that they’re auto-generated (#13489) * placeholder * alignment * cs fix --------- Co-authored-by: John Linhart <admin@escope.cz> commit 8aa1bf75111941b050bddb0a3934a4ef79b4a422 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Wed Mar 6 11:58:47 2024 -0300 [UX] Add the same user account helper on the user settings page (#13498) * helper * duplicate fix commit 496ae2e2177945d007cd18e556d796efc41918f3 Author: Artem Lopata <biozshock@gmail.com> Date: Wed Mar 6 15:58:36 2024 +0100 Add autoconfiguration of tags for integration. (#13521) Co-authored-by: John Linhart <admin@escope.cz> commit 67de6bbc4fda38095d1a11fc87407a18d15593fd Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Wed Mar 6 11:51:56 2024 -0300 tooltip (#13493) Co-authored-by: John Linhart <admin@escope.cz> commit 2ba9a61e13e5333f0139ef2aca4d9975340f6f83 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Wed Mar 6 11:07:41 2024 -0300 reorder (#13488) commit 52835310feb5b5e104bf9a1d8961f00122c58f45 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Wed Mar 6 10:56:31 2024 -0300 Update messages.ini (#13501) commit f94dc207606b9d41a0a6d2e19499e6c996232ef0 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Wed Mar 6 10:54:42 2024 -0300 [UX] Change "Published" to "Active" in user settings and add a tooltip (#13503) * Update UserType.php * Update messages.ini commit 3f723daa4cf8a110f6ccd2e44bc0218bd5730768 Author: Patryk Gruszka <patryk.gruszka@comarch.pl> Date: Wed Mar 6 14:52:57 2024 +0100 feat: DPMMA-1572 Clone campaign events (#12752) * feat: [DPMMA-1572] clone campaign events draft * feat: [DPMMA-1572] paste cloned events * feat: [DPMMA-1572] use localStorage for cloned event sync * feat: [DPMMA-1572] event clone styles * fix: [DPMMA-1572] campaign event add/edit functional tests * fix: [DPMMA-1572] EventController refactor * fix: [DPMMA-1572] ux improvments, refactor * fix: [DPMMA-1572] fix event edit and ux improvements * fix: [DPMMA-1572] event clone functional tests * fix: [DPMMA-1572] undefined clone details * feat: [DPMMA-1572] clone campaign node restrictions * fix: [DPMMA-1572] event clone meessage --------- Co-authored-by: John Linhart <admin@escope.cz> commit 3521cf2f28f39c209f99993e4fe7632870f9e90b Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Wed Mar 6 08:17:28 2024 -0300 nap (#13473) commit 0796409bdc97d23124867cf301099f5210edacb1 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Tue Mar 5 13:40:48 2024 -0300 [UX] Improve the explanation of the Automatic way to implement the form (#13477) * Update messages.ini * Update details.html.twig * Revert "Update details.html.twig" This reverts commit 98f15a4c56f8ad31f5d8b00c405f6294e192efc3. * revert translation keys commit 8f326451063a28a778e93a6c6374088df615b4f1 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Tue Mar 5 13:28:49 2024 -0300 [UX] Place the tip modal (the one that asks the website to generate preview) more below for Focus Items (#13494) * remove margin top class * less commit 34c14fc8f94251701857e79f19882755a83e4881 Author: Aarohi Prasad <aarohi.prasad@acquia.com> Date: Tue Mar 5 14:55:00 2024 +0530 Dnc segment sql optimization (#13413) * DNC segment SQL optimization * DNC segment SQL optimization * DNC segment SQL optimization - fixed if statement according to coding standards. * Update app/migrations/Version20190410143658.php I have tried it with missing index, it is working. Co-Authored-By: ondrejsibl <ondrej.sibl@mautic.com> * fixed changed exception and fixed styling and code standars * added index in entity as well * cs fixer * corrected the name of index --------- Co-authored-by: Ondrej Sibl <ondrej@sibl.info> Co-authored-by: John Linhart <jan@linhart.email> Co-authored-by: ondrejsibl <ondrej.sibl@mautic.com> commit d62c2a31d840adef9a46d4bc8846b977200d0a91 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue Mar 5 10:01:30 2024 +0100 Bump phpseclib/phpseclib from 3.0.35 to 3.0.37 (#13519) Bumps [phpseclib/phpseclib](https://github.com/phpseclib/phpseclib) from 3.0.35 to 3.0.37. - [Release notes](https://github.com/phpseclib/phpseclib/releases) - [Changelog](https://github.com/phpseclib/phpseclib/blob/master/CHANGELOG.md) - [Commits](https://github.com/phpseclib/phpseclib/compare/3.0.35...3.0.37) --- updated-dependencies: - dependency-name: phpseclib/phpseclib dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit 45659c57bc438e5dedece5da34eb065709b50b52 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Mon Mar 4 06:22:50 2024 -0300 Update messages.ini (#13504) commit af39d04c336c89e43edf7507ab335452ba18734f Author: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sun Mar 3 16:29:14 2024 +0000 docs: add magdalenaleonow as a contributor for bug (#13513) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> commit 169512c1116a181c563e65d5548b8eba401f7f11 Author: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sun Mar 3 08:10:14 2024 +0000 docs: add Esthertests as a contributor for review (#13512) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> commit 2f37c9ac5ffc9c40378baf89758e29a2baa461f5 Author: Rahul Shinde <shinde.r.a@gmail.com> Date: Fri Mar 1 17:30:55 2024 +0530 Updated CommonController::delegateView to include "mauticTemplate" value in "mauticTemplateVars" for rendering (#13509) commit 4a3cfb7c16c0551490cc598508d935cc3b31969d Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Fri Mar 1 14:15:25 2024 +0530 Catch ClientException's to account for validation errors. (#13482) * Catch ClientException's to account for validation errors. * fix cs --------- Co-authored-by: Don Gilbert <don@dongilbert.net> Co-authored-by: John Linhart <admin@escope.cz> commit 811ded8b6a5e658256bc857627f00978bfdbeb90 Author: Miroslav Fedeleš <miroslav.fedeles@gmail.com> Date: Fri Mar 1 09:28:40 2024 +0100 Add batching to notification campaign subscriber (#13451) * Add batching to notification campaign subscriber * BC break reverted commit 85c32326632adff247d6075a47e6ca549c4b6675 Author: Alan Syrgak <96595532+Syrgak-Alan@users.noreply.github.com> Date: Thu Feb 29 17:12:22 2024 +0100 Enhanced user information (#13074) * completed enhanced_user_information update * solving possible phpstan issue * fixed PHPSTAN issue * resolved phpstan return type issue * solved updated and created logs for user auditlog * Update app/bundles/CoreBundle/Entity/AuditLogRepository.php Co-authored-by: John Linhart <jan@linhart.email> * getting request error in test scenario * checking whether response contains audit information * passed assertions * Update AuditLogRepository.php * solved phpstan and cs issues * space between methods in repo * made visible user status in list page * separation of templates for better understanding * solved issues caused by roles, improved text readility * hidden switch for currently logged in user --------- Co-authored-by: DDEV User <nobody@example.com> Co-authored-by: John Linhart <jan@linhart.email> Co-authored-by: John Linhart <admin@escope.cz> commit efed000e82b7c2017b4f578bf9437402aa733e89 Author: Rohit Pavaskar <rohitpavaskar.19@gmail.com> Date: Thu Feb 29 18:16:12 2024 +0530 Fix missing count (#13463) * Fix missing count * Test case * Fix test case --------- Co-authored-by: Rohit Pavaskar <rohit.pavaskar@acquia.com> commit 4e3c4493402342e2f3d06fd04ce9bd569e638e89 Author: Rohit Pavaskar <66303837+rohitp19@users.noreply.github.com> Date: Thu Feb 29 18:14:24 2024 +0530 Fix migration generated columns (#13455) * Run generated column migrations after the console terminates rather than before the command runs * Use correct event class * Fix --------- Co-authored-by: Don Gilbert <don@dongilbert.net> commit e26f47f21876a0677046e52f09c4ae37f00152d9 Author: Rohit Pavaskar <rohitpavaskar.19@gmail.com> Date: Thu Feb 29 18:13:21 2024 +0530 Use the tmp path instead of the cache path when zipping themes for do… (#13483) * Use the tmp path instead of the cache path when zipping themes for download. * PHPSTAN --------- Co-authored-by: Don Gilbert <don@dongilbert.net> Co-authored-by: Rohit Pavaskar <rohit.pavaskar@acquia.com> commit c5e5167de17cdfbeb7af51c66da6e46cc37ef642 Author: John Linhart <admin@escope.cz> Date: Thu Feb 29 13:18:39 2024 +0100 Display UI warnings when a segment that is used in campaign gets unpublished (#13460) * Merge pull request #1359 from acquia/MAUT-5603 [MAUT-5603] Display UI warnings when a segment that is used in campaign gets unpublished * Changes needed after rebase to M5 --------- Co-authored-by: Anton Vlasenko <43744263+anton-vlasenko@users.noreply.github.com> commit d98d7f00b1cf05412d13e3a19cea7711ba9706cd Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Thu Feb 29 17:33:38 2024 +0530 Removed unnecessary join (#13481) * Merge pull request #798 from mautic-inc/MAUT-2787 Removed unnecessary join * Catch ClientException's to account for validation errors. * Revert "Catch ClientException's to account for validation errors." This reverts commit 098779e1921949f03e3980bf67b456df9af040c8. * fix test case --------- Co-authored-by: John Linhart <admin@escope.cz> Co-authored-by: Don Gilbert <don@dongilbert.net> commit 85f5c1eeaca0cb07cc3fc6fc4f8effc353a66492 Author: John Linhart <jan@linhart.email> Date: Wed Feb 28 16:57:29 2024 +0100 STAN fix (deprecated method updated) commit cf75b969502b839b621393405b011fe223792311 Author: John Linhart <jan@linhart.email> Date: Wed Feb 28 15:54:19 2024 +0100 Fixing a test broken by 13340 commit 211cce3e3e25cdbab09aa6d477424192f6dca41e Author: Tejas Navghane <ts.navghane@gmail.com> Date: Wed Feb 28 18:11:02 2024 +0530 Add merge filter query (#13484) commit ca3dd73201a00dddb419150b817a9e053c2e2947 Author: Rohit Pavaskar <rohitpavaskar.19@gmail.com> Date: Wed Feb 28 17:54:43 2024 +0530 Fix integration sync for deleted contacts (#13340) * Fetch the records if lead exists while generating the sync report * Added clean integration data command * Fixed test cases with added join scenario * Added test case for cleanup command * Removed unnecessary typecasting * Added limit of 100o in worst case scenario * Addressed review changes * Added hard limit of deletion * CS Fixer * Fixed failures * Rector Suggestions * Fix --------- Co-authored-by: Rohit Pavaskar <rohit.pavaskar@acquia.com> commit 881dc83f157146b292bd38b71a6d8ad3b26d16a9 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Wed Feb 28 09:22:50 2024 -0300 removed (#13480) commit e894a8ad0d6db19afcb5d398e2f8df97728062aa Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Wed Feb 28 17:47:36 2024 +0530 Fix dnc contact issue whilesync with salesforce (#13444) * Fix bug in SalesforceIntegration::pushLeadDoNotContactByDate. We should process DoNotContact Salesforce records in ascending order, otherwise the first record will be processed last and it will cause wrong DNC status in Mautic. * Update the test. We now use getDoNotContactHistory instead of getDncHistory method. * fix cs * fix rector issue --------- Co-authored-by: Anton Vlasenko <vlasenko.anton@gmail.com> commit 61374143c9148e7a7ce2965977b4f7079f27bd0c Author: John Linhart <jan@linhart.email> Date: Wed Feb 28 10:01:24 2024 +0100 CS fix commit 20f3fcdeaba85edca66bab3b2b98dcb7929d2af0 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Wed Feb 28 05:59:51 2024 -0300 [UX] Change the 3-dot icon to a drag icon (#13475) * replace fa classes on js and php * new drag icon * grab cursor for sortable items commit c0c0e8474ebb065f8a82190366eafb2a00f18a3a Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Wed Feb 28 05:55:15 2024 -0300 [UX] Improve the explanation of the Manual Copy way to implement the form (#13478) * Update messages.ini * Update details.html.twig commit b0008fac7e94fac8ce361b3c18076a6b716f6928 Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Wed Feb 28 14:17:15 2024 +0530 Set user in token storage during import process (#13469) * Merge pull request #791 from mautic-inc/MAUT-3532 MAUT-3532: Set user in token storage during command based import processing * fix test case --------- Co-authored-by: John Linhart <admin@escope.cz> commit 5210980d987b271971849179afb2298779616671 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Wed Feb 28 05:45:31 2024 -0300 tooltip (#13479) commit d2f1900e494b6c034f0c88341d707fc5c5684c3a Author: Rohit Pavaskar <rohitpavaskar.19@gmail.com> Date: Wed Feb 28 14:11:02 2024 +0530 Fix case senitive search (#13466) * Fixed bug where JSON fields werent doing case insensitive search * CS FIXER * Added test case * PHPSTAN --------- Co-authored-by: mtshaw3 <mike.shaw@acquia.com> Co-authored-by: Rohit Pavaskar <rohit.pavaskar@acquia.com> commit c5fa90f9f48622368478673796a85f98cee5ae2b Author: Miroslav Fedeleš <miroslav.fedeles@gmail.com> Date: Wed Feb 28 09:34:38 2024 +0100 Added an option for excluding segments when creating/updating segment emails (#13458) commit 0c53b53c1f4016ce3800ebb7d709f0a54895c898 Author: John Linhart <admin@escope.cz> Date: Tue Feb 27 12:30:51 2024 +0100 Range processing of webhooks (#13448) * Range processing of webhooks * Covering the webhook processing command with tests commit 0961dc55472c6e587dae89872ec3d2d0647af104 Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Tue Feb 27 14:40:59 2024 +0530 Add html custom field (#13428) * Merge pull request #644 from mautic-inc/beta.MAUT-2707.html-custom-field-type Custom HTML type field * add support of html field in custom field * fix phpstan * add html type class * add class name * MAUT-3728: HTML type custom field cause exception in contact edit * fix exception * fix rendering issue * MAUT-3728: HTML type custom field cause exception in contact edit * 1. Refactor Mautic\LeadBundle\Form\Type::validateDefaultValue method. 2. Add a validation message when the length of a default custom field value exceeds the database limit for utfmb4 varchar fields. * Increase code coverage. * Increase code coverage. * Fix the code according to https://github.com/mautic-inc/mautic-cloud/pull/1007#discussion_r490242808 * Remove unused class. * Fix static analysis error. * fix test case * fix cs issue --------- Co-authored-by: Ondřej Šíbl <ondrej.sibl@mautic.com> Co-authored-by: Liju P M <liju.pm@acquia.com> Co-authored-by: Anton Vlasenko <vlasenko.anton@gmail.com> commit 71acf7c5c7399929fbfafa9cb156a5837eaeef37 Author: Miroslav Fedeleš <miroslav.fedeles@gmail.com> Date: Tue Feb 27 10:08:56 2024 +0100 Webhook email content exclusion (#13447) * Webhook configurable email details exclusion * JMS API metadriver fixed (got broken via https://github.com/mautic/mautic/pull/12396) * Fixed: JMS\Serializer\Handler\DateHandler::serializeDateTime(): Argument #2 ($date) must be of type DateTime, DateTimeImmutable given commit f968ff08741840508fb2735da85fb4b2c76a7dcb Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Mon Feb 26 11:48:52 2024 -0300 new messages (#13372) commit 8e5b815601cc1dfc390a9010f12ff793b9cbedb2 Author: John Linhart <admin@escope.cz> Date: Mon Feb 26 14:33:57 2024 +0100 IntegrationBundle bug fixes (#13454) * Merge pull request #1213 from acquia/MAUT-5072 Segments are very slow to build * Adding the index also to the entity * Merge pull request #889 from mautic-inc/MAUT-3552 Impossible for a marketer to know why an object did not sync due to validation issues * Merge pull request #1000 from mautic-inc/MAUT-4181 MAUT-4181: IntegrationsBundle: don't sync other object types if IDs for particular objects are specified * Fixes after rebase to M5 * Merge pull request #1060 from mautic-inc/MAUT-4362 MAUT-4362: Scoring - SFDC clearing out new data from ACS * Merge pull request #1093 from mautic-inc/MAUT-4640 MAUT-4640: The field change log queue is not processed entirely during a single integration sync * Chages needed after rebase to M5 * Merge pull request #1486 from acquia/MAUT-6230-syncing-sf MAUT-6230 / Removed last sync date time from ObjectDAO and Integratio… * Merge pull request #1706 from acquia/MAUT-6264 MAUT-6264 "Push to Salesforce" Campaign Action showing wrong count * Merge pull request #1758 from acquia/MAUT-7063-Salesforce-Integration-referenceValueDAO-is-causing-sync-issues MAUT-7063: salesforce integration reference value dao is causing sync issues * Merge pull request #1802 from acquia/MAUT-7700 MAUT-7700 - Fixing incorrect timeline URL for salesforce * Fix new line issue * Fixes after rebase to M5 * Merge pull request #1968 from acquia/MAUT-5271 MAUT-5271: Plugin Credentials Change Bug Fix * Changes needed after rebase to M5 --------- Co-authored-by: Anton Vlasenko <43744263+anton-vlasenko@users.noreply.github.com> Co-authored-by: Alan Hartless <alan@devkardia.com> Co-authored-by: lukassykora <lukas.sykora@acquia.com> Co-authored-by: Rohit Pavaskar <66303837+rohitp19@users.noreply.github.com> Co-authored-by: Robert Parker <diaboloshogunate@gmail.com> Co-authored-by: Miroslav Fedeleš <miroslav.fedeles@gmail.com> Co-authored-by: Saurabh Gupta <saurabh.gupta@acquia.com> Co-authored-by: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> commit cb5b3c729bf898051274d5d434b25e766a963cd7 Author: Aarohi Prasad <aarohi.prasad@acquia.com> Date: Mon Feb 26 14:56:32 2024 +0530 Segment permission changes 5x (#13321) * Updated permissions for lead list (segment). * Initial migration script to map the permissions. * Updated listing page for permissions. * cs fixer * Updated permission for Edit, Delete, Clone and other operations. * Updated the list api permission. * Added the custom field related permission back. * Added list controller function tests for permissions. * Added permission tests for clone and edit. * Updated testcases for delete and batchDelete action. * Added test for view action. * Added functional test to check for permissions availability. * Made test classes final * Added test cases for clone and edit invalid id segment. * Corrected urls for delete action. * Updated test case names. * Added tests to cover addLead and removeLead actions. * Corrected delete action permission * Added test case for delete action. * Updated migration. * Updated test case for more coverage for delete action. * Updated migration. * Updated, added new test for coveerage. * Updated tests for covering Cancel and Apply button on new action. * Updated tests for covering Cancel and Apply button for edit action. * False negative SonarCube coverage repost bypassed CS Fixer applied * Updated code to remove duplicates. * Updated migration to improve the lists permissions. * Added generic view permission. * Updated the permission to work as other listings. * Updated test for list controller. * Updated Segment clon permission and funnctionality. * Added strict_types declaration. * Updated the permission to same for all places. * Updated permission for clone operation. * Updated segment list to show all global or created by user when user don''t have view other permission * Updated permission to show clone link on listing page * Update app/bundles/LeadBundle/Tests/Security/LeadPermissionsFunctionalTest.php Co-authored-by: Tejas Navghane <tejas.navghane@acquia.com> * Updated listing page for permissions. * False negative SonarCube coverage repost bypassed CS Fixer applied * Updated Segment clon permission and funnctionality. * Updated the permission to same for all places. * Updated permission for clone operation. * Updated segment list to show all global or created by user when user don''t have view other permission * Updated the code to fix the rebase traces. * Updated the clon permission * Removed incorrect inclusion while rebasing the branch * Fixed cs :( * Updated testcase for permission, flashes are working differntly * Updated permission test case * CS fixes * cs fixer changes * cs fixer changes * phpstan fixes * fixed some more phpstan issues * used asserequals instead of assertsame * put false in a string * removed phpdoc * added baack instanceof assertion * fixed listController * cs fixer * fixed differences with original branch * cs fixer agai * uggh cs fixer again * removed redundant function call * changed value from false to 0 * made corrections in twig file * modified twig for details and deleted .html.php file * corected twig file * modified twig for list_row and deleted list.html.php file * modified twig list.html and deleted index.html.php file --------- Co-authored-by: Rahul Shinde <shinde.r.a@gmail.com> Co-authored-by: fedys <miroslav.fedeles@gmail.com> Co-authored-by: Tejas Navghane <tejas.navghane@acquia.com> commit e5a0521679f8d6c9dede30498e097e0a44b816a2 Author: John Linhart <admin@escope.cz> Date: Mon Feb 26 09:56:52 2024 +0100 Ensure all form fields are included within the form tag (#11442) * Update CoC (#11413) Co-authored-by: John Linhart <admin@escope.cz> Don't use end() as we're handling the closing form tag ourselves. Should have done this in smaller commits. Here we add support for wrapping all inputs in a form tag to ensure that we capture the CSRF token when submitting the unsubscribe form. There is also some heavy refactoring of private methods. Further refactoring to reduce method size and add clarity. Refactor renderLanguageBar and reduce duplication WIP on test case No need to recount pages, just use the count Complete tests These test ensure that the form tag correctly wraps all inputs for the frequency form. We must always include the _token and save button within the form tag. Do not attempt to perform replacement operations if the page has no content. Add better logging to test error message. Forgot the placeholders Use the crawler output instead of just form output Also setCustomHtml when creating the page Update save prefs selector Set show_contact_preferences to 1 for this test Check for presense of token before performing rendering to reduce database load where possible. Add tests for default preference center page. Had to add a data-contact-frequency attribute to the default preference center layout in order to have something to search for and confirm that it exists. Count the available choices, not the form children Remove static results variable in CategoryModel getLookupResults The static here was causing issues with tests. Add back the view parameters. Refactor how they are calculated. STAN fixes Test fixes * Fixes after rebase on M5 * Fixes after rebase to M5 * Adding back code missing from Twig refactoring * Try running in a separate process so it wouldn't conflict with other tests * Load the Grapes JS assets only in administration It threw a JS error on the unsubscribe pages * Hide buttons as we did in M4 * Fixing legacy builder pref center preview * Adding test --------- Co-authored-by: Ruth Cheesley <ruth.cheesley@acquia.com> commit 0d68a66f8647db21dd538c34ecebb85fd3faf4e8 Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Mon Feb 26 14:07:26 2024 +0530 optimize query (#13420) Co-authored-by: John Linhart <admin@escope.cz> commit e0ffc1c7132b44325793fd590c4a098f750c6cc8 Author: John Linhart <admin@escope.cz> Date: Fri Feb 23 12:07:09 2024 +0100 Fixing embedded images (#13449) commit 2768e1ce12e8d070d72c72ee4455c214ebe3452e Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Fri Feb 23 05:55:18 2024 -0300 update icon (#13375) Co-authored-by: Zdeno Kuzmany <zdeno@kuzmany.biz> commit 5f5ecf31a00779a8372072ed472bd18b5f66a799 Author: John Linhart <admin@escope.cz> Date: Fri Feb 23 09:44:11 2024 +0100 Support a custom country and region list through a local file (#13430) * Support a custom country and region list through a local file * Added a new line at the end of the json test files * Changes needed for M5 --------- Co-authored-by: Alan Hartless <alan@devkardia.com> commit beaaf00233b403aaa06e7f4303711a732ff0a5ce Author: jamsch <12927717+jamsch@users.noreply.github.com> Date: Fri Feb 23 08:32:56 2024 +1300 fix: avoid page refresh on remote asset browser (#13442) commit bab305c0ec74d7e736f9e6e12ad4014b77456780 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu Feb 22 10:57:21 2024 -0300 [UI/UX] New icon pack (#13318) * add files * add library * fix prod path * npm fix * libraries fix * revert * scaffold fix --------- Co-authored-by: John Linhart <admin@escope.cz> commit 496a0bdc229631561c6a149c9865b8430812379e Author: John Linhart <admin@escope.cz> Date: Thu Feb 22 14:24:41 2024 +0100 Create temp directories if they don't exist (#13415) * Cherry-picked updates to PathsHelper from community M3 to minimize conflicts with tests * is_writable returns false if the file or directory doesn't exist to start with (no idea why it was here to start with?) * Reverting changes that shouldn't be made by the cherry-pick * Fixing CI checks --------- Co-authored-by: Alan Hartless <alan@devkardia.com> commit 6f114945d9a2f5c50009c85ebc8564b3e2fda68f Author: Adrian Schimpf <adrian@aivie.ch> Date: Thu Feb 22 13:52:14 2024 +0100 also prefill form fields with the type number (#12668) Co-authored-by: John Linhart <admin@escope.cz> commit a4aa11c125f51a45cae3cb63d6fef0f0b68b9667 Author: Zdeno Kuzmany <zdeno@kuzmany.biz> Date: Thu Feb 22 13:41:55 2024 +0100 Focus: Remove click event anywhere to close modal (#12705) * Remove click event anywhere to close modal * Remove redundant event listener for closing focus modal on click on document --------- Co-authored-by: Mattias Michaux <mattias.michaux@dropsolid.com> commit 3630317cb663799fee4934a6636c1bc9624d95c6 Author: Zdeno Kuzmany <zdeno@kuzmany.biz> Date: Thu Feb 22 13:40:54 2024 +0100 Report: add date added to contact's data (#12841) * Report: add date added to contact's data * Fix unit tests --------- Co-authored-by: John Linhart <admin@escope.cz> commit b28be98f48cb9e7ff48f2905108962f8041462fb Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu Feb 22 09:27:47 2024 -0300 tooltip (#13366) commit 4d045f546508cde907f908dc7447988b69a45fe5 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu Feb 22 09:21:32 2024 -0300 Update messages.ini (#13364) commit 72972e3a4799995fc1898fb7a1774dad90af90d1 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu Feb 22 09:21:05 2024 -0300 new icon (#13365) commit 1e010bc988d1d244a02f4018e9885b2bf479a364 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu Feb 22 09:17:33 2024 -0300 Update messages.ini (#13369) commit d968447d720f295e2c1a1cc623869aa3b7908417 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu Feb 22 09:17:03 2024 -0300 Update messages.ini (#13370) commit bf8dd69679d7e09dfba60172420441dafb4d43c9 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu Feb 22 09:16:16 2024 -0300 Update messages.ini (#13371) commit b9f9da7a70bf5cd8fc8b03b626bbccb3020a69d2 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu Feb 22 09:13:40 2024 -0300 update label (#13377) commit 55412cac39cafde5f22f782d94331625b0591763 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu Feb 22 09:11:44 2024 -0300 Update messages.ini (#13439) commit 2d1c05aeb39b1b021ea68f502efc3e1968a86513 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu Feb 22 09:10:43 2024 -0300 Update messages.ini (#13438) commit 65c9d14200cf90a7cd8b36739ec25450cb1ff550 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Thu Feb 22 09:09:01 2024 -0300 Update messages.ini (#13437) commit 99fb0ec3da3c047ed052b9399d3ee1c8fe14e35b Author: John Linhart <admin@escope.cz> Date: Thu Feb 22 12:26:52 2024 +0100 Replaces the `manipulator` entry in the audit log with something useful (#13432) * Add description to the LeadManipulator when a campaign modifies a contact. * Add getters to LeadManipulator for information to log to the audit log * Prevent a memory leak when processing large batches of contacts because the keys are never reset between contacts. * Don't log the manipulator 0/1 but instead log something useful * Fixed CampaignSubscriberFunctionalTest * Changes after rebase to M5 * Show all fields in the audit log tab this was broken since the Twig refactoring --------- Co-authored-by: Alan Hartless <alan@devkardia.com> commit 54b660e61bf0c1c4695a02c1e4955f874a2b3e79 Author: John Linhart <admin@escope.cz> Date: Thu Feb 22 12:24:43 2024 +0100 Prevent duplicate contacts or companies from being created during integration syncs when new objects are mapped to multiple integration object IDs (#13435) * Prevent duplicate contacts or companies from being created if they are included in the same batch mapped to different integration object IDs * Fix CS * Change PHPDoc argument type Co-authored-by: John Linhart <admin@escope.cz> * Change PHPDoc argument type Co-authored-by: John Linhart <admin@escope.cz> * Change PHPDoc argument type Co-authored-by: John Linhart <admin@escope.cz> * Change PHPDoc argument type Co-authored-by: John Linhart <admin@escope.cz> * Fixing typehints * Fixing typehints * Changes after M5 rebase * Changes needed after M5 rebase --------- Co-authored-by: Alan Hartless (he/him) <alan@devkardia.com> Co-authored-by: Tejas Navghane <tejas.navghane@acquia.com> commit 15df3dae7d748d77bb556b0aa98826d8b266ecaa Author: John Linhart <admin@escope.cz> Date: Thu Feb 22 12:22:50 2024 +0100 Attribute changes made by the integration to the integration in the audit log (#13426) * Attribute changes made by the integration to the integration in the audit log * Prevent test issues with MAUTIC_AUDITLOG_USER already being defined --------- Co-authored-by: Alan Hartless <alan@devkardia.com> commit 0861c02950f44c5131c183f6e774dd2bac7a6d72 Author: Rohit Pavaskar <66303837+rohitp19@users.noreply.github.com> Date: Thu Feb 22 16:39:58 2024 +0530 Failed Event Notifications (#13402) * PATCHED * Fixed PHPSTAN issues * CSFIXER * Gix test cases * Gix test cases * Fixed Multiple notifications * Fix test case * Added strict type * CSFIXER commit a5b200623b38538efb1cf324c0dcece5469b1130 Author: Rohit Pavaskar <rohitpavaskar.19@gmail.com> Date: Thu Feb 22 16:31:51 2024 +0530 Support contact tokens in unsubscribe text (#13421) * add token replacements to unsubscribe string and cover with tests * Fix tests * Fix test case * Improvement --------- Co-authored-by: Jan Kozak <galvani78@gmail.com> Co-authored-by: Rohit Pavaskar <rohit.pavaskar@acquia.com> commit bab02becefcc3cf7b167393565edba2f0989c747 Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Thu Feb 22 14:17:39 2024 +0530 Fix plugin update (#13423) * Enable plugin updates when version is newly specified * fix plugin update --------- Co-authored-by: Lukas Drahy <lukas@drahy.net> commit fc164050e3ef1cad36355cc3564be1e1f46b96ef Author: John Linhart <admin@escope.cz> Date: Thu Feb 22 09:42:39 2024 +0100 Enable an integration to set a default expiration for access tokens (#13429) * Enable an integration to set a default expiration for access tokens * Fix restoring the correct expiration to IntegrationToken * Consider the token expired if it is missing the access token in order to trigger the middleware to fetch a new token * CS fix --------- Co-authored-by: Alan Hartless <alan@devkardia.com> commit 517bd4a6f5a658e259e5c886eace2390f7c78006 Author: John Linhart <admin@escope.cz> Date: Thu Feb 22 09:40:40 2024 +0100 New event for plugins INTEGRATION_CONFIG_ON_GENERATE_AUTH_URL (#13434) * Provide a way for hosts to rewrite the auth URL for a plugin built on the IntegrationBundle's OAuth2 http client to be able to proxy requests through a single point of entry * Updates for M5 --------- Co-authored-by: Alan Hartless (he/him) <alan@devkardia.com> commit 3bc89975e1f523a7e81507266294a77e398d31b7 Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Wed Feb 21 19:42:14 2024 +0530 fix undefined variable issue (#13419) commit e4d0ccb4a1796ac2ebffc4c5b3182489db5fedd2 Author: Rahul Dhande <68939488+rahuld-dev@users.noreply.github.com> Date: Wed Feb 21 18:44:32 2024 +0530 fix for lose all existing company when create from lookup field (#13398) commit cdf9a3d7f0f549f3193116d570de881934e9377d Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Wed Feb 21 18:42:50 2024 +0530 Cleanup exported reports (#13405) * Cleanup exported reports - removing csv and zip files after email is being sent * Cleanup exported reports * Cleanup exported reports - tests * Cleanup exported reports - updating tests * Update app/bundles/ReportBundle/Scheduler/Model/FileHandler.php Co-Authored-By: John Linhart <admin@escope.cz> * Update app/bundles/ReportBundle/Scheduler/Model/SendSchedule.php Removing testing comment Co-Authored-By: John Linhart <admin@escope.cz> * Update app/bundles/ReportBundle/Model/ReportCleanup.php Cleanup exported reports - we want to keep the file fo 7 days Co-Authored-By: John Linhart <admin@escope.cz> * Update app/bundles/ReportBundle/Event/PermanentReportFileCreated.php Removing a comment for constructor Co-Authored-By: John Linhart <admin@escope.cz> * Cleanup exported reports - renaming event class * Cleanup exported reports - removing unnecessary condition * Cleanup exported reports - changing condition for empty zipFilePath * Cleanup exported reports - removing additional space * Cleanup exported reports - adding condition if file exists * fix test cases --------- Co-authored-by: Ondrej Sibl <ondrej@sibl.info> Co-authored-by: John Linhart <admin@escope.cz> commit 20710b39b6261e34d449a5a627490b9f8811a5fe Author: John Linhart <admin@escope.cz> Date: Wed Feb 21 13:59:28 2024 +0100 Translate option label (#13427) commit f8ce7d3d65e3d030f6a33ca2018a2be5f93b72ed Author: Patryk Gruszka <patryk.gruszka@comarch.pl> Date: Wed Feb 21 13:58:55 2024 +0100 DPMMA-2588 Change List-Unsubscribe order to favour one-click unsubscribe (#13407) * fix: [DPMMA-2588] change list-unsubsribe values order * fix: [DPMMA-2588] MailHelper usubscribe parameter order test * fix: [DPMMA-2588] mail tests fix commit 77c24e86d4e0c676efacac74bd6a9299609c8d83 Author: John Linhart <jan@linhart.email> Date: Wed Feb 21 11:57:06 2024 +0100 Fixing STAN commit 41d34dedf343032869f80428d8dd0258c6bbc258 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Wed Feb 21 07:52:06 2024 -0300 [UX] Change category Published label to “Available for use” (#13374) * new label * new helper commit 8285f3125fe06b0fd95e4ea106db0cdd696d9891 Author: Mattias Michaux <mattias.michaux@dropsolid.com> Date: Wed Feb 21 11:48:29 2024 +0100 Ensure lockfile aligns with the installed packages and constraints (#13401) commit 75e780c212c834a15c94633abe43f38aa2eee59d Author: Artem Lopata <biozshock@gmail.com> Date: Wed Feb 21 11:47:21 2024 +0100 Trailing slash handling. (#13388) commit 96ff70c3d57d7a9cf5502411926a82623bdc16f8 Author: Artem Lopata <biozshock@gmail.com> Date: Wed Feb 21 11:46:10 2024 +0100 Allow to exclude campaigns and segments from processing. (#13383) Commands: mautic:campaigns:trigger, mautic:campaigns:rebuild, mautic:segments:update allow to exclude processed entities. commit bbd21eb6bedfab57094a9a3262ae4a346f2ded26 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Wed Feb 21 07:44:00 2024 -0300 [UX] Rename Order to Field order and add a tooltip (#13417) * label * tooltip commit ffe71dd1f109fdf44bbb7384ba519207af078ff1 Author: John Linhart <jan@linhart.email> Date: Wed Feb 21 11:34:33 2024 +0100 Fixing the `mautic:reports:scheduler` command "There is currently no session available" commit c7235c08efcdf81d259dfe8cd2fea8ed5458999c Author: John Linhart <admin@escope.cz> Date: Wed Feb 21 11:32:07 2024 +0100 Fixed cleaning up the field change table if it happens that a contact or company is deleted before a sync can happen (#13422) * Fixed cleaning up the field change table if it happens that a contact or company is deleted before a sync can happen * Adding one more test --------- Co-authored-by: Alan Hartless <alan@devkardia.com> commit cd57d835232cf450e8ee933d41372b6a9f6c1733 Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Wed Feb 21 14:54:33 2024 +0530 Fix link to absolute url (#13403) * Fix link to be absolute url in campaign unpublish email. * fix cs --------- Co-authored-by: Don Gilbert <don@dongilbert.net> commit 0aaeba2292397926d948d029143a244c9f3f1dc2 Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Tue Feb 20 17:43:38 2024 +0530 Add standard API endpoints for reports (#13378) * Added missing report API endpoints * CS fixes * Prevent notice on patch * Add functional tests * Test Jenkins test loop - POST * Test Jenkins test loop - POST * Test Jenkins test loop - GET * Test Jenkins test loop - GET * Test Jenkins test loop - disabled * add all standard api for report --------- Co-authored-by: Alan Hartless <alan@devkardia.com> commit fe4e4547de7ca99259057a7422ab878a50975f6d Author: Rohit Pavaskar <rohitpavaskar.19@gmail.com> Date: Tue Feb 20 15:49:47 2024 +0530 Dashboard ajax improvements (#13392) * Fix typo in docblock * Imporovements sketches - TODO * Remove duplicate method * Fix docblock * Show widgets with no data and spinner * Add doc and remove unused exception * Remove unused condition * Fix docblock * Remove unused empty data from view * Add changes to twig file * Add changes to twig file * Deleted unused files * CSFIXER --------- Co-authored-by: Lukas Drahy <lukas@drahy.net> Co-authored-by: Rohit Pavaskar <rohit.pavaskar@acquia.com> commit 5943c0d19d9b968dbde7fa0b449c2991a6e7e99d Author: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Date: Tue Feb 20 14:42:27 2024 +0530 Add primary company field in dynamic content (#13393) * add primary company fields to dynamic content * cs fixes * remove method returning array of primary companies as there is just one primary * fix phpdoc * remake a little the primaryCompany function * add tests to company dynamic fields * cs fixes * draft test, not working at() * improve and fix the test * bloody cs fixess * change the extended class for test * fix php stan, testcase --------- Co-authored-by: Jan Kozak <galvani78@gmail.com> * list styles * new list style * Update app/bundles/FormBundle/Translations/en_US/messages.ini Co-authored-by: Ruth Cheesley <ruth@ruthcheesley.co.uk> * Update app/bundles/FormBundle/Translations/en_US/messages.ini Co-authored-by: Ruth Cheesley <ruth@ruthcheesley.co.uk> * added variables + grunt compile-less * fix panel height * cleanup * fix variables * Revert "fix variables" This reverts commit 94c7deb72d226f8534b20dfb804cb8e3d3e0874b. * fix again * set another alignment * function instead of raw html * add + remove translation * email types --------- Co-authored-by: Mattias Michaux <mattias.michaux@dropsolid.com> Co-authored-by: Ruth Cheesley <ruth@ruthcheesley.co.uk>

TPROD-196: Updated the images refereces to pick from the right place.

cf0d4f6

shinde-rahul changed the title ~~TPROD-196: Updated the images references to pick from the right place.~~ TPROD-196: Updated the image references to pick from the right place. Apr 4, 2021

nickveenhof reviewed Apr 6, 2021

View reviewed changes

Reverting to the original media/images* ignore setup.

ef9eb9c

nickveenhof closed this Jun 4, 2021

mautibot pushed a commit that referenced this pull request Apr 18, 2023

stan #2

1ab9ca3

mautibot pushed a commit that referenced this pull request Jun 9, 2023

preg_match(): Passing null to parameter #2 ($subject) of type string …

d6f1ec2

…is deprecated

mautibot pushed a commit that referenced this pull request Jun 9, 2023

explode(): Passing null to parameter #2 ($string) of type string is d…

35b8b46

…eprecated

mautibot pushed a commit that referenced this pull request Jun 9, 2023

preg_match_all(): Passing null to parameter #2 ($subject) of type str…

a6901a3

…ing is deprecated

mautibot pushed a commit that referenced this pull request Jun 9, 2023

strnatcmp(): Passing null to parameter #2 ($string2) of type string i…

48f6574

…s deprecated

mautibot pushed a commit that referenced this pull request Jun 9, 2023

preg_match(): Passing null to parameter #2 ($subject) of type string …

16ad760

…is deprecated

mautibot pushed a commit that referenced this pull request Jun 9, 2023

method_exists(): Passing null to parameter #2 ($method) of type strin…

287673a

…g is deprecated

mautibot pushed a commit that referenced this pull request Jun 9, 2023

Exception::__construct(): Passing null to parameter #2 ($code) of typ…

a63f1be

…e int is deprecated

mautibot pushed a commit that referenced this pull request Jun 9, 2023

str_replace(): Passing null to parameter #2 ($replace) of type array|…

28f84c9

…string is deprecated

mautibot pushed a commit that referenced this pull request Jun 9, 2023

preg_match(): Passing null to parameter #2 ($subject) of type string …

abeeb34

…is deprecated

mautibot pushed a commit that referenced this pull request Jun 9, 2023

explode(): Passing null to parameter #2 ($string) of type string is d…

d6f8128

…eprecated

mautibot pushed a commit that referenced this pull request Jun 9, 2023

preg_match(): Passing null to parameter #2 ($subject) of type string …

a3e7c67

…is deprecated

mautibot pushed a commit that referenced this pull request Oct 3, 2023

Merge pull request #12700 from TomasVotruba/tv-rector-sets-2

9240963

[rector] [dead-code] Remove few ifs that are always true - part #2

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

TPROD-196: Updated the image references to pick from the right place. #2

TPROD-196: Updated the image references to pick from the right place. #2

shinde-rahul commented Apr 4, 2021

nickveenhof Apr 6, 2021

nickveenhof Apr 6, 2021

shinde-rahul Apr 13, 2021

nickveenhof commented Apr 24, 2021

RCheesley commented May 22, 2021

nickveenhof commented Jun 4, 2021

nickveenhof commented Jun 4, 2021

TPROD-196: Updated the image references to pick from the right place. #2

TPROD-196: Updated the image references to pick from the right place. #2

Conversation

shinde-rahul commented Apr 4, 2021

Ticket: https://mautic.atlassian.net/browse/TPROD-196

nickveenhof Apr 6, 2021

Choose a reason for hiding this comment

nickveenhof Apr 6, 2021

Choose a reason for hiding this comment

shinde-rahul Apr 13, 2021

Choose a reason for hiding this comment

nickveenhof commented Apr 24, 2021

RCheesley commented May 22, 2021

nickveenhof commented Jun 4, 2021

nickveenhof commented Jun 4, 2021