github.com/mautic/plugin-focus commits | Ecosyste.ms: OpenCollective

Fix JS error that broke production bar

422d6d0f90676ebe263c16a54c6306cab9cd5530 authored over 7 years ago by Alan Hartless <[email protected]>

Allow HTML in editor content

671c573f842b738a62ada872ba24ff0649552d00 authored over 7 years ago by Alan Hartless <[email protected]>

Fix bar to use editor output

d8a78cd0387d46ccd0bf7a552ec6fe65be325bd4 authored over 7 years ago by Alan Hartless <[email protected]>

Merge remote-tracking branch 'origin/pr/4734' into bug-focus-form-fix

# Conflicts:
# app/bundles/CoreBundle/Event/TokenReplacementEvent.php
# plugins/MauticFocusBundl...

2c0f1fb46ecf4073b4548d6692bed951e92d8162 authored over 7 years ago by Alan Hartless <[email protected]>

Fixed broken basic mode for the Bar layout

0210a97c237444d039f8654933b4b9e4d58fd8e2 authored over 7 years ago by Alan Hartless <[email protected]>

If custom HTML contained images, the iframe height is miscalculated the first time due to the image not being loaded into the DOM.

ebdf1bd107b62f0ad36eb8b812459eeb8e0b64a2 authored over 7 years ago by Alan Hartless <[email protected]>

Updated editor content if {focus_form} is not present; otherwise update preview to fetch form content

1364ed1821a7ce707e0d4b73e648c9d56486f021 authored over 7 years ago by Alan Hartless <[email protected]>

Use a token to dynamically inject the selected Mautic form into the basic/HTML modes so that conversions are captured

ecd5b77de16721c070b7f9709dde285503b3a9bc authored over 7 years ago by Alan Hartless <[email protected]>

Prevent error on save due a user not being a Lead and process the tokens outside of the focus cached content so that lead tokens are applicable

e178cd373259fd155cf58f77fd0e360311e0a9c7 authored over 7 years ago by Alan Hartless <[email protected]>

Fix Focus tokens

fdfd7aaa08da692dc11f332e28a456ed9fc831ab authored over 7 years ago by Zdeno Kuzmany <[email protected]>

Merge remote-tracking branch 'upstream/staging' into HEAD

2419f856c2dbfdbe5c3d166f6ff5abc59f9c514b authored over 7 years ago by Don Gilbert <[email protected]>

Merge pull request #4653 from mautic/front-end_web-notifications_label

Front end web notifications label

45a0d8bbf2ae156d22284bc667e085a0d8944f27 authored over 7 years ago by Alan Hartless <[email protected]>

Merge pull request #4666 from kuzmany/focus-item-campaign-decision

Campaign Action: Show Focus Item

d7f654fdf93b58eb4227efdb0018a46417c2b0aa authored over 7 years ago by John Linhart <[email protected]>

Merge branch 'staging' into feature-undo-redo-buttons

# Conflicts:
# app/bundles/CoreBundle/Translations/en_US/messages.ini
# app/bundles/EmailBundle/...

5f38cd443d0a387825eab3db6bcda3148c6b3040 authored over 7 years ago by Alan Hartless <[email protected]>

Minor

64f4d25a4466a39818acc08a01423c2b76051530 authored over 7 years ago by Zdeno Kuzmany <[email protected]>

form buttons update

0f68301faa4e24486dc20d20e8467c9daba89fb6 authored over 7 years ago by Zdeno Kuzmany <[email protected]>

Remove factory + moved js to assets

9946036c0ed9170b9a5469bbafa9b87f9bb450d2 authored over 7 years ago by Zdeno Kuzmany <[email protected]>

Show Focus Item campaign ation

93c3d9766cb4e1026d14497c7cec417d7bd40c1e authored over 7 years ago by Zdeno Kuzmany <[email protected]>

Add action

e65f47bbabbc2de94536874d0fc02c32bad3543f authored over 7 years ago by Zdeno Kuzmany <[email protected]>

