From b43c2b0e59945ff2312918a60e97901103172721 Mon Sep 17 00:00:00 2001 From: John Vajda Date: Thu, 26 Mar 2015 17:10:08 -0600 Subject: [PATCH 1/8] Added IP Pool info to the event web hook page --- source/API_Reference/Webhooks/event.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/source/API_Reference/Webhooks/event.md b/source/API_Reference/Webhooks/event.md index 25566b95e6..9fe3d8ecdf 100644 --- a/source/API_Reference/Webhooks/event.md +++ b/source/API_Reference/Webhooks/event.md @@ -765,7 +765,29 @@ For emails sent through our Marketing Email tool, unsubscribes will look like th } ] {% endcodeblock %} +{% anchor h2 %} +IP Pools +{% endanchor %} + +For emails sent with a specified IP Pool, you can view the IP Pool used in the event post for a processed event. +{% codeblock lang:json %} +[ + "email": "john.doe@sendgrid.com", + "smtp-id": "<14c583da911.2c36.1c804d@ismtpd-073>", + "timestamp": 1427409578, + "pool": { + "name": "new_MY_test", + "id": 210 + }, + "sg_event_id": "RHFZB1IrTD2Y9Q7bUdZxUw", + "sg_message_id": "14c583da911.2c36.1c804d.filter-406.22375.55148AA99.0", + "category": [ + "IP Pool Test" + ], + "event": "processed" +] +{% endcodeblock %} {% anchor h2 %} Troubleshooting From 7be963da92f8f56c522a227df5e3e9a14da7dcfa Mon Sep 17 00:00:00 2001 From: John Vajda Date: Fri, 27 Mar 2015 09:53:42 -0600 Subject: [PATCH 2/8] Fixed JSON Issues --- source/API_Reference/Webhooks/event.md | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/source/API_Reference/Webhooks/event.md b/source/API_Reference/Webhooks/event.md index 9fe3d8ecdf..093b118499 100644 --- a/source/API_Reference/Webhooks/event.md +++ b/source/API_Reference/Webhooks/event.md @@ -773,19 +773,18 @@ For emails sent with a specified IP Pool, you can view the IP Pool used in the e {% codeblock lang:json %} [ - "email": "john.doe@sendgrid.com", - "smtp-id": "<14c583da911.2c36.1c804d@ismtpd-073>", - "timestamp": 1427409578, - "pool": { - "name": "new_MY_test", - "id": 210 - }, - "sg_event_id": "RHFZB1IrTD2Y9Q7bUdZxUw", - "sg_message_id": "14c583da911.2c36.1c804d.filter-406.22375.55148AA99.0", - "category": [ - "IP Pool Test" - ], - "event": "processed" + { + "email": "john.doe@sendgrid.com", + "smtp-id": "<14c583da911.2c36.1c804d@ismtpd-073>", + "timestamp": 1427409578, + "pool": { + "name": "new_MY_test", + "id": 210 + }, + "sg_event_id": "RHFZB1IrTD2Y9Q7bUdZxUw", + "sg_message_id": "14c583da911.2c36.1c804d.filter-406.22375.55148AA99.0", + "event": "processed" + } ] {% endcodeblock %} From 878b6c06975f550ab20225d1bc628545cca21f5f Mon Sep 17 00:00:00 2001 From: Jacob Date: Fri, 27 Mar 2015 11:34:31 -0600 Subject: [PATCH 3/8] Update templates.md Increased template limits to 300. --- source/API_Reference/Web_API_v3/Template_Engine/templates.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/API_Reference/Web_API_v3/Template_Engine/templates.md b/source/API_Reference/Web_API_v3/Template_Engine/templates.md index 82aa865169..082b2d9100 100644 --- a/source/API_Reference/Web_API_v3/Template_Engine/templates.md +++ b/source/API_Reference/Web_API_v3/Template_Engine/templates.md @@ -11,7 +11,7 @@ The Template Engine API lets you programmatically create and manage templates for your transactional email. {% info %} -Each user can have up to 100 templates. +Each user can have up to 300 templates. {% endinfo %} * * * * * From 2230ae1afbbe9f2ffb5aba8f8950ad0f32110345 Mon Sep 17 00:00:00 2001 From: Jacob Date: Fri, 27 Mar 2015 11:35:55 -0600 Subject: [PATCH 4/8] Update versions.md Devs updated to 300. --- source/API_Reference/Web_API_v3/Template_Engine/versions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/API_Reference/Web_API_v3/Template_Engine/versions.md b/source/API_Reference/Web_API_v3/Template_Engine/versions.md index 1460fefc7e..43d3f87427 100644 --- a/source/API_Reference/Web_API_v3/Template_Engine/versions.md +++ b/source/API_Reference/Web_API_v3/Template_Engine/versions.md @@ -19,7 +19,7 @@ To set which version is active, use the [version PATCH]({{root_url}}/API_Referen active field to 1. {% info %} -Each user can have up to 100 versions across all templates. +Each user can have up to 300 versions across all templates. {% endinfo %} * * * * * From 8f89f625c421ebf3610b0c6561c5e3f43decc168 Mon Sep 17 00:00:00 2001 From: Brandon West Date: Fri, 27 Mar 2015 13:21:41 -0600 Subject: [PATCH 5/8] Update sender_address.md add missing required parameters --- source/API_Reference/Marketing_Emails_API/sender_address.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/API_Reference/Marketing_Emails_API/sender_address.md b/source/API_Reference/Marketing_Emails_API/sender_address.md index cfea89b784..501297f7b5 100644 --- a/source/API_Reference/Marketing_Emails_API/sender_address.md +++ b/source/API_Reference/Marketing_Emails_API/sender_address.md @@ -21,6 +21,10 @@ Create a new Address. {% parameter 'email' 'Yes' 'Email address format, complying with [RFC 5322](http://tools.ietf.org/html/rfc5322)' 'Specify the email address to be used for this Address.' %} {% parameter 'replyto' 'No' 'Email address format, complying with [RFC 5322](http://tools.ietf.org/html/rfc5322)' 'Specify an email address to be used in the Reply-To field. If not defined, will default to the *email* parameter.' %} {% parameter 'address' 'Yes' 'None' 'Specify the physical address to be used for this Address.' %} + {% parameter 'city' 'Yes' 'None' 'Specify the city to be used for this Address.' %} + {% parameter 'state' 'Yes' 'None' 'Specify the state to be used for this Address.' %} + {% parameter 'zip' 'Yes' 'None' 'Specify the zipcode/postal code to be used for this Address.' %} + {% parameter 'country' 'Yes' 'None' 'Specify the country to be used for this Address.' %} {% endparameters %} From 4289253d0bbf96f14c3f591e06edc13b78e23dc4 Mon Sep 17 00:00:00 2001 From: Brandon West Date: Fri, 27 Mar 2015 17:18:47 -0600 Subject: [PATCH 6/8] Update variations.md fix required parameters --- source/API_Reference/Marketing_Emails_API/variations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/API_Reference/Marketing_Emails_API/variations.md b/source/API_Reference/Marketing_Emails_API/variations.md index 38790f5105..0a822fb712 100644 --- a/source/API_Reference/Marketing_Emails_API/variations.md +++ b/source/API_Reference/Marketing_Emails_API/variations.md @@ -22,7 +22,7 @@ Create a new Variation. {% parameter 'variation' 'Yes' 'None' 'The name of the Variation you will be adding.' %} {% parameter 'subject' 'Yes' 'None' 'The subject that will be used for the Variation being created.' %} {% parameter 'text' 'Yes' 'None' 'The text portion of the Marketing Email Variation being added.' %} - {% parameter 'html' 'No' 'If the type parameter is set to "html" this parameter is required.' 'The html portion of the Marketing Email Variation being added.' %} + {% parameter 'html' 'Yes' 'None' 'The html portion of the Marketing Email Variation being added.' %} {% parameter 'type' 'Yes' 'Value must be either "text" or "html".' 'The Variation type, either plain text, or multipart-alternative text and html.' %} {% parameter 'identity_name' 'No' 'Must be an existing Marketing Email Identity' 'Identity name that is needed if the Marketing Email name does not already exist. Will be used to create a parent Marketing Email.' %} {% endparameters %} From ed45bf6c945cb19bf0d1015df42f969b42e06ea3 Mon Sep 17 00:00:00 2001 From: Brandon West Date: Fri, 27 Mar 2015 17:22:29 -0600 Subject: [PATCH 7/8] Update variations.md fix json response --- source/API_Reference/Marketing_Emails_API/variations.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/source/API_Reference/Marketing_Emails_API/variations.md b/source/API_Reference/Marketing_Emails_API/variations.md index 0a822fb712..b0b97562ac 100644 --- a/source/API_Reference/Marketing_Emails_API/variations.md +++ b/source/API_Reference/Marketing_Emails_API/variations.md @@ -191,9 +191,7 @@ Retrieve a list of all Variations attached to a Marketing Email. {% apiexample list POST https://api.sendgrid.com/api/newsletter/variations/list api_user=your_sendgrid_username&api_key=your_sendgrid_password&name=existing_draft&variation=variation_to_find %} {% response json %} -{ - "message": "success" -} +[{"name": "copy of SUZ5PT"},{"name": "5XZyGo"}] {% endresponse %} {% response xml %} From 62ae209dff6960506dff10b667d1202d1c8d07df Mon Sep 17 00:00:00 2001 From: Matt Bernier Date: Mon, 30 Mar 2015 11:35:10 -0600 Subject: [PATCH 8/8] 100 -> 300 --- source/API_Reference/Web_API_v3/Template_Engine/templates.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/API_Reference/Web_API_v3/Template_Engine/templates.md b/source/API_Reference/Web_API_v3/Template_Engine/templates.md index 82aa865169..082b2d9100 100644 --- a/source/API_Reference/Web_API_v3/Template_Engine/templates.md +++ b/source/API_Reference/Web_API_v3/Template_Engine/templates.md @@ -11,7 +11,7 @@ The Template Engine API lets you programmatically create and manage templates for your transactional email. {% info %} -Each user can have up to 100 templates. +Each user can have up to 300 templates. {% endinfo %} * * * * *