Skip to content
This repository has been archived by the owner on Jan 4, 2022. It is now read-only.

Commit

Permalink
Merge pull request #141 from NullDesk/develop
Browse files Browse the repository at this point in the history
td2-v2.5.2
  • Loading branch information
StephenRedd authored Jul 18, 2017
2 parents b0f9281 + e1b8994 commit a31a1c3
Show file tree
Hide file tree
Showing 76 changed files with 2,270 additions and 1,344 deletions.
35 changes: 18 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,37 +13,38 @@ Documenation
===========
Documentation can be found in the [TicketDesk GitHub Wiki](https://github.com/StephenRedd/TicketDesk/wiki)

Project Status:
Project Status
===========

[TicketDesk 2.5 is in beta](https://github.com/StephenRedd/TicketDesk/releases/tag/td2-v2.5.0). Development should resume in December 2015 towards a stable release version.
[TicketDesk 2.5 has been released](https://github.com/StephenRedd/TicketDesk/releases/tag/td2-v2.5.2)

View a working [demo of TicketDesk 2.5 here](http://ticketdesk2.azurewebsites.net/). The demo is automatically deployed by continuous integration from the development branch.
The previous version is also available
[TicektDesk 2.1](https://github.com/StephenRedd/TicketDesk/releases/tag/td2-v2.1.3).

The current stable version is [TicektDesk 2.1](https://github.com/StephenRedd/TicketDesk/releases/tag/td2-v2.1.3).
- TicketDesk 2.5 requires Visual Studio 2015 with .Net Framework 4.6.2 or higher.
- Visual Studio 2017 also supported
- TicketDesk 2.1 requires Visual Studio 2012 or higher with .Net Framework 4.5 or higher

- TicketDesk 2.5 requires Visual Studio 2013 with .Net Framework 4.5.2 or higher.
- Visual Studio 2013 with Update 4 or higher is required for Azure publishing

- TicketDesk 2.1 requires Visual Studio 2012 or higher with .Net Framework 4.5

Getting started:
Getting started
===========

Development
-----------

Getting started with TicketDesk development should be a "clone, open, and run" experience. You need Visual Studio 2013 with Update 4 or higher, SQL 2012 LocalDB, and Git.
Getting started with TicketDesk development should be a "clone, open, and run" experience.

- You need Visual Studio 2015 with the latest update, or Visual Studio 2017.
- By default, TicketDesk will use SQL Server Express **LocalDB Edition** 2014 or 2016.
- Clone the github repository
- Switch to the desired branch (development has the latest version, master has latest release ready version)
- Open the project in Visual Studio 2013 or higher
- Hit F5 to run/debug the application
- Switch to the desired branch
- development has the latest version
- master has latest release ready version
- Open the project in Visual Studio
- Hit CTRL+F5 to run (F5 to debug) the application
- The site should open to the first-run-setup screen
- Code, Contribute, and Enjoy!

Deployment
-----------

Please visit the [wiki](https://github.com/NullDesk/TicketDesk/wiki) for comprehensive documentation on how to deploy TicketDesk to production IIS server or Azure.

For experienced server admins, please see the [Quick Setup Instructions](https://github.com/NullDesk/TicketDesk/wiki/Quick-Setup-Instructions) for an abbreviated overview.
TicketDesk is a straight forward ASP.Net and SQL server application. Please see the [Quick Setup Instructions](https://github.com/NullDesk/TicketDesk/wiki/Quick-Setup-Instructions) for an abbreviated overview of deploying TicketDesk.
4 changes: 2 additions & 2 deletions TicketDesk/S22.Mail/S22.Mail.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>S22.Mail</RootNamespace>
<AssemblyName>S22.Mail</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand All @@ -22,7 +22,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Debug\S22.Mail.XML</DocumentationFile>
<DocumentationFile>bin\Debug\S22.Mail.xml</DocumentationFile>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.IO;
using System.Net.Mail;
using System.Net.Mime;
#pragma warning disable 1591

namespace S22.Mail {
[Serializable]
Expand Down Expand Up @@ -61,3 +62,4 @@ public static byte[] GetBytesFromStream(Stream input)
}
}
}
#pragma warning restore 1591
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
using System;
using System.Collections.ObjectModel;
#pragma warning disable 1591

namespace S22.Mail {
[Serializable]
public class SerializableAlternateViewCollection : Collection<SerializableAlternateView>, IDisposable {
public void Dispose() { }
}
}
#pragma warning restore 1591
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.Net.Mail;
using System.Net.Mime;
using System.Text;
#pragma warning disable 1591

namespace S22.Mail {
[Serializable]
Expand Down Expand Up @@ -59,3 +60,4 @@ private SerializableAttachment(Attachment attachment) {
public TransferEncoding TransferEncoding { get; set; }
}
}
#pragma warning restore 1591
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
using System;
using System.Collections.ObjectModel;

#pragma warning disable 1591
namespace S22.Mail {
[Serializable]
public class SerializableAttachmentCollection : Collection<SerializableAttachment>, IDisposable {
public void Dispose() { }
}
}
#pragma warning restore 1591
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Collections.Specialized;
using System.Net.Mime;
#pragma warning disable 1591

namespace S22.Mail {
[Serializable]
Expand Down Expand Up @@ -51,3 +52,4 @@ private SerializableContentDisposition(ContentDisposition disposition) {
public long Size { get; set; }
}
}
#pragma warning restore 1591
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Collections.Specialized;
using System.Net.Mime;
#pragma warning disable 1591

namespace S22.Mail {
[Serializable]
Expand Down Expand Up @@ -44,3 +45,4 @@ private SerializableContentType(ContentType contentType) {
public StringDictionary Parameters { get; private set; }
}
}
#pragma warning restore 1591
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

namespace S22.Mail {
[Serializable]
#pragma warning disable 1591
public class SerializableLinkedResource {
public static implicit operator LinkedResource(SerializableLinkedResource resource) {
if (resource == null)
Expand Down Expand Up @@ -39,4 +40,6 @@ private SerializableLinkedResource(LinkedResource resource) {
public SerializableContentType ContentType { get; set; }
public TransferEncoding TransferEncoding { get; set; }
}
#pragma warning restore 1591

}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@

namespace S22.Mail {
[Serializable]
#pragma warning disable 1591
public class SerializableLinkedResourceCollection : Collection<SerializableLinkedResource>, IDisposable {
public void Dispose() { }
}
#pragma warning restore 1591

}
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
using System;
using System.Net.Mail;
#pragma warning disable 1591

namespace S22.Mail {
[Serializable]
public class SerializableMailAddress {
public static implicit operator MailAddress(SerializableMailAddress address) {

public static implicit operator MailAddress(SerializableMailAddress address) {
if (address == null)
return null;
return new MailAddress(address.Address, address.DisplayName);
Expand All @@ -25,3 +27,5 @@ private SerializableMailAddress(MailAddress address) {
public string DisplayName { get; private set; }
}
}
#pragma warning restore 1591

Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

namespace S22.Mail {
[Serializable]
#pragma warning disable 1591
public class SerializableMailAddressCollection : Collection<SerializableMailAddress> {
#pragma warning restore 1591
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Collections.Specialized;
using System.Net.Mail;
using System.Text;
#pragma warning disable 1591

namespace S22.Mail {
/// <summary>
Expand Down Expand Up @@ -98,3 +99,4 @@ private SerializableMailMessage(MailMessage m) {
public SerializableMailAddressCollection To { get; private set; }
}
}
#pragma warning restore 1591
2 changes: 1 addition & 1 deletion TicketDesk/TicketDesk.Domain.Legacy/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
</providers>
</entityFramework>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>TicketDesk.Domain.Legacy</RootNamespace>
<AssemblyName>TicketDesk.Domain.Legacy</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<TargetFrameworkProfile />
Expand Down
2 changes: 1 addition & 1 deletion TicketDesk/TicketDesk.Domain/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@
</assemblyBinding>
</runtime>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
</startup>
</configuration>

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
namespace TicketDesk.Domain.Migrations
{
using System;
using System.Data.Entity.Migrations;

public partial class Td25019 : DbMigration
{
public override void Up()
{
AddColumn("dbo.TicketEvents", "ForActivity", c => c.Int(nullable: false, defaultValue: 16384));
}

public override void Down()
{
DropColumn("dbo.TicketEvents", "ForActivity");
}
}
}
Loading

0 comments on commit a31a1c3

Please sign in to comment.