Merge remote-tracking branch 'remotes/origin/master' into release/1.2.9

This commit is contained in:
Robin 2016-05-24 13:13:48 +02:00
commit 0323705513
276 changed files with 5382 additions and 3666 deletions

View file

@ -35,10 +35,10 @@ namespace GreenshotJiraPlugin {
/// Description of JiraDestination.
/// </summary>
public class JiraDestination : AbstractDestination {
private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(JiraDestination));
private static JiraConfiguration config = IniConfig.GetIniSection<JiraConfiguration>();
private JiraPlugin jiraPlugin = null;
private JiraIssue jira = null;
private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(JiraDestination));
private static readonly JiraConfiguration config = IniConfig.GetIniSection<JiraConfiguration>();
private readonly JiraPlugin jiraPlugin = null;
private readonly JiraIssue jira = null;
public JiraDestination(JiraPlugin jiraPlugin) {
this.jiraPlugin = jiraPlugin;
@ -100,7 +100,7 @@ namespace GreenshotJiraPlugin {
}
public override ExportInformation ExportCapture(bool manuallyInitiated, ISurface surfaceToUpload, ICaptureDetails captureDetails) {
ExportInformation exportInformation = new ExportInformation(this.Designation, this.Description);
ExportInformation exportInformation = new ExportInformation(Designation, Description);
string filename = Path.GetFileName(FilenameHelper.GetFilename(config.UploadFormat, captureDetails));
SurfaceOutputSettings outputSettings = new SurfaceOutputSettings(config.UploadFormat, config.UploadJpegQuality, config.UploadReduceColors);
if (jira != null) {