TabletDirector-develop

• 

  Clint Furse 30 Sep 2014 f9389dc2004dfc9b6e605f6dab4f36c28604dc62

  removed override settings flag.  WM-173

  • TabletDirector/Controllers/WebServiceController.cs (diffs)
  • TabletDirector/Migrations/201409302250267_RemoveOverrideSettingsFlag.Designer.cs (diffs)
  • TabletDirector/Migrations/201409302250267_RemoveOverrideSettingsFlag.cs (diffs)
  • TabletDirector/Migrations/201409302250267_RemoveOverrideSettingsFlag.resx (diffs)
  • TabletDirector/Models/DatabaseModels/Group.cs (diffs)
  • TabletDirector/TabletDirector.csproj (diffs)
  • TabletDirector/Views/Group/Create.cshtml (diffs)
  • TabletDirector/Views/Group/Edit.cshtml (diffs)
  • TabletDirector/Views/Group/Index.cshtml (diffs)
• 

  Clint Furse 30 Sep 2014 ec6d019abf939a875072129630b35e3579c0fb52

  Merge branch 'release/1.9.0' into develop
  Conflicts:
          TabletDirector/Views/Batch/BatchBuild.cshtml
• 

  Clint Furse 30 Sep 2014 57ca79c330b28b0c99e1b90a0611d3656c276cf2

  fixed suggest dropdown style

  • TabletDirector/Content/Site.css (diffs)
• 

  Clint Furse 30 Sep 2014 c1ff54ad02ef6a772d913589b49bf13ea3ec1905

  orders with no lines now indicated on batch build zone.  WM-172

  • TabletDirector/Controllers/BatchController.cs (diffs)
  • TabletDirector/Models/ViewModels/ViewBatchBuild.cs (diffs)
  • TabletDirector/Views/Batch/BatchBuild.cshtml (diffs)