Init

4f68e35b67a84192412871e02ed6e493444fd391 authored over 7 years ago by Zdeno Kuzmany <[email protected]>

Preventing a PHP error when Focus tried to create stat with no lead (when logged in as Mautic user)

d8c435758995374a57b0f2f65fdb7cfa33575ae1 authored over 7 years ago by John Linhart <[email protected]>

setting up preview panel in notifications

d37d0e426adb3d7e3c0f24b1bacd9293980b433e authored over 7 years ago by Gabe Alvarez-Millard <[email protected]>

Start of undo/redo buttons

0f9a62d36a25d7dbd6c9f9755e8f21f5c8a7f436 authored over 7 years ago by Alan Hartless <[email protected]>

"What['s] should the focus be" typo fix

56b40da0de844a8fd4691e13bc6705893cff7284 authored over 7 years ago by John Linhart <[email protected]>

Included first filter glue in query

a2c94b49dbc0a6914bdb519fe16b8c046a5f19ce authored over 7 years ago by Werner Garcia <[email protected]>

Reverted controller changes

e320ebda5379682712937c77ae80f23f10a702d4 authored over 7 years ago by Werner Garcia <[email protected]>

Merge branch 'staging' into feature-dynamics-crm

19954ae39c172c412e0e76a5f64745ccc0d28cdc authored over 7 years ago by Werner Garcia <[email protected]>

Fix codestyle

0101f23ba4dff1c8fb36c14887eb65a109f7a34a authored over 7 years ago by Don Gilbert <[email protected]>

Merge branch 'focus-api-support' of https://github.com/kuzmany/mautic into kuzmany-focus-api-support

6d0b040c5176ea43df1c7de49dfe8baa5c4d3d8a authored over 7 years ago by Marianela Queme <[email protected]>

added tooltip for content modes

99032349dde40d15628590ebc3c7fbde63517174 authored over 7 years ago by Marianela Queme <[email protected]>

Synced UTM tag UI

0724e8be380f790b8f6ef5b5cf1e1ad60c830b07 authored over 7 years ago by Alan Hartless <[email protected]>

Moved UTM codes to the right

43edabdf99e917554aa373b8740799802c9c1acb authored over 7 years ago by Alan Hartless <[email protected]>

Fixed preview not detecting editor type

67430d674bb3e6d3303f8273a820c40b81db81f7 authored over 7 years ago by Alan Hartless <[email protected]>

Minor

27cb603ccfbac0e67a0d391eb6f6b6cd899064c9 authored over 7 years ago by Zdeno Kuzmany <[email protected]>

Remove CSS tab and add Editor and HTML content mode

6e283b961e5ccee2d0674c16d8839efc599db625 authored over 7 years ago by Zdeno Kuzmany <[email protected]>

Add html editor onto focus HTML mode and prevented notice for existing focus items

64c1a752cb46971e6e7c35ece5cd7d590da319f1 authored over 7 years ago by Alan Hartless <[email protected]>

Fixed batch processing

fc3525aae2538c6400974551a8b9713c5419b1df authored over 7 years ago by Werner Garcia <[email protected]>

Fixed php undefined notices

02e4c0339d805271352e6233d592174e1979dc95 authored over 7 years ago by Alan Hartless <[email protected]>

Minor for UtmTags

2cfc4d7958c08c6dfea56889fbdd8ba389258b39 authored over 7 years ago by Zdeno Kuzmany <[email protected]>

Added UTM tag support

f7636382276706ac9b1800b4d28331af2a2d4f90 authored over 7 years ago by Zdeno Kuzmany <[email protected]>

Merge remote-tracking branch 'refs/remotes/mautic/staging' into focus-api-support

8dfbf8ac80b9bd68c5db11a8ff962f043c1889f2 authored over 7 years ago by Zdeno Kuzmany <[email protected]>

Added UTM tag support

