Skip to content

Code simplification #246

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 56 commits into from
Sep 27, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
f4d5a2f
Mail was refactored. Inner DTOs were extracted.
Jun 19, 2016
a70a0de
Fixing apostrophe issue
thinkingserious Jun 28, 2016
ee45f0e
Updating tests to support apostrophe fix
thinkingserious Jun 28, 2016
37936c7
Version Bump v7.03: 232 Send mail fails with BadRequest when apostrop…
thinkingserious Jun 28, 2016
4090bab
Update README.md
thinkingserious Jun 28, 2016
b0bcaaa
swagger/oai updates + accept header fix
thinkingserious Jul 5, 2016
f645505
Version Bump v7.0.4: swagger/oai updates + accept header fix
thinkingserious Jul 5, 2016
e4350a5
Prism mocked testing working locally
thinkingserious Jul 8, 2016
18af258
Travis reports prism already exists
thinkingserious Jul 8, 2016
ff75078
Debugging Travis / Prism setup
thinkingserious Jul 8, 2016
806d85f
Debugging prism.sh
thinkingserious Jul 8, 2016
967670e
typo
thinkingserious Jul 8, 2016
02a8ffd
Fixed permissions
thinkingserious Jul 8, 2016
d50d93d
run prism in the background
thinkingserious Jul 8, 2016
90c0e47
Give Prism time to run
thinkingserious Jul 8, 2016
e380abf
Updating test execution instructions
thinkingserious Jul 8, 2016
9ffa034
Version Bump v7.0.5: Tests now mocked automatically against prism
thinkingserious Jul 8, 2016
fdba7f6
Version Bump v7.0.6: Update docs, unit tests and examples to include …
thinkingserious Jul 12, 2016
e00b2e7
Update serializer settings to include default values
owre Jul 14, 2016
f08c798
Updating CSharp Dependency to fix issue #256
thinkingserious Jul 18, 2016
2453136
Updated examples and Usage
thinkingserious Jul 18, 2016
fc7ea91
Prepping for release
thinkingserious Jul 18, 2016
555a1c9
Version Bump v7.0.7: Fix for #256
thinkingserious Jul 18, 2016
26e65a4
Version Bump v7.1.0: WebProxy Support
thinkingserious Jul 19, 2016
28eb7a9
Added supported versions to the README
thinkingserious Jul 19, 2016
4bc3074
Make SendAt nullable
owre Jul 20, 2016
9ecd65d
made SendAt in mail class nullable
owre Jul 20, 2016
0cf9a77
fixed test to include default values
owre Jul 20, 2016
ab85e87
README documentation updates
thinkingserious Jul 20, 2016
cb33193
Version Bump v7.1.1: Readme Documentation Improvements
thinkingserious Jul 20, 2016
9f91f7e
Added template example for sending mail with Mail Helper
antimatter96 Jul 21, 2016
5eacc43
Cleanup
antimatter96 Jul 21, 2016
9f617af
Updated all non-nullable types, added another unit test
thinkingserious Jul 22, 2016
e4da460
Adjusting content and commenting out the optional template functionality
thinkingserious Jul 22, 2016
05514e3
Update dependency for async fix
thinkingserious Jul 23, 2016
14658d5
README formatting fixes
thinkingserious Jul 23, 2016
e9612ca
README formatting fixes
thinkingserious Jul 23, 2016
95ff680
README formatting fixes
thinkingserious Jul 23, 2016
973c2ea
Version Bump v8.0.0: BREAKING CHANGE #259 async fix
thinkingserious Jul 23, 2016
faf413d
Update README.md
thinkingserious Jul 23, 2016
71e770e
Added Troubleshooting section
thinkingserious Jul 26, 2016
2faf7ce
Version Bump v8.0.1: Added Troubleshooting section
thinkingserious Jul 26, 2016
6918b35
Version Bump v8.0.2: Fix Issue #273
thinkingserious Aug 1, 2016
e9afcc5
Describe what missing classes means
thinkingserious Aug 4, 2016
27840f1
Version Bump v8.0.3: Fix #297
thinkingserious Aug 17, 2016
17fc651
Add TOC for README, Add USE_CASES.md
thinkingserious Aug 24, 2016
158ebd4
Typo
thinkingserious Aug 24, 2016
fa265a1
Version Bump v8.0.4: Added TOC to README, Added USE_CASES.md
thinkingserious Aug 24, 2016
4e34d36
Breaking Changes Update
thinkingserious Sep 12, 2016
0e025b2
Mail was refactored. Inner DTOs were extracted.
Jun 19, 2016
d4bee91
Merge branch 'master' into Code-Simplification
dubrovkinmaxim Sep 20, 2016
33247ba
Fixes after huge merge
dubrovkinmaxim Sep 20, 2016
422413b
update-package -reintall for NUnit and NUnitTestAdapter
Sep 20, 2016
63d24c1
update-package Microsoft.AspNet.WebApi.Client -reintall
Sep 20, 2016
7e64f66
Revert back pre initialize auto-properties.
Sep 20, 2016
bd4429e
Minor fix after invalid rebase.
dubrovkinmaxim Sep 20, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified SendGrid/.ci/tests.sh
100755 → 100644
Empty file.
802 changes: 401 additions & 401 deletions SendGrid/Example/Example.cs

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions SendGrid/SendGrid/Helpers/Mail/ASM.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
using System.Collections.Generic;
using Newtonsoft.Json;

