Merge integrations bundle into the main Mautic source tree #8210
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…field change report` table. We used to use internal object name for it and it doesn't work. It's not what is expected. The table contains fully qualified class names. 2. Fixed inability to compare changed date times values under some circumstances.
Co-Authored-By: Jan Kozak <galvani78@gmail.com>
I believe with this name it is easier to understand what this method does. 2. getMauticEntityClassName method now throws an exception if object is of unknown type.
…s-load-event Add MauticSyncFieldsLoadEvent
Use the plugin's git in subdir. Not the root (mautic-cloud repo).
Fixes for bi-directional DNC Salesforce sync
…hange-record-for-sync Create owner record change for further sync
…tic company created from the SF contact's associated account
…e than just in the command
…okens for mapped integration objects
…on to resolve test failures
Fix bug in TokenPersistence::restoreToken
MAUT-2935 - Added new subscriber and events for integrations to add okens for mapped integration objects
Gregy
force-pushed
the
merge-integrations-bundle
branch
from
6e4791e
to
a90980a
Compare
Also remove extraneous files we will not need as part of the main repo
dongilbert
force-pushed
the
merge-integrations-bundle
branch
from
14429af
to
e002b80
Compare
|
There are failures: https://travis-ci.org/mautic/mautic/jobs/623324718#L826 That's fixed in the JMS Serializer PR: #8027 |
|
Tests are running now, but still getting errors. |
escopecz
approved these changes
Dec 11, 2019
There was a problem hiding this comment.
I will merge this enormous PR. There are some tests failed regarding the IntegrationsBundle, but I created another issue to fix them. Thanks @Gregy!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
GH issue: #8030
To merge plugin-integrations repo I followed steps outlined here: https://stackoverflow.com/a/10548919 with a small twist. Before merging I added one new commit which moved all the plugin-integrations files into a correct path. That allowed me to merge the two repos without conflicts and to maintain git history.