Merge DNC into Master (#2034)

* Fix the issue where the user could not login if the plex account only allows email logins

* Fixed #2019

* Added Mass Email functionality (#2027)

* !wip

* !wip

* !qwip

* !wip

* Mass email is done

* Update README.md

* /bin/bash: wip: command not found
This commit is contained in:
Jamie 2018-03-04 20:43:51 +00:00 committed by GitHub
parent 0f9bbc80dc
commit dda467828c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 404 additions and 3621 deletions

View file

@ -81,11 +81,14 @@ namespace Ombi.Notifications
IssueStatus = opts.Substitutes.TryGetValue("IssueStatus", out val) ? val : string.Empty;
IssueSubject = opts.Substitutes.TryGetValue("IssueSubject", out val) ? val : string.Empty;
NewIssueComment = opts.Substitutes.TryGetValue("NewIssueComment", out val) ? val : string.Empty;
IssueUser = opts.Substitutes.TryGetValue("IssueUser", out val) ? val : string.Empty;
RequestedUser = opts.Substitutes.TryGetValue("IssueUser", out val) ? val : string.Empty;
}
// User Defined
public string RequestedUser { get; set; }
public string UserName => RequestedUser;
public string IssueUser => RequestedUser;
public string Title { get; set; }
public string RequestedDate { get; set; }
public string Type { get; set; }
@ -102,7 +105,6 @@ namespace Ombi.Notifications
public string IssueStatus { get; set; }
public string IssueSubject { get; set; }
public string NewIssueComment { get; set; }
public string IssueUser { get; set; }
// System Defined
private string LongDate => DateTime.Now.ToString("D");
@ -134,6 +136,7 @@ namespace Ombi.Notifications
{nameof(IssueSubject),IssueSubject},
{nameof(NewIssueComment),NewIssueComment},
{nameof(IssueUser),IssueUser},
{nameof(UserName),UserName},
};
}
}