namespace SendGrid.Helpers.Mail
{
public class ASM
{
[JsonProperty(PropertyName = "group_id")]
public int GroupId { get; set; }

[JsonProperty(PropertyName = "groups_to_display")]
public List<int> GroupsToDisplay { get; set; }
}
}
22 changes: 22 additions & 0 deletions SendGrid/SendGrid/Helpers/Mail/Attachment.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
using Newtonsoft.Json;

namespace SendGrid.Helpers.Mail
{
public class Attachment
{
[JsonProperty(PropertyName = "content")]
public string Content { get; set; }

[JsonProperty(PropertyName = "type")]
public string Type { get; set; }

[JsonProperty(PropertyName = "filename")]
public string Filename { get; set; }

[JsonProperty(PropertyName = "disposition")]
public string Disposition { get; set; }

[JsonProperty(PropertyName = "content_id")]
public string ContentId { get; set; }
}
}
13 changes: 13 additions & 0 deletions SendGrid/SendGrid/Helpers/Mail/BCCSettings.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
using Newtonsoft.Json;

namespace SendGrid.Helpers.Mail
{
public class BCCSettings
{
[JsonProperty(PropertyName = "enable")]
public bool? Enable { get; set; }

[JsonProperty(PropertyName = "email")]
public string Email { get; set; }
}
}
10 changes: 10 additions & 0 deletions SendGrid/SendGrid/Helpers/Mail/BypassListManagement.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
using Newtonsoft.Json;

namespace SendGrid.Helpers.Mail
{
public class BypassListManagement
{
[JsonProperty(PropertyName = "enable")]
public bool Enable { get; set; }
}
}
13 changes: 13 additions & 0 deletions SendGrid/SendGrid/Helpers/Mail/ClickTracking.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
using Newtonsoft.Json;

namespace SendGrid.Helpers.Mail
{
public class ClickTracking
{
[JsonProperty(PropertyName = "enable")]
public bool? Enable { get; set; }

[JsonProperty(PropertyName = "enable_text")]
public bool? EnableText { get; set; }
}
}
23 changes: 23 additions & 0 deletions SendGrid/SendGrid/Helpers/Mail/Content.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
using Newtonsoft.Json;

namespace SendGrid.Helpers.Mail
{
public class Content
{
public Content()
{
}

public Content(string type, string value)
{
this.Type = type;
this.Value = value;
}

[JsonProperty(PropertyName = "type")]
public string Type { get; set; }

[JsonProperty(PropertyName = "value")]
public string Value { get; set; }
}
}
23 changes: 23 additions & 0 deletions SendGrid/SendGrid/Helpers/Mail/Email.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
using Newtonsoft.Json;

namespace SendGrid.Helpers.Mail
{
public class Email
{
public Email()
{
}

public Email(string email, string name = null)
{
this.Address = email;
this.Name = name;
}

[JsonProperty(PropertyName = "name")]
public string Name { get; set; }

[JsonProperty(PropertyName = "email")]
public string Address { get; set; }
}
}
16 changes: 16 additions & 0 deletions SendGrid/SendGrid/Helpers/Mail/FooterSettings.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
using Newtonsoft.Json;

namespace SendGrid.Helpers.Mail
{
public class FooterSettings
{
[JsonProperty(PropertyName = "enable")]
public bool Enable { get; set; }

[JsonProperty(PropertyName = "text")]
public string Text { get; set; }

[JsonProperty(PropertyName = "html")]
public string Html { get; set; }
}
}
25 changes: 25 additions & 0 deletions SendGrid/SendGrid/Helpers/Mail/Ganalytics.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
using Newtonsoft.Json;

namespace SendGrid.Helpers.Mail
{
public class Ganalytics
{
[JsonProperty(PropertyName = "enable")]
public bool? Enable { get; set; }

[JsonProperty(PropertyName = "utm_source")]
public string UtmSource { get; set; }

[JsonProperty(PropertyName = "utm_medium")]
public string UtmMedium { get; set; }

[JsonProperty(PropertyName = "utm_term")]
public string UtmTerm { get; set; }

[JsonProperty(PropertyName = "utm_content")]
public string UtmContent { get; set; }

[JsonProperty(PropertyName = "utm_campaign")]
public string UtmCampaign { get; set; }
}
}
Loading