TabletDirector-develop

• 

  Clint Furse 18 Aug 2014 ccd8c399636f36459b2bc1cbc290807941850b48

  Merge branch 'master' into develop
  Conflicts:
          TabletDirector/Migrations/201408012223064_AppRegularExp.Designer.cs
          TabletDirector/Migrations/201408041539359_PackCloseAll.Designer.cs
          TabletDirector/Migrations/201408071528562_OrderPickMethod.Designer.cs
          TabletDirector/Migrations/201408121457421_OrderDetailActive.cs
          TabletDirector/Properties/PublishProfiles/Arvixe-Develop.pubxml
          TabletDirector/Properties/PublishProfiles/Arvixe-Staging.pubxml
          TabletDirector/Properties/PublishProfiles/Arvixe.pubxml
          TabletDirector/TabletDirector.csproj
• 

  Clint Furse 07 Aug 2014 4222463b9c60cc90dfaa005eaacf71499efd9acf

  took out some other instances of the old name "slotting"

  • TabletDirector/Models/DatabaseModels/HostTrigger.cs (diffs)
• 

  Clint Furse 06 Aug 2014 e889852d7c8c3c589b71f819ed7a30c6f312b921

  moved publish profile

  • TabletDirector/TabletDirector.csproj (diffs)
• 

  Clint Furse 06 Aug 2014 5af7b96aaa94b10b92a91f53f770557a74594954

  moved publish profile

  • TabletDirector/Properties/PublishProfiles/Arvixe-Staging.pubxml (diffs)
  • TabletDirector/Properties/PublishProfiles/Arvixe.pubxml (diffs)
• 

  Clint Furse 05 Aug 2014 3fa367b62893190eebd73977be18af1c6f47a71b

  Merge branch 'release/1.8.0'
  Conflicts:
• 

  Clint Furse 16 Jul 2014 56e73a8b8c36f1639f58bd3baf5bc867d7fc9553

  removed old project

  • TabletDirector.Models/Migrations/201406272101308_GroupNameRequired.Designer.cs (diffs)
  • TabletDirector.Models/Migrations/201406272101308_GroupNameRequired.cs (diffs)
  • TabletDirector.Models/Migrations/201406272101308_GroupNameRequired.resx (diffs)
  • TabletDirector.Models/Migrations/201407031747337_LocPickLastFlag.Designer.cs (diffs)
  • TabletDirector.Models/Migrations/201407031747337_LocPickLastFlag.cs (diffs)
  • TabletDirector.Models/Migrations/201407031747337_LocPickLastFlag.resx (diffs)
  • TabletDirector.Models/Migrations/201407081542162_HostAllocation.Designer.cs (diffs)
  • TabletDirector.Models/Migrations/201407081542162_HostAllocation.cs (diffs)
  • TabletDirector.Models/Migrations/201407081542162_HostAllocation.resx (diffs)
  • TabletDirector.Models/TabletDirector.Models.csproj (diffs)
  • TabletDirector/Migrations/201407081542162_HostAllocation.Designer.cs (diffs)
  • TabletDirector/Migrations/201407081542162_HostAllocation.cs (diffs)
  • TabletDirector/Migrations/201407081542162_HostAllocation.resx (diffs)