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

feat: [DPMMA-1977] Typo removed

f16ce74e7683d06db97804cbf8f006b15e29f3e9 authored almost 2 years ago

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

d216b352f8c985457420494e35c9a6cc013f6fd2 authored almost 2 years ago

bug fix

1077aed51fdcbf9c076f34bfaecc1355669d34ba authored almost 2 years ago

bug fix

5ac74f13ac7adad8ad7fce11369ce7c39a35e19c authored almost 2 years ago

bug fix

213aff14a0b794b4724a54a4e1c0fe3f2f430a3c authored almost 2 years ago

revert

43e6812456273cc37ace10b85e9cc59991eaceb8 authored almost 2 years ago

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

9645d7d290f06d31f0372082646083969b051b77 authored almost 2 years ago

make sure to use twig templates

fc8c97f5859cfaabe9c0ac23d23fe4f11a88621a authored almost 2 years ago

codecoverage

1664abd8cf9f0e26d2b9fa5bcfbfe7677488f363 authored almost 2 years ago

don't output raw actions when it's not html

a01df942b83348e2a153e40893143ba94dde6dd6 authored almost 2 years ago

don't pass the variables to the pageheader in default output since they are passed along anyway (and we removed this in extended templates as well)

6d3de86f3c07dc2a2f9f3e2e8ddc3c2cfb128e0c authored almost 2 years ago

bug fix

64a649d29f02c674b65ff079ab9e6bee9c4006ad authored almost 2 years ago

Merge remote-tracking branch 'upstream/5.x' into TPROD-336

* upstream/5.x:
cleanup
cleanup
missing files
bug fix
Translation error
removed unus...

89d6095d149ee1d05caac281474194c8010aa58a authored almost 2 years ago

changes

bff3d7f307883c3441d0e522d248900733ca86f5 authored almost 2 years ago

bug fix

bcd11958b004fd00219165bd2dd3079aa7bf24b8 authored almost 2 years ago

don't pass the variables to the default output include in base tempates (no need + breaks inheritance)

a122c0b62779384a0bba5cb23020f5b67eb06058 authored almost 2 years ago

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

* upstream/5.x:
cleanup
cleanup
missing files
bug fix
Translation error
removed unus...

6227783c69b12f1f4b3b90dc514a94ad6ed1b69f authored almost 2 years ago

Merge pull request #11944 from JoshuaEstes/TPROD-339

TPROD-339 - SocialBundle - Convert PHP Templates to Twig Templates

c3dea07d14be260a56657a612687023426e077c8 authored almost 2 years ago

set some defaults across various templates to avoid untracable 500 errors

ce059739054208acdb2a26319b7e30241755bf97 authored almost 2 years ago

fix typo in a variable that is printed in Standard list

553b359be6b62d7f8e7eb1fbcf9ebcbe18533a11 authored almost 2 years ago

Make Theme page use the twig files, rework part of the inheritance of twig theme files

8caa1d7bdfa7e8a2972b8d161367c837ef406e26 authored almost 2 years ago

expanded the array check a bit for clarity

606916443db4298ddaf3cad572e6577a3f77b4cc authored almost 2 years ago

get rid of chain of includes in the original twig and do extends instead, as we want to follow the php logic instead of refactoring & adding complexity

also converted some blocks into variables for same reason

dd8208b36a5f3f6b9f27335b7fa2bde150e0919e authored almost 2 years ago

added a twig template for form (used in the header for the upload field part)

167cf7ffef54ae3c4cd407d42f27dda87a5fe171 authored almost 2 years ago

fix issue with delete button and filter the correct themes from the list

dc73fbae2b25d56a6694211ffc5ebf6c666e76b8 authored almost 2 years ago

bit of cleanup

d6bccadb75d31afad33cc1eb0f2b9d8f303632d8 authored almost 2 years ago

rename 'panel' block to 'content' block, as that is the standard name used elsewhere in templates

4be3913fbbf7d9ffe084e4135070c21406d97d77 authored almost 2 years ago

set default content for the '_content' block (sidenote: best rename this block later)

1d3e2d002b4e800650728dc993a3a9e7adf386e1 authored almost 2 years ago

cleanup: remove a redundant space

c0abc4d2b8970674656bdef2bca404e986a5517f authored almost 2 years ago

cleanup Themes form template

9a6feb42d1698e24d4d04dd49663634ef85606ec authored almost 2 years ago

Re-run tests

a936baa117029d83a13be880bec70c27b757bfd9 authored almost 2 years ago

Revert pageTitle logic to using block instead of just variable (since this system is used in other bundles as well)

847d5de7110fa5f459a4b2fcd9d411c02aff1f6d authored almost 2 years ago

revert Default content html twig template to previous state, as ajax calls are breaking across other bundles (refactor this later)

4bc2e124aa09950bc06a9b26c69e91d9b8c3a61b authored almost 2 years ago

Fix url output in Themes list items

864fe93dfef08644bc37759ab460e463ad93ba5f authored almost 2 years ago

set default pageTitle and headerTitle in Error and Exception templates, so Ajax 404 errors don't fail and fall back to a 500 error

