-
Notifications
You must be signed in to change notification settings - Fork 12
Most things are there and working. #2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
28 commits
Select commit
Hold shift + click to select a range
9ef761c
[D8 Port] Start of the d8 port.
Jaesin df6cf6f
[D8][Composer] Remove the soap library requirement.
Jaesin 44314ff
[D8] Fix the munchkin service test.
Jaesin aace1d0
[D8] Use an sequence to store available fields.
Jaesin 95eba93
[D8] Add start of contact form integration.
Jaesin 29bcaca
[D8] More drupal 8 development.
Jaesin 2c3985d
[D8] Add lead association and JS tests.
Jaesin d616d16
[D8] Contact integration is working.
Jaesin dd5555c
[D8] A little more cleanup.
Jaesin 705f2dc
[D8] Some cleanup and refactoring.
Jaesin 894c120
[D8] The entity operation should have the same title as the menu item.
Jaesin a4f7991
[D8] Move to tableselect for enabled fields.
Jaesin f0ee804
[D8] Merge in changes from 7.x-1.x.
Jaesin d7f7446
[D8] The mma_contact_block module is now using text fields for defaul…
Jaesin e95cd7c
[D8] Fixes contact block. Use marketo field ids for field mappings.
Jaesin a372cd7
[D8][Cleanup] Add services to their own folder/namespace.
Jaesin 4e8635a
[D8][Performance] Only show all of the field opitons if retrieving fr…
Jaesin 41cd166
[D8] Adds the start of the marketo ma user module.
Jaesin 7a5ff6a
[D8] Remove exrta table column from the contact mapping form.
Jaesin c508038
[D8][mma_user] Move login stuff to the mma_user module.
Jaesin 074f8a1
[D8][mma_user] Add menu tasks and implement controllers.
Jaesin d877912
[Merge] Merge in 8.x-1.x from Jaesin.
Jaesin 40fe739
[D8] Cannot use the same button value twice in a form.
Jaesin f237747
[D8] Had to rename the mma_user.settings config name.
Jaesin e2b6fd2
[D8] Fix up one test.
Jaesin cc2ab41
converting sub-modules from mma to marketo_ma, etc.
1a1f091
[D8] Small fix. Test are passing.
Jaesin 9f31049
[D8] Make munchkin the default tracking method.
Jaesin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,90 @@ | ||
| Marketo MA Changelog | ||
| --------------------- | ||
|
|
||
| Marketo MA 8.x-1.x, 2016-08-31 | ||
| Marketo MA 7.x-1.x, 2016-08-13 | ||
| ------------------------------ | ||
| - Initial 8.x-1.x version created from 7.x-2.x commit eeb522a40cd083973e360ccb5157fa512911b939 | ||
| - drush mma-fields now requires drush 6 or higher and allows display of | ||
| additional field attributes. See 'drush help mma-fields'. | ||
| - #2335897: Hooks added to provide modules an opportunity to modify lead data. | ||
| - #2190655: Introduced Marketo Forms 2.0 tracking method for Webforms. Webforms | ||
| can now override the default tracking method and when using Forms 2.0 can | ||
| specify the Marketo form which should be targeted. | ||
| - #2507733: User Integration now allow mapping core user object fields. | ||
| - #2567255: Resolved undefined property error when saving user object. | ||
| - #2765039: Ensure Marketo javascript is only loaded once. | ||
|
|
||
| Marketo MA 7.x-1.5, 2014-08-20 | ||
| ------------------------------ | ||
| - #2293425: SOAP request/response XML now included in log on syncLead errors | ||
| - Cleanup additional variables on uninstall | ||
| - Addition of automated testing with Behat and Travis | ||
|
|
||
| Marketo MA 7.x-1.4, 2014-08-20 | ||
| ------------------------------ | ||
| - No change. Bad version. | ||
|
|
||
| Marketo MA 7.x-1.3, 2014-04-21 | ||
| ------------------------------ | ||
| - #2137397: Tracking will now be OFF when role visibility is set to | ||
| "Only the roles selected below" and no roles are selected | ||
| - #2135305: Removed mma-get-activity from drush commands and moved functionality | ||
| to improved mma-get-lead command. Activity is now retrieved by adding the | ||
| --activity option to mma-get-lead. | ||
| - #2139977: Corrected issue related to removal of a mapped field from the field | ||
| definition list. When a field is removed, any currently mapped fields will | ||
| remain intact and display as an "Undefined Field (fieldname)". | ||
| - #2140487: Message is now displayed when webform configuration has been saved. | ||
| - #2142243: Permission "administer marketo webform settings" now works properly. | ||
| - #2215199: Undefined index no longer returned on webform submissions with | ||
| unmapped fields. | ||
|
|
||
| Marketo MA 7.x-1.2, 2013-11-14 | ||
| ------------------------------ | ||
| - Updated README.txt to reflect changes since 7.x-1.1 | ||
|
|
||
| Marketo MA 7.x-1.2-beta3, 2013-11-13 | ||
| ------------------------------ | ||
| - #2132635: Improved webform configuration experience | ||
| Configuration is now managed on a single page at node/{ID}/webform/marketo | ||
| - Performance improvements for Marketo MA Webform module | ||
| - #2133163: Corrected method for determining active flag | ||
| - #2134953: Fixed undefined variables when SOAP API not configured | ||
|
|
||
| Marketo MA 7.x-1.2-beta2, 2013-11-09 | ||
| ------------------------------ | ||
| - #2127663: Updated default value of user action triggers to be "on" | ||
| - #2127679: 0 now displayed in column when no webform components are mapped | ||
| - #2127659: Display message when no fields are available to be mapped | ||
| - Refactored where constants are defined | ||
| - #2130395: Resolved undefined index on webform component sort | ||
| - Users with only a single lead activity record and users associated with more | ||
| than one lead will now display lead information properly | ||
| - #2132165: Remove field from fieldmap on delete | ||
|
|
||
| Marketo MA 7.x-1.2-beta1, 2013-11-04 | ||
| ------------------------------ | ||
| - #2053673: Handle submission structure changes made in Webform 4.x | ||
| - #2062165: Added CHANGELOG.txt | ||
| - #2062181: Create rule action to retrieve lead data from Marketo | ||
| Rule action "Add data to Marketo lead" has been changed | ||
| to "Send lead data to Marketo" and underlying function has changed name | ||
| from "add_lead" to "marketo_ma_rules_action_add_lead". | ||
| - #2066465: Added basic drush support | ||
| - #2068255: Added keyType auto-detection when querying Marketo for lead data. | ||
| Function "_marketo_ma_get_lead" renamed to "marketo_ma_get_lead", it is safe | ||
| to call this function directly. | ||
| - #2067857: Variable marketo_ma_webform_fields_soap is now deleted upon uninstall | ||
| - #2067861: Added ability to view lead and activity information for a given user | ||
| - #2123391: Modified marketo_ma_add_lead function to pass marketoCookie param | ||
| _mkto_trk cookie value will now be sent to Marketo when using either of the | ||
| SOAP methods and the request to save the lead was made by either an anonymous | ||
| visitor or by the lead updating their own data. | ||
| - #2126019: Added settings for including or excluding tracking based on user role | ||
| - Reorganized admin settings form to use vertical tabs and display more | ||
| information related to webform configuration. | ||
| - #2123395: Added default rules which can be used as examples or extended to do | ||
| something more useful, perhaps adding more data to the list of values being | ||
| sent. If using the marketo_ma_user module these three rules should not be used | ||
| as they duplicate functionality already in place. | ||
| - #2126709: The marketo_ma_user module now allows for mapping user fields to | ||
| Marketo fields and defining which events should trigger updates. |
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| { | ||
| "name": "drupal/marketo_ma", | ||
| "type": "drupal-module", | ||
| "description": "Integration with Marketo marketing automation software.", | ||
| "keywords": ["Drupal"], | ||
| "license": "GPL-2.0+", | ||
| "homepage": "https://www.drupal.org/project/marketo_ma", | ||
| "minimum-stability": "dev", | ||
| "support": { | ||
| "issues": "https://www.drupal.org/project/issues/marketo_ma", | ||
| "source": "http://cgit.drupalcode.org/marketo_ma" | ||
| }, | ||
| "repositories": [ | ||
| { | ||
| "type": "vcs", | ||
| "url": "https://github.com/Jaesin/marketo-rest-api" | ||
| } | ||
| ], | ||
| "require": { | ||
| "php": ">=5.5.9", | ||
| "dchesterton/marketo-rest-api" : "dev-master" | ||
| } | ||
| } | ||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| instance_host: null | ||
| logging: 0 | ||
| tracking_method: munchkin | ||
| munchkin: | ||
| javascript_library: '//munchkin.marketo.net/munchkin.js' | ||
| api_private_key: null | ||
| partition: Default | ||
| lead_source: null | ||
| account_id: null | ||
| rest: | ||
| batch_requests: 0 | ||
| client_id: '' | ||
| client_secret: '' | ||
| field: | ||
| enabled_fields: {} | ||
| tracking: | ||
| request_path: | ||
| negate: 1 | ||
| pages: "/admin\r\n/admin/*\r\n/batch\r\n/node/add*\r\n/node/*/*\r\n/user/*/*" | ||
| roles: | ||
| authenticated: authenticated | ||
| anonymous: anonymous |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| # Schema for the marketo_ma.settings configuration. | ||
| marketo_ma.settings: | ||
| type: config_object | ||
| label: 'Marketo MA configuration' | ||
| mapping: | ||
| instance_host: | ||
| type: string | ||
| label: 'Marketo Instance Host' | ||
| logging: | ||
| type: integer | ||
| tracking_method: | ||
| type: string | ||
| munchkin: | ||
| type: config_object | ||
| label: 'Munchkin Javascript API' | ||
| mapping: | ||
| javascript_library: | ||
| type: string | ||
| api_private_key: | ||
| type: string | ||
| partition: | ||
| type: string | ||
| lead_source: | ||
| type: string | ||
| account_id: | ||
| type: string | ||
| rest: | ||
| type: config_object | ||
| label: 'REST API config' | ||
| mapping: | ||
| batch_requests: | ||
| type: integer | ||
| client_id: | ||
| type: string | ||
| client_secret: | ||
| type: string | ||
| field: | ||
| type: config_object | ||
| label: 'Field Definition config' | ||
| mapping: | ||
| enabled_fields: | ||
| type: sequence | ||
| label: 'Enabled marketo fields' | ||
| sequence: | ||
| type: integer | ||
| label: 'Marketo field ID' | ||
| tracking: | ||
| type: config_object | ||
| label: 'Field Definition config' | ||
| mapping: | ||
| request_path: | ||
| type: config_object | ||
| mapping: | ||
| negate: | ||
| type: integer | ||
| label: 'Negate page paths' | ||
| pages: | ||
| type: string | ||
| label: 'Pages' | ||
| roles: | ||
| type: sequence | ||
| label: 'Roles' | ||
| sequence: | ||
| type: string | ||
| label: 'Role ID' |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We will need to update URL to the real repository.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The repositories section can be removed once an 8.x-1.x branch gets pushed to d.o.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, my mistake. that is there until my pull request is accepted: dchesterton/marketo-rest-api#34