f97df3cb9a3855c51cd361d222aaed1ad0081f1a authored over 7 years ago by Zdeno Kuzmany <[email protected]>

Removing QueryBuilder type from the search methods - it can be DBAL as well as ORM builder and those doesn't have any common interface

1acb65cba7ed56f5aaaf66d5c4cce81e0d58bc47 authored over 7 years ago by John Linhart <[email protected]>

Fixed modifications forgotten from the commit before the last one. You know which one I mean, right?

571559cf4821e6bc005b1dff12a5069be5b132a5 authored over 7 years ago by John Linhart <[email protected]>

Fix for Mautic\CampaignBundle\EventListener\StatsSubscriber::__construct() does not call parent constructor from Mautic\CoreBundle\EventListener\StatsSubscriber.

8adece9ac175949836ca88eebba3160d11d4523c authored over 7 years ago by John Linhart <[email protected]>

Strongly typed addCatchAllWhereClause, addSearchCommandWhereClause and getEntities attributes

37780202eccf63b40c495400d5d0a0f8cdb43d82 authored over 7 years ago by John Linhart <[email protected]>

Fixed replace static - test

6c976d69c9b4c519d257a378e818ea582a5180f0 authored over 7 years ago by Zdeno Kuzmany <[email protected]>

Filter stats just for current focus id

4bb0321815d628b766d3924ce3c8961487f33d28 authored over 7 years ago by Zdeno Kuzmany <[email protected]>

data-show-on for forms

e8cc2bf373e95bfbcf6ee6c9191477443461c65c authored over 7 years ago by Zdeno Kuzmany <[email protected]>

Remove serializerGroups

fd692c802cc5404652315b99a02efff7d8671095 authored over 7 years ago by Zdeno Kuzmany <[email protected]>

Minor

a5c9ce4a9802b8f9b7d79c2d2f740c00f1a1fbd0 authored almost 8 years ago by Zdeno Kuzmany <[email protected]>

Minor to builder generate html & css

15492f1727bec316fa5357bb5f53ad2d2ec16b31 authored almost 8 years ago by Zdeno Kuzmany <[email protected]>

Add html mask to api controller

996834d0bc616d0f514de5ab041812bd24fd0e79 authored almost 8 years ago by Zdeno Kuzmany <[email protected]>

Minor

1d489ef798e6e0d01309051aab2016b6f3640ebc authored almost 8 years ago by Zdeno Kuzmany <[email protected]>

Allow HTML for html field

a23ef7db2a4b851a55bb801ab09077f959d7a787 authored almost 8 years ago by Zdeno Kuzmany <[email protected]>

