Skip to content

Commit c1c5772

Browse files
escopeczvolha-pivavarchykRCheesleyjos0405benji07
authored
4.3 to 4.x (#11265)
* Modify the form label (#11166) * Modify the form label * Update the message in line the styleguide Co-authored-by: Ruth Cheesley <ruth.cheesley@acquia.com> Co-authored-by: Ruth Cheesley <ruth.cheesley@acquia.com> * Update BUG-REPORT.yml (#11195) * Update guzzlehttp/oauth-subscriber to 0.6.* (#11203) * Fixing DoctrineEventSubscriber for plugin installations (#11206) * Fixing DoctrineEventSubscriber for plugin installations * CS fix * Test fix * Checking for existing tables directly so we are not masking other SchemaException exceptions thrown for other reasons * CS fix * ensure the app folder is seen as the 4.3.x instead of a specific version (#11213) * Change the email update message type (#11192) Co-authored-by: John Linhart <admin@escope.cz> * Improve grapesjs dev demo (#11210) * delete unused file * fix standalone basic demo Co-authored-by: John Linhart <admin@escope.cz> * run PHPUnit tests with a random db prefix by default (#11196) * run phpunit tests with a db prefix * phpstan fixes * remove obsolete MAUTIC_TABLE_PREFIX definitions * move MAUTIC_TABLE_PREFIX definition to a phpunit extension * fix dataproviders with the MAUTIC_TABLE_PREFIX, as it's not set when phpunit scans the tests * phpstan fixes * phpcs * readd MAUTIC_TABLE_PREFIX constant to installer test Co-authored-by: John Linhart <admin@escope.cz> * docs: add benji07 as a contributor for code (#11215) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> * Fix the issue with saving contact settings (#11187) Co-authored-by: John Linhart <admin@escope.cz> * align lock file with change from #11203 (#11218) * Integer range point action validation (#11191) * validation for integer range in point actions * wip test case, two sets failing * test case working * moved constants to a helper class * php stan fixes * iterable type added * iterable type added, mixed * removed unnecessary function * added assertions * removed random int, added declare strict types * added aoi test and marked as skipped * Finishing the API test for point delta validation * cs fixer * Adding missing trait so the the Point entity implements the interface methods * The namespace does not have to be set as it's the same with the namespace of the entity * Adding missing type for the uuid property and setting a value to avoid errors when someone calls getter before setter * Actually, I will remove the uuid interface as it's part of another PR and does not make sense adding it in this one. It is confusing adding the new property without the column and migration. Co-authored-by: John Linhart <admin@escope.cz> * Tag import fix (#11220) * MAUT-1666 / Bug fixed: ArrayCollection to array * MAUT-1666 / Test ArrayCollection as input * MAUT-1666 / Instance of ArrayCollection * add test cases * Refactoring a test to use way less mocks * CS fix Co-authored-by: Lukas Sykora <lukas.sykora@acquia.com> Co-authored-by: Saurabh Gupta <saurabh.gupta@acquia.com> * Changing Rector config to the new format (#11227) * Changing Rector config to the new format * CS Fix * 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> * Code mode fix (#11221) * When checking current theme, make sure we don't overwrite mautic_code_mode templates * Add test for checking mautic_code_mode Co-authored-by: Donald Gilbert <don@dongilbert.net> * 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> * docs: add IrisAmrein as a contributor for userTesting (#11247) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: John Linhart <admin@escope.cz> * flip array returned by getDateChoices (#11233) * docs: add poweriguana as a contributor for userTesting (#11223) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> * flip array returned by getDateChoices While originally the method return the values in a [label => value] manner, it's clear from both CampaignEventLeadFieldValueType::buildForm and AjaxController::updateLeadFieldValuesAction that it should be flipped, because both of them adds a custom option in [value => Label] manner This bug prevents date operator in Contact Field Value type Campaign Condition from working properly Fixes issue #3180 Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> * Fix normalize value for boolean contact field (#11235) * Fix normalize value for boolean * Add more unit tests * Fix PHP Stan * Fix unit tests Co-authored-by: John Linhart <admin@escope.cz> * Bump guzzlehttp/guzzle from 7.4.2 to 7.4.4 (#11241) Bumps [guzzlehttp/guzzle](https://github.com/guzzle/guzzle) from 7.4.2 to 7.4.4. - [Release notes](https://github.com/guzzle/guzzle/releases) - [Changelog](https://github.com/guzzle/guzzle/blob/master/CHANGELOG.md) - [Commits](guzzle/guzzle@7.4.2...7.4.4) --- updated-dependencies: - dependency-name: guzzlehttp/guzzle dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: John Linhart <admin@escope.cz> * docs: add poweriguana as a contributor for projectManagement (#11263) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> * Do not perform delete queries on the sync tables for anonymous contacts (#11262) * Do not perform delete queries on the sync tables for anonymous contacts * Test fix, STAN fix * Do not retry all objects if one of them should be retried. Retry only the right one(s) (#11252) * Do not retry all objects if one of them should be retried. Retry only the right one(s) * STAN fix Co-authored-by: Volha Pivavarchyk <volha@aivie.ch> Co-authored-by: Ruth Cheesley <ruth.cheesley@acquia.com> Co-authored-by: Joey Keller <jos0405@gmail.com> Co-authored-by: Benjamin Lévêque <benjamin@leveque.me> Co-authored-by: mollux <mattias.michaux@dropsolid.com> Co-authored-by: Adrian Schimpf <bill@aivie.ch> Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Aarohi Prasad <prasadaarohi.98@gmail.com> Co-authored-by: Lukas Sykora <lukas.sykora@acquia.com> Co-authored-by: Saurabh Gupta <saurabh.gupta@acquia.com> Co-authored-by: Donald Gilbert <don@dongilbert.net> Co-authored-by: peter.osvath <peter.osvath@reachmedia.hu> Co-authored-by: Zdeno Kuzmany <zdeno@kuzmany.biz> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent c9f746a commit c1c5772

2 files changed

Lines changed: 1 addition & 96 deletions

File tree

Demo/mautic/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
let mauticLang = 'en';
33
let mauticBasePath = '';
44
let mauticEnv = 'dev';
5+
var mauticBaseUrl = 'http://mautic.ddev.site/index_dev.php/';
56
let mauticAjaxCsrf = 'test';
67
let htmlPagebasic = '<!doctype html> <html lang="en"> <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="description" content=""> <meta name="author" content=""> <link rel="icon" href="/docs/4.0/assets/img/favicons/favicon.ico"> <title>Album example for Bootstrap</title> <link rel="canonical" href="https://getbootstrap.com/docs/4.0/examples/album/"> <!-- Bootstrap core CSS --> <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet"> <!-- Custom styles for this template --> <link href="album.css" rel="stylesheet"> </head> <body> <header> <div class="collapse bg-dark" id="navbarHeader"> <div class="container"> <div class="row"> <div class="col-sm-8 col-md-7 py-4"> <h4 class="text-white">About</h4> <p class="text-muted">Add some information about the album below, the author, or any other background context. Make it a few sentences long so folks can pick up some informative tidbits. Then, link them off to some social networking sites or contact information.</p> </div> <div class="col-sm-4 offset-md-1 py-4"> <h4 class="text-white">Contact</h4> <ul class="list-unstyled"> <li><a href="#" class="text-white">Follow on Twitter</a></li> <li><a href="#" class="text-white">Like on Facebook</a></li> <li><a href="#" class="text-white">Email me</a></li> </ul> </div> </div> </div> </div> <div class="navbar navbar-dark bg-dark box-shadow"> <div class="container d-flex justify-content-between"> <a href="#" class="navbar-brand d-flex align-items-center"> <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="mr-2"><path d="M23 19a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h4l2-3h6l2 3h4a2 2 0 0 1 2 2z"></path><circle cx="12" cy="13" r="4"></circle></svg> <strong>Album</strong> </a> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarHeader" aria-controls="navbarHeader" aria-expanded="false" aria-label="Toggle navigation"> <span class="navbar-toggler-icon"></span> </button> </div> </div> </header> <main role="main"> <section class="jumbotron text-center"> <div class="container"> <h1 class="jumbotron-heading">Album example</h1> <p class="lead text-muted">Something short and leading about the collection below—its contents, the creator, etc. Make it short and sweet, but not too short so folks don simply skip over it entirely.</p> <p> <a href="#" class="btn btn-primary my-2">Main call to action</a> <a href="#" class="btn btn-secondary my-2">Secondary action</a> </p> </div> </section> <div class="album py-5 bg-light"> <div class="container"> <div class="row"> <div class="col-md-4"> <div class="card mb-4 box-shadow"> <img class="card-img-top" data-src="holder.js/100px225?theme=thumb&bg=55595c&fg=eceeef&text=Thumbnail" alt="Card image cap"> <div class="card-body"> <p class="card-text">This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</p> <div class="d-flex justify-content-between align-items-center"> <div class="btn-group"> <button type="button" class="btn btn-sm btn-outline-secondary">View</button> <button type="button" class="btn btn-sm btn-outline-secondary">Edit</button> </div> <small class="text-muted">9 mins</small> </div> </div> </div> </div> <div class="col-md-4"> <div class="card mb-4 box-shadow"> <img class="card-img-top" data-src="holder.js/100px225?theme=thumb&bg=55595c&fg=eceeef&text=Thumbnail" alt="Card image cap"> <div class="card-body"> <p class="card-text">This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</p> <div class="d-flex justify-content-between align-items-center"> <div class="btn-group"> <button type="button" class="btn btn-sm btn-outline-secondary">View</button> <button type="button" class="btn btn-sm btn-outline-secondary">Edit</button> </div> <small class="text-muted">9 mins</small> </div> </div> </div> </div> <div class="col-md-4"> <div class="card mb-4 box-shadow"> <img class="card-img-top" data-src="holder.js/100px225?theme=thumb&bg=55595c&fg=eceeef&text=Thumbnail" alt="Card image cap"> <div class="card-body"> <p class="card-text">This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</p> <div class="d-flex justify-content-between align-items-center"> <div class="btn-group"> <button type="button" class="btn btn-sm btn-outline-secondary">View</button> <button type="button" class="btn btn-sm btn-outline-secondary">Edit</button> </div> <small class="text-muted">9 mins</small> </div> </div> </div> </div> <div class="col-md-4"> <div class="card mb-4 box-shadow"> <img class="card-img-top" data-src="holder.js/100px225?theme=thumb&bg=55595c&fg=eceeef&text=Thumbnail" alt="Card image cap"> <div class="card-body"> <p class="card-text">This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</p> <div class="d-flex justify-content-between align-items-center"> <div class="btn-group"> <button type="button" class="btn btn-sm btn-outline-secondary">View</button> <button type="button" class="btn btn-sm btn-outline-secondary">Edit</button> </div> <small class="text-muted">9 mins</small> </div> </div> </div> </div> <div class="col-md-4"> <div class="card mb-4 box-shadow"> <img class="card-img-top" data-src="holder.js/100px225?theme=thumb&bg=55595c&fg=eceeef&text=Thumbnail" alt="Card image cap"> <div class="card-body"> <p class="card-text">This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</p> <div class="d-flex justify-content-between align-items-center"> <div class="btn-group"> <button type="button" class="btn btn-sm btn-outline-secondary">View</button> <button type="button" class="btn btn-sm btn-outline-secondary">Edit</button> </div> <small class="text-muted">9 mins</small> </div> </div> </div> </div> <div class="col-md-4"> <div class="card mb-4 box-shadow"> <img class="card-img-top" data-src="holder.js/100px225?theme=thumb&bg=55595c&fg=eceeef&text=Thumbnail" alt="Card image cap"> <div class="card-body"> <p class="card-text">This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</p> <div class="d-flex justify-content-between align-items-center"> <div class="btn-group"> <button type="button" class="btn btn-sm btn-outline-secondary">View</button> <button type="button" class="btn btn-sm btn-outline-secondary">Edit</button> </div> <small class="text-muted">9 mins</small> </div> </div> </div> </div> <div class="col-md-4"> <div class="card mb-4 box-shadow"> <img class="card-img-top" data-src="holder.js/100px225?theme=thumb&bg=55595c&fg=eceeef&text=Thumbnail" alt="Card image cap"> <div class="card-body"> <p class="card-text">This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</p> <div class="d-flex justify-content-between align-items-center"> <div class="btn-group"> <button type="button" class="btn btn-sm btn-outline-secondary">View</button> <button type="button" class="btn btn-sm btn-outline-secondary">Edit</button> </div> <small class="text-muted">9 mins</small> </div> </div> </div> </div> <div class="col-md-4"> <div class="card mb-4 box-shadow"> <img class="card-img-top" data-src="holder.js/100px225?theme=thumb&bg=55595c&fg=eceeef&text=Thumbnail" alt="Card image cap"> <div class="card-body"> <p class="card-text">This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</p> <div class="d-flex justify-content-between align-items-center"> <div class="btn-group"> <button type="button" class="btn btn-sm btn-outline-secondary">View</button> <button type="button" class="btn btn-sm btn-outline-secondary">Edit</button> </div> <small class="text-muted">9 mins</small> </div> </div> </div> </div> <div class="col-md-4"> <div class="card mb-4 box-shadow"> <img class="card-img-top" data-src="holder.js/100px225?theme=thumb&bg=55595c&fg=eceeef&text=Thumbnail" alt="Card image cap"> <div class="card-body"> <p class="card-text">This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</p> <div class="d-flex justify-content-between align-items-center"> <div class="btn-group"> <button type="button" class="btn btn-sm btn-outline-secondary">View</button> <button type="button" class="btn btn-sm btn-outline-secondary">Edit</button> </div> <small class="text-muted">9 mins</small> </div> </div> </div> </div> </div> </div> </div> </main> <footer class="text-muted"> <div class="container"> <p class="float-right"> <a href="#">Back to top</a> </p> <p>Album example is &copy; Bootstrap, but please download and customize it for yourself!</p> <p>New to Bootstrap? <a href="../../">Visit the homepage</a> or read our <a href="../../getting-started/">getting started guide</a>.</p> </div> </footer> <!-- Bootstrap core JavaScript ================================================== --> <!-- Placed at the end of the document so the pages load faster --> </body> </html>';
78
let htmlBasic =

0 commit comments

Comments
 (0)