TabletDirector-develop

• 

  David Butt 28 Oct 2015 17bd9768e39be3ee5a9bb45b8f9c3870af40d7b6

  Merge remote-tracking branch 'origin/2.3' into 2.4
• 

  David Butt 28 Oct 2015 f4870143d791181943aa05f4230b2d852faed678

  fixed reallocation on ipad
• 

  David Butt 28 Oct 2015 43df41c6b7a3c760f07f2c14b13784d9e8a45bb9

  added ignore to .orig files created by winmerge when fixing conflicts

  • .gitignore (diffs)
• 

  David Butt 28 Oct 2015 f041cddb8269f3cf709ac785ed38957eb2b1f8fa

  fixed reallocate on ipad

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

  David Butt 27 Oct 2015 307753be1eca28041d4d80be6f66960aec4183ae

  added glimpse back and reverted teh web.config to 2.0.5

  • TabletDirector/TabletDirector.csproj (diffs)
  • TabletDirector/web.config (diffs)
• 

  David Butt 27 Oct 2015 515046f13afc5f8fc7212a4cb7392d9beaddac39

  added glimpse back in

  • TabletDirector/TabletDirector.csproj (diffs)
  • TabletDirector/web.config (diffs)
• 

  David Butt 27 Oct 2015 4b1cb16b6759e6258dfd2f419bfb81b97c1ae9b6

  added Elmah back in for web API

  • TabletDirector/TabletDirector.csproj (diffs)
  • TabletDirector/packages.config (diffs)
  • TabletDirector/web.config (diffs)
• 

  David Butt 22 Oct 2015 6429bd935527161248e5dba06f5d3eb84dd4bc9c

  back port of order api delete completed orders fix

  • TabletDirector/API/OrderApiController.cs (diffs)
• 

  David Butt 21 Oct 2015 f2dc880772cf4cbe56d9d954bbf904005590cacf

  fixed ipad login and edit location to add/change zone

  • TabletDirector/Controllers/LocationController.cs (diffs)
  • TabletDirector/Controllers/WebServiceController.cs (diffs)
• 

  David Butt 21 Oct 2015 f8d3515b12c9a8765d33aec5f8254e23204b1af9

  fixed lock on next order/batch to be url/host driven so to fix our cloud implementation

  • TabletDirector/Controllers/WebServiceController.cs (diffs)