Fix config :(

b3b466146f22f716b59b166658a576a90346f0f8 authored almost 8 years ago by Zdeno Kuzmany <[email protected]>

ApiMetadataDriver

b3a7ed0aedc02e268e160ac1af9e7bb778d61998 authored almost 8 years ago by Zdeno Kuzmany <[email protected]>

Added forgot api metadata for API

4a22b7d5f2c2b722556942896a1b84dc8219bb42 authored almost 8 years ago by Zdeno Kuzmany <[email protected]>

Minor html mode fixes

a348c38bea5a280d442bf3296dc67306a1bdf074 authored almost 8 years ago by Zdeno Kuzmany <[email protected]>

Close on document click for builder

9533399ab96a54b9c5c2422b2221d93ead18a77d authored almost 8 years ago by Zdeno Kuzmany <[email protected]>

Added close modal on document click

69a22f9ebcd49a373682a8eed3d974415726e7d8 authored almost 8 years ago by Zdeno Kuzmany <[email protected]>

Support for token replacement in HTML mode (contactfield, assetlink, pagelink). Forms maybe later

61ee6a499e0a4753e60581691eb5c22dc89bd25e authored almost 8 years ago by Zdeno Kuzmany <[email protected]>

Minor typo

ae8b2815e1ac4e64150236f48184063f9f483be4 authored almost 8 years ago by Zdeno Kuzmany <[email protected]>

Merge remote-tracking branch 'refs/remotes/mautic/staging' into focus-api-support

daa8f6c3d5a244232dc1ab86a9a2a8a560b8d421 authored almost 8 years ago by Zdeno Kuzmany <[email protected]>

New CSS tab, new HTML mode

307e81eab8f89a09676c2c34773b5c75bbeac491 authored almost 8 years ago by Zdeno Kuzmany <[email protected]>

Init commit

3d425b1fbc29ad80cac714f10aac85a68853658e authored almost 8 years ago by Zdeno Kuzmany <[email protected]>

Focus Js has wrong content-type

1c250ac9877d6d572c024f6a3725df6ad0098005 authored almost 8 years ago by tchiotludo <[email protected]>

Marketing messages

b97cd04a773f7e8109551dcf22799d7ac039c7d1 authored almost 8 years ago by Alan Hartless <[email protected]>

Added lead to focus stats

f3c8f31f6bfd137021ac8e2ac38f877c967fb93b authored almost 8 years ago by Alan Hartless <[email protected]>

Restricted stats to user lead permissions

7f75983d3b601565d41b6ec83981862d7e43b56b authored almost 8 years ago by Alan Hartless <[email protected]>

Merge branch 'staging' into nithinga-release-feature/timed-campaign

# Conflicts:
# app/bundles/EmailBundle/Views/FormTheme/Email/dynamic_content_filter_entry_widget...

4c12551bcb789114680ace69c52554bd99b2bd1c authored almost 8 years ago by Alan Hartless <[email protected]>

Fix merge conflict

a5b454f32c71e0e066421bffd027fc16815d701f authored almost 8 years ago by Don Gilbert <[email protected]>

Add support for focus

103e20e1de1976c56cc5502eb1e3d7f3bf3173d4 authored about 8 years ago by Zdeno Kuzmany <[email protected]>

Fixed scrolling issue in the Focus builder in Chrome

b6532bf6c46de679c9725113adb4fb8dd851e8d8 authored about 8 years ago by Jan Linhart <[email protected]>

Merge branch 'staging' into werner-CitrixPlugin

# Conflicts:
# app/bundles/LeadBundle/LeadEvents.php
# app/bundles/LeadBundle/Translations/en_US...

77d59c79277b1594634d1243f11ad5995126cb57 authored about 8 years ago by Alan Hartless <[email protected]>

Merge branch 'feature-api-writes' of https://github.com/escopecz/mautic into escopecz-feature-api-writes

# Conflicts:
# app/bundles/EmailBundle/Config/config.php
# app/bundles/LeadBundle/Model/ListMode...

d092df3b6e8bc09ae0edffd9e0ff06926ad27213 authored about 8 years ago by Alan Hartless <[email protected]>

Merge branch 'feature-api-writes' of https://github.com/escopecz/mautic into escopecz-feature-api-writes

# Conflicts:
# app/bundles/EmailBundle/Config/config.php
# app/bundles/SmsBundle/Config/config.php

eb751617de727525faa161fc53b2a58c3db8d71b authored about 8 years ago by Alan Hartless <[email protected]>

Merge branch 'staging' into mars-company-merge

# Conflicts:
# app/bundles/LeadBundle/Translations/en_US/messages.ini

772abe3fab3060eafe1a69ee0d9fb63f34a481db authored about 8 years ago by Alan Hartless <[email protected]>

Merge branch 'staging' of https://github.com/mautic/mautic into plugin-contact-timeline-view

8b5473a8adcfd40b6d5c523bf1f8a552743ee5a9 authored about 8 years ago by Marianela Queme <[email protected]>

Merge branch 'staging' of https://github.com/mautic/mautic into company-merge

cd5d01b899ead6af4d0d0bac8fadb406eb0c8baf authored about 8 years ago by Marianela Queme <[email protected]>

Merge branch 'staging' into feature-plugin-buttons

# Conflicts:
# app/bundles/LeadBundle/Views/Company/list.html.php

4a738cf0b7b81f2ed326a46d9d0d6b1d0d5ad145 authored about 8 years ago by Alan Hartless <[email protected]>

Merge branch 'staging' into werner-CitrixPlugin

# Conflicts:
# app/bundles/LeadBundle/Translations/en_US/messages.ini

3898456b2f9c19a34c7377ee5a916653e6edca98 authored about 8 years ago by Alan Hartless <[email protected]>

Conflicts resolved - merged with current staging

c0b318d682ae12acf2823c48fc6763ef3e5f99f1 authored about 8 years ago by Jan Linhart <[email protected]>

Merge pull request #2914 from alanhartless/css-updates

Cleanup css/less files a bit

18155ef940791cd3472560bded1955d3995ecbb5 authored about 8 years ago by Marianela Queme <[email protected]>

Merge branch 'staging' of https://github.com/mautic/mautic into plugin-contact-timeline-view

0e6ffe293461b6a7d009fda5fce7cfe59ce991d0 authored about 8 years ago by Marianela Queme <[email protected]>

Added priority system to buttons and also moved batch buttons to checkall dropdown

9219b54e60dd6ecae9cc6dae7ed73d23b6226dc4 authored about 8 years ago by Alan Hartless <[email protected]>

Language: Change Immediately to Upon arrival

6efc9716113963ee24678ccea0bcc563b4a472e2 authored about 8 years ago by Zdeno Kuzmany <[email protected]>

Better timeout handling before focus engage

8305df0b141ac36d9fac938042a9c9e955bfe079 authored about 8 years ago by Zdeno Kuzmany <[email protected]>

Wrapped Mautibot in a class

864685bd21ec4de3401863665797db8ac9e6cddc authored about 8 years ago by Alan Hartless <[email protected]>

Organizing CSS a bit

d77ffa88fb69092f52e6a460559911e60b52f3b2 authored about 8 years ago by Alan Hartless <[email protected]>

Other stat tables are supported to fetch data via the /stats endpoint

94c8931655b114a48580ff529692d4cc29e752da authored about 8 years ago by Jan Linhart <[email protected]>

Segments and campaigns are working

bc400c8e3ebab70e938d6755340c177390986952 authored about 8 years ago by Werner García <[email protected]>

CS fix for non-bundle files

918eb290ab4672b6e88fd3cd8965d30440bbfa54 authored about 8 years ago by Jan Linhart <[email protected]>

Merge branch 'staging' into feature-api-writes

bfbd78c4a9cc9bf12be2f4b871ba9f84fa4e6f1b authored about 8 years ago by Jan Linhart <[email protected]>

Fixed copyright to match Symfony code standards and to hopefully prevent php-cs-fixer from removing space before namespace for some devs and not others

252f04992e6cd8a6cf2cf19216c95700bebc1cf0 authored about 8 years ago by Alan Hartless <[email protected]>

Manual merge with current staging - lots of conflicts :tired_face:

93fb0cab339dc75d65b7a99e51ddc5ec78c2a021 authored about 8 years ago by Jan Linhart <[email protected]>

Fixed php-cs-fixer hiccup with line after copyright

c30cc019cbc99cc60c631056aac0c1d79a82c8a8 authored about 8 years ago by Alan Hartless <[email protected]>

Merge pull request #2705 from alanhartless/bug-2677

Removed catch that prevented builder from closing without selecting a type or style

72546b2b8fe08f760996e0422f203df7c3465caf authored about 8 years ago by John Linhart <[email protected]>

merged with current staging

e83ac64596949567197c7eccfc4574b3f4ccdffd authored about 8 years ago by Jan Linhart <[email protected]>

Removed catch that prevented builder from closing without selecting a type or style as it caused confusion.

0777baa2d6418b79c0177c877008efe791b5c7e7 authored about 8 years ago by Alan Hartless <[email protected]>