TabletDirector-develop

• 

  David Butt 21 Apr 2017 4d7b3c69959e393b5301e1365bd0609e358a2f73

  Merge remote-tracking branch 'origin/2.8.1' into Trunk
• 

  David Butt 21 Apr 2017 20a7ac53becd4321d8c7c1eae93cac5028b7b6ec

  WM-1752 WM-1866 WM-1865

  • TabletDirector/API/ItemApiController.cs (diffs)
  • TabletDirector/Controllers/ItemMasterController.cs (diffs)
  • TabletDirector/Controllers/LicenseController.cs (diffs)
  • TabletDirector/Controllers/WebServiceController.cs (diffs)
  • TabletDirector/Models/ServiceModels/SmUser.cs (diffs)
  • TabletDirector/Views/AppSettings/Edit.cshtml (diffs)
• 

  Jared Koford 21 Apr 2017 2c7b2cefef8443ff9cd6aa8663f6485d4e635a3a

  Dasboard found better way to fix resize problem

  • TabletDirector/Views/Home/Dashboard.cshtml (diffs)
• 

  Jared Koford 21 Apr 2017 f11d3ea0dd2bd490aa685719592753b668001dea

  Dashboard changed staging by order to run off of cart

  • TabletDirector/Controllers/HomeController.cs (diffs)
  • TabletDirector/Views/Home/Dashboard.cshtml (diffs)
• 

  Jared Koford 21 Apr 2017 5d1432be1512cec0aec748e0612f6aa4a82c188b

  Merge branch '2.8.1' of http://git.boxworks.com:7990/scm/wm/tabletdirector into 2.8.1
• 

  Jared Koford 21 Apr 2017 52eccf8c0f365189b3bcc73d431c570ea80ff402

  Dashboard Changed text size on block chart. Batch controller changed logic on GetDeviceForBatch

  • TabletDirector/Controllers/BatchController.cs (diffs)
  • TabletDirector/Views/Home/Dashboard.cshtml (diffs)