ce638c4611601e24e62ac3ff1762dd5319d2bf82 authored almost 2 years ago

make pageHeader and head component load the needed variables by passing them on earlier+ clean up the vars a bit and get rid of last instance of headerTitle block (is now simply a var)

bf202d63e54e20cb95bb22a435240d132d8e39b4 authored almost 2 years ago

phpstan

78b59182ec70512abe605e712a8d3c541a7aa116 authored almost 2 years ago

phpstan

2e60eae0cbf7f715609e4dea0b4833dcd2f2d7a2 authored almost 2 years ago

Merge remote-tracking branch 'upstream/5.x' into TPROD-336

* upstream/5.x: (50 commits)
TPROD-324 - PointBundle - Migrate PHP Templates to Twig Templates...

5269d48bdb8ec0a3c0bd54c72f401df571d71efd authored almost 2 years ago

checkpoint

cbec7e3e26a9db0bdcafbc893bb2412225328bec authored almost 2 years ago

cleanup

bb259f947a4e9e19413d24499bd556df719cb48d authored almost 2 years ago

checkpoint

77c9e6febf402c820ed71a2d980065e768219bee authored almost 2 years ago

cleanup

f22cc6a297993caed5875c24f9b5b3bc4dbcd9a4 authored almost 2 years ago

app/bundles/ReportBundle/Views/SubscribedEvents/Search/global.html.php => app/bundles/ReportBundle/Views/SubscribedEvents/Search/global.html.twig

089cf48aad31589fa6cdbaef633ca2f270e49ab2 authored almost 2 years ago

app/bundles/ReportBundle/Views/Schedule/index.html.php => app/bundles/ReportBundle/Views/Schedule/index.html.twig

7488a599120bdcd471917e508dd85d7add974935 authored almost 2 years ago

removing dead files

7288ae0d31e4af5c6986d28cb064642205d65711 authored almost 2 years ago

typo

b0dea9baf6aad171354bb77b8ad82bd42ba55480 authored almost 2 years ago

removing dead files

9ac42a15a0ee7a4f55619c79aea3a6a14e4bfb40 authored almost 2 years ago

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

* '5.x' of github.com:mautic/mautic:
TPROD-324 - PointBundle - Migrate PHP Templates to Twig T...

0110b8d637f3e5a9c2271542d7ba67bdb9450231 authored almost 2 years ago

bug fixes

0b8bb94e41276b4259fef7afac2ec60f23a55da7 authored almost 2 years ago

check

5375b768b99cc851c9c486dadb7d32af102262ff authored almost 2 years ago

bug fix with pagination.html.twig file

a9f3405f116f03605ea538ca1ab84edad27396d6 authored almost 2 years ago

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

cf960f098aea3f9bdf51429808e1af683917e03b authored almost 2 years ago

cleanup

10eeac8639dd4fb130c01a03e39b375cabc2eb11 authored almost 2 years ago

Merge remote-tracking branch 'upstream/5.x' into TPROD-339

