TabletDirector-develop

• 

  David Butt 21 Nov 2017 c1b7100d45720bae72f9b0a6f3a21c9ef878412f

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

  David Butt 21 Nov 2017 ab73dbc1c224d752f2f11d91b2c6c8b7bb0237fa

  WM-2280

  • TabletDirector/Controllers/OrderController.cs (diffs)
• 

  David Butt 21 Nov 2017 e108b1ba2eb9284f93f2bddddf5d1b0ca16bc96a

  WM-2286 Ext in comments

  • TabletDirector/Controllers/InventoryController.cs (diffs)
• 

  David Butt 21 Nov 2017 9cfb0f9f5185c4d9f88a8e8bae297ce3fa35f6ad

  fixed .csproj to have the right jquery ui file referenced.

  • TabletDirector/TabletDirector.csproj (diffs)
• 

  David Butt 21 Nov 2017 ad9a2fa40ddf3d0e1830401707af31257701604d

  WM-2288

  • TabletDirector/Controllers/ImportExportController.cs (diffs)
• 

  David Butt 21 Nov 2017 dc39341ec10e175f3132f27b986d3294a5c891f2

  WM-2283

  • TabletDirector/Views/Order/CreateDetail.cshtml (diffs)
  • TabletDirector/Views/Order/Edit.cshtml (diffs)
  • TabletDirector/Views/Order/EditDetail.cshtml (diffs)
• 

  David Butt 21 Nov 2017 e7f9f48b798d44ae1b66fae169adc19701fe9d5c

  removed new JQuery version that was messing up some of our screens

  • TabletDirector/Controllers/InventoryController.cs (diffs)
  • TabletDirector/Scripts/jquery-3.2.1.intellisense.js (diffs)
  • TabletDirector/Scripts/jquery-3.2.1.js (diffs)
  • TabletDirector/Scripts/jquery-3.2.1.min.js (diffs)
  • TabletDirector/Scripts/jquery-3.2.1.min.map (diffs)
  • TabletDirector/Scripts/jquery-3.2.1.slim.js (diffs)
  • TabletDirector/Scripts/jquery-3.2.1.slim.min.js (diffs)
  • TabletDirector/Scripts/jquery-3.2.1.slim.min.map (diffs)
  • TabletDirector/Scripts/jquery-ui-1.10.4.js (diffs)
  • TabletDirector/Scripts/jquery-ui-1.10.4.min.js (diffs)
  • TabletDirector/Scripts/jquery-ui-1.11.4.js (diffs)
  • TabletDirector/Scripts/jquery-ui-1.11.4.min.js (diffs)
  • TabletDirector/Views/Inventory/Index.cshtml (diffs)
• 

  David Butt 21 Nov 2017 8d6734c38af467f0fe15d4b83d55a6054808f726

  WM-2289

  • TabletDirector/Controllers/InventoryController.cs (diffs)
  • TabletDirector/Views/Inventory/Index.cshtml (diffs)