Skip to content

Commit

Permalink
4.4.1 to 4.x (#11368)
Browse files Browse the repository at this point in the history
* Fix for all foreign tables segment filter with empty/notEmpty  expression (#11253)

* Fix for tags empty/notEmpty segment filter

* Add unit tests

* Adding some tags to 2 contacts to check that !empty works and testing also empty, !empty with companies

* CS fixes

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

* change lead to company trans key (#11300)

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

* Pending query optimization (#11260)

* ensure the app folder is seen as the 4.3.x instead of a specific version (#11213)

* align lock file with change from  #11203 (#11218)

* docs: add uzegonemad as a contributor for code (#11244)

* docs: update README.md [skip ci]

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

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>

* docs: add pety-dc as a contributor for code (#11246)

* docs: update README.md [skip ci]

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

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>

* Added message_lead_channel_channel_id index

* Email pending query optimized using independent sub-queries

* message_lead_channel_channel_id index reverted as the optimized query no longer uses it

* EmailRepositoryTest fixed

* EmailRepositoryTest increased code coverage

* Added EmailRepositoryFunctionalTest to further increase code coverage

* Fixing param types

* Fixing pending count when some contact was deleted

* Namespace fix

* EmailRepositoryTest queries updated

* Adding new functional test for pending count if there is an email stat with lead_id = null

* email ID can be variable

* CS, STAN fixes

* Removing method that did not belong to this PR and is not used

* Exclude contacts that are within excluded lists

* MAUT-6629: Updated email of type list to consider the category prefrence.

* Table prefix is set after the datasets are loaded. So we have to replace in the test

* Removing test that belongs to another PR

* CS, STAN fixes

* Using arrow functions

* CS fix

* Removing test from a future PR

* Fixing tests

* Removing part of a feature from another PR

* Test fixes

* CS fix

* Running "composer update --lock" after wrong git rebase conflict resolution

Co-authored-by: mollux <[email protected]>
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: fedys <[email protected]>
Co-authored-by: Rahul Shinde <[email protected]>

* Check existing property (fixes #11299) (#11321)

* Removed charLengthLimit.

* Adding a functional test for a regression bug

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

* Fix user language preference over system language (#11119)

* Fix user and system locale not applying on its updates

* Fix failing test

* Fix failing test

* Fix code smell

* Segment lookup_id field : use the data-action attribute if present (#11327)

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

* Fix report export to Excel with aggregated bool columns (#11298)

* Fix report xls export with aggregated columns

* PHPSTAN fix

* Return types in ReportBundle test fixtures

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

* Use param type by declaration in ExcelExporter

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

* Changes from PR#10782 rebuilded (#11319)

* Fix No Data shown for Most hit email redirects dashboard widget (#11086)

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

* Add translations for new blocks (#11006)

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

* Fix special characters in form condition value (#11093)

* Fix special characters in form condition value

* Fix compare sanitize special chars vs plain from post for conditonal fields

* Add unit tests

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

* Cancelling new campaign should not give 500 error. (#11348)

Fixes #11181

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

* doctrine-fix was removed but master branch now has PHP 8 support (#11353)

* Check the type of the value before passing it into the strpos. (#11350)

* Fix issue 11267 - Sending emails via API should respect useOwnerAsMailer (#11347)

* if the mailer is owner use owner email as reply-to address (#11322)

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

* Tests for sending emails through Mautic's API

Add test cases for the following couple of API endpoints:

POST /emails/ID/send
Send a segment email to linked segment(s).

POST /emails/ID/contact/CONTACT_ID/send
Send a predefined email to existing contact.

Tests are made with mockup HTTP queries using the `request()` method of
a symfony's `KernelBrowser` object whose implementation is delegated to
Mautic's `AppKernel`.
As for emails that would otherwise be sent to recipients, these are caught
in a mockup SMTP transport object which doesn't actually send any emails,
but rather it stores a copy of the last email attempted which is made
accessible to the testing facilities for verification.

* Test the owner signature

Include a placeholer for the signature in the email message to test that
the owner's signature is used when the `useOwnerAsMailer` option is enabled.

* Fix issue #11267 - Sending emails via API should respect useOwnerAsMailer

Sending an email using the API endpoint `POST /emails/ID/contact/CONTACT_ID/send`
does not respect the email option `useOwnerAsMailer`.

The expected behaviour is for an email that would be sent by Mautic
it should appear to be sent by the `owner` of the contact who is the recipient,
i.e. for every sent email with the `useOwnerAsMailer` option enabled, the
sender's name and sender's email should belong to the `owner'.

This is a small bug where the owner is not provided in the contact
information passed to the mail sender.

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

* Use proper env variable processor for rememberme_lifetime. (#11363)

* Add core lib readme and workflow to auto-close PRs (#11354)

* Add GitHub workflow to close PRs on core-lib repo

* create readme for core-lib folder

* Update app/README.md

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

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

* 4.4.1 release bump (#11367)

* Bumping to version 4.4.1

* regerenating production assets with bin/console m:a:g

Co-authored-by: Zdeno Kuzmany <[email protected]>
Co-authored-by: Ruth Cheesley <[email protected]>
Co-authored-by: Norman Pracht - Webmecanik <[email protected]>
Co-authored-by: mollux <[email protected]>
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: fedys <[email protected]>
Co-authored-by: Rahul Shinde <[email protected]>
Co-authored-by: KN4CK3R <[email protected]>
Co-authored-by: Tejas Navghane <[email protected]>
Co-authored-by: Benjamin Lévêque <[email protected]>
Co-authored-by: Patryk Gruszka <[email protected]>
Co-authored-by: Anna Munk <[email protected]>
Co-authored-by: Volha Pivavarchyk <[email protected]>
Co-authored-by: Artem Lopata <[email protected]>
Co-authored-by: abcpro1 <[email protected]>
  • Loading branch information
16 people authored Aug 2, 2022
1 parent c1c5772 commit 6997b9a
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 17 deletions.
28 changes: 14 additions & 14 deletions Assets/library/js/dist/builder.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Assets/library/js/dist/builder.js.map

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions Translations/cs/javascript.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@ grapesjsbuilder.dynamicContentBtnLabel="Uložit"
grapesjsbuilder.dynamicContentModalTitle="Upravit dynamický obsah"
grapesjsbuilder.assetManager.noAssets="Nejsou zde žádné <b>assety</b>, přetáhněte sem soubory pro nahrání."
grapesjsbuilder.buttonBlockLabel="Tlačítko"
grapesjsbuilder.components.names.twoColumnThirdSevens="2 Sloupce 3/7"
grapesjsbuilder.components.names.textSectionBlkLabel="Textová část"
grapesjsbuilder.components.names.gridItemsBlkLabel="Položky mřížky"
grapesjsbuilder.components.names.listItemsBlkLabel="Položky seznamu"
4 changes: 4 additions & 0 deletions Translations/de/javascript.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ grapesjsbuilder.dynamicContentBtnLabel="Speichern"
grapesjsbuilder.dynamicContentModalTitle="Dynamischen Inhalt bearbeiten"
grapesjsbuilder.assetManager.noAssets="Keine <b>Assets</b> hier, zum Hochladen ziehen"
grapesjsbuilder.buttonBlockLabel="Button"
grapesjsbuilder.components.names.twoColumnThirdSevens="2 Säulen 3/7"
grapesjsbuilder.components.names.textSectionBlkLabel="Text Abschnitt"
grapesjsbuilder.components.names.gridItemsBlkLabel="Raster Elemente"
grapesjsbuilder.components.names.listItemsBlkLabel="Elemente auflisten"
4 changes: 4 additions & 0 deletions Translations/en_US/javascript.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@ grapesjsbuilder.dynamicContentBlockLabel="Dynamic Content"
grapesjsbuilder.dynamicContentBtnLabel="Save"
grapesjsbuilder.dynamicContentModalTitle="Edit Dynamic Content"
grapesjsbuilder.buttonBlockLabel="Button"
grapesjsbuilder.components.names.twoColumnThirdSevens="2 Columns 3/7"
grapesjsbuilder.components.names.textSectionBlkLabel="Text Section"
grapesjsbuilder.components.names.gridItemsBlkLabel="Grid Items"
grapesjsbuilder.components.names.listItemsBlkLabel="List Items"
6 changes: 5 additions & 1 deletion Translations/fr/javascript.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,8 @@ grapesjsbuilder.dynamicContentBlockLabel="Contenu dynamique"
grapesjsbuilder.dynamicContentBtnLabel="Valider"
grapesjsbuilder.dynamicContentModalTitle="Éditer le contenu dynamique"
grapesjsbuilder.assetManager.noAssets="Pas <b>d'images</b>, déposez des fichiers ici pour en ajouter"
grapesjsbuilder.buttonBlockLabel="Bouton"
grapesjsbuilder.buttonBlockLabel="Bouton"
grapesjsbuilder.components.names.twoColumnThirdSevens="2 Colonnes 3/7"
grapesjsbuilder.components.names.textSectionBlkLabel="Section de texte"
grapesjsbuilder.components.names.gridItemsBlkLabel="Éléments de la grille"
grapesjsbuilder.components.names.listItemsBlkLabel="Éléments de liste"
6 changes: 5 additions & 1 deletion Translations/pt_BR/javascript.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,8 @@ grapesjsbuilder.dynamicContentBlockLabel="Conteúdo Dinâmico"
grapesjsbuilder.dynamicContentBtnLabel="Salvar"
grapesjsbuilder.dynamicContentModalTitle="Alterar Conteúdo Dinâmico"
grapesjsbuilder.assetManager.noAssets="Nenhum <b>assets</b> aqui, arraste para fazer Upload"
grapesjsbuilder.buttonBlockLabel="Botón"
grapesjsbuilder.buttonBlockLabel="Botón"
grapesjsbuilder.components.names.twoColumnThirdSevens="2 Colunas 3/7"
grapesjsbuilder.components.names.textSectionBlkLabel="Seção de Texto"
grapesjsbuilder.components.names.gridItemsBlkLabel="Itens da grade"
grapesjsbuilder.components.names.listItemsBlkLabel="Itens da lista"

0 comments on commit 6997b9a

Please sign in to comment.