* upstream/5.x:
TPROD-324 - PointBundle - Migrate PHP Templates to Twig Templates (#11968)
d...

23157aebe4b8b9a2bf8396fbefde1ed305b5af8f authored almost 2 years ago

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

* 'TPROD-339' of github.com:JoshuaEstes/mautic: (60 commits)
Adding back social monitoring com...

afbba56abba7bde052d5c8823e8be49d0b9067e4 authored almost 2 years ago

missing files

c255ae67cc243c9f1161e1ece97d3a1f0deddcc1 authored almost 2 years ago

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

cf5916ee3a51560add8bc4a1f66e70aec46f0865 authored almost 2 years ago

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

6c192b7a72bf03cc4d961fd4150ed1679de9c96c authored almost 2 years ago

Merge branch 5.x into DPMMA-1977_export_submission_and_lead_id

c03681885de47b7a31772e7b81d4c529bc43a2a4 authored almost 2 years ago

TPROD-324 - PointBundle - Migrate PHP Templates to Twig Templates (#11968)

* TPROD-324 - PointBundle - Migrate PHP Templates to Twig Templates

* make sure to use the tw...

6ccc695bb6ae8a686f8676a842158203ec23d7f7 authored almost 2 years ago

docs: add alexhammerschmied as a contributor for userTesting (#11986)

* docs: update README.md [skip ci]

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

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

beda05488cc2cf9711c3c524f704935ffb59ad4e authored almost 2 years ago

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

* upstream/5.x:
Adding back social monitoring command (#11981)
remove copyright
317/Instal...

3f71991db195a66d3dfac9724a3638576b2f1b7c authored almost 2 years ago

checkpoint

3baf0d0609d44a1eadf08e9b633dcf0abc2c1e8e authored almost 2 years ago

export

23595c718ddb1e21749a1f77f3ab75098f3475f8 authored almost 2 years ago

Merge branch '5.x' into TPROD-339

7fcaccd6603c8a6fb9b07e10cf1fecccd0b1e747 authored almost 2 years ago

Adding back social monitoring command (#11981)

* Removing hard-wired social plugin commands as services

The services will be then auto-wired...

5fb7ff2283f4f41a60402bb031cae1f3393c19bb authored almost 2 years ago

fix: [DPMMA-1999] compare score select

67bd8463242907b1755574c787ad9a610106b216 authored almost 2 years ago

fix: [DPMMA-1999] fix undefined array key

9e22a79154ba07967e415578f284124724ab4dbe authored almost 2 years ago

fix: [DPMMA-1999] lead point change campaign action

408ed780d3eb9d49e422a2ff9b541986dd8557ed authored almost 2 years ago

Merge pull request #11817 from jason-repos/TPROD-317

#TPROD-317 InstallBundle: migrate views from PHP Engine to Twig

d8d37c5e363e7f45117f62c6512d5360ab733f8a authored almost 2 years ago

Merge branch '5.x' into TPROD-317

0fcfd18e5b13ed70bc1935ddb2481543f48ce62a authored almost 2 years ago

remove copyright

8a3f6435cd5d3c7b3dcae9978c5845fcb3b6a460 authored almost 2 years ago

fix: [DPMMA-1998] lead model fix

258f754d4f37a14fe958e9282264374e0643e38b authored almost 2 years ago

checkpoint

1535a3a7fe87d5b37750ab592bd5fbd3b40ce488 authored almost 2 years ago

cleanup

00460bb9fd0d2e4e1e1420fe6fd214bcdd9597ce authored almost 2 years ago

bug fix

d951536a32dd9e8fb10c4c1b035e71a7658cb0ce authored almost 2 years ago

form

044aed96c5bbeb98315d197d47239b931013d133 authored almost 2 years ago

TPROD-326

8c85617552356f6899c438908a436bd231293ba3 authored almost 2 years ago

typo

c12943c711efe8672030e381100cdf34fcdec31e authored almost 2 years ago

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

* upstream/5.x:
Bump symfony/http-kernel from 4.4.45 to 4.4.50
Bump symfony/security-bundle ...

11b5172825ccfca5f6784d6eee0161f6ead7d4e3 authored almost 2 years ago

Add files via upload

Added new thumbnail

d23d445dd7a8d2eaccdfae3b238670a34c60484b authored almost 2 years ago

Delete thumbnail.png

removed old thumbnail

56ecf01ba095f0325fdcbcf184e81586621ec4f4 authored almost 2 years ago

Add files via upload

Layout of the thumbnail is changed

7c6118c4c9daf6b2687d3287e3d4a1f91c18a95c authored almost 2 years ago

Create email.html.twig

added html - for compatibility

2502cb2db6fba2460c20a3d23cf290450c933a2f authored almost 2 years ago

Update email.mjml.twig

change mjml, better annnotation, values added to head

6aa1e7f581ee6ff0ec223578c91cff83a4c364bb authored almost 2 years ago

Merge pull request #11919 from nick-vanpraet/bugfix/segment-site-url

Fix segment mails not using site_url

3af3492fae4e3d5cbbefe1a3e5fa86967c077e3a authored almost 2 years ago

Merge branch '5.x' into bugfix/segment-site-url

4b356c05f3cd1b9456c8f0e8a46f0e68f1184f02 authored almost 2 years ago

Merge pull request #11906 from mautic/dependabot/composer/symfony/security-bundle-4.4.50

Bump symfony/security-bundle from 4.4.44 to 4.4.50

7001e8fc4afe938d437847c4382dc33cff21956d authored almost 2 years ago

fix: [DPMMA-1999] migration down fix

9ddbb730b53dcc227e3ff125f24acc04e7dc82d2 authored almost 2 years ago

Merge branch '5.x' into dependabot/composer/symfony/security-bundle-4.4.50

8415f48e3cf6977a178a94478430d9523838dddd authored almost 2 years ago

Merge pull request #11911 from mautic/dependabot/composer/symfony/http-kernel-4.4.50

Bump symfony/http-kernel from 4.4.45 to 4.4.50

e9a979f73ceea47ae86dfddac510d2b061288e86 authored almost 2 years ago

Merge branch '5.x' into dependabot/composer/symfony/http-kernel-4.4.50

844e3b054428bff612d81a2f34295e1b2c169f6e authored almost 2 years ago

Merge pull request #11620 from mabumusa1/fix_leads_list

Faster leads list page

e350930607bbe05635964d2fc20d424ad039360a authored almost 2 years ago

Merge branch '5.x' into fix_leads_list

856925248dcd45e5519f792fab061950f2c141c9 authored almost 2 years ago

phpstan

470ddbe96469cb87da4a6d37e722dea8aa2eaec3 authored almost 2 years ago

updates

c0a90ddaf9c10dd94f33920970e46744f553ba01 authored almost 2 years ago

checkpoint

809244c60e6bfca842a03b25bca8332f7fbf2a67 authored almost 2 years ago

bug fix

7be331785ec6eef4a7ece432351c64f1637ba47f authored almost 2 years ago

cleanup

7f89c99e1d8f38a1bea4cc582d943fd9c95218c8 authored almost 2 years ago