Build: #158 was successful Changes by David Butt
Code commits
TabletDirector-develop
-
David Butt 192159058d5fddd43838b6e13a8593a16e7772b4
Merge remote-tracking branch 'origin/2.1' into Trunk
-
David Butt 2f64abd165155fda3a205a1f4f33b2d222cde2e5
changes
- TabletDirector/Properties/PublishProfiles/tabletdirector - FTP.pubxml (diffs)
- TabletDirector/Properties/PublishProfiles/tabletdirector - Web Deploy.pubxml (diffs)
- TabletDirector/Properties/PublishProfiles/tabletdirector.azurewebsites.net.PublishSettings (diffs)
- TabletDirector/TabletDirector.csproj (diffs)
-
David Butt 9ce47368035d95cd2dcfcf59328bc33364062bd1
fixed merge conflicts between 2.0.2 and 2.1
-
David Butt 6b06df690f6daadd6c5c8ad052e71d462cf9ad7e
Merge remote-tracking branch 'origin/release/2.0.0' into 2.1
-
David Butt b76666ca1df32bfe1736dd26e238cab70a118a9b
- TabletDirector/API/OrderApiController.cs (diffs)
- TabletDirector/Controllers/BatchController.cs (diffs)
- TabletDirector/Controllers/CartCompartmentController.cs (diffs)
- TabletDirector/Controllers/WebServiceController.cs (diffs)
- TabletDirector/Migrations/201504232115287_DropCompartmentAddress.Designer.cs (diffs)
- TabletDirector/Migrations/201504232115287_DropCompartmentAddress.cs (diffs)
- TabletDirector/Migrations/201504232115287_DropCompartmentAddress.resx (diffs)
- TabletDirector/Migrations/Configuration.cs (diffs)
- TabletDirector/Models/DatabaseModels/CartCompartment.cs (diffs)
- TabletDirector/Models/ViewModels/ViewBatchBuild.cs (diffs)
- TabletDirector/Properties/AssemblyInfo.cs (diffs)
- TabletDirector/TabletDirector.csproj (diffs)
- TabletDirector/Views/Batch/_BatchBuildList.cshtml (diffs)
- TabletDirector/Views/Batch/_BatchList.cshtml (diffs)
- TabletDirector/Views/CartCompartment/Create.cshtml (diffs)
- TabletDirector/Views/CartCompartment/Edit.cshtml (diffs)
- TabletDirector/Views/CartCompartment/TypeEdit.cshtml (diffs)
-
David Butt 221348b286fc395dd7f1a95d5132af7d7cd0309d
Merge remote-tracking branch 'origin/release/2.0.0' into 2.1
-
David Butt 263fed8b4b02e165a6741279ae6c393c820d30cf
-
David Butt ffba75c2731aa1125b14619799ea7c4add02263d
Changed Item Master from float to decimal
Added sequence to CartCompartment, and changed the algorithm that sorts the compartments for assignment to use sequence- TabletDirector/API/ItemApiController.cs (diffs)
- TabletDirector/Controllers/BatchController.cs (diffs)
- TabletDirector/Migrations/201504221732152_FloatToDecimal-AddCompartmentSequence.Designer.cs (diffs)
- TabletDirector/Migrations/201504221732152_FloatToDecimal-AddCompartmentSequence.cs (diffs)
- TabletDirector/Migrations/201504221732152_FloatToDecimal-AddCompartmentSequence.resx (diffs)
- TabletDirector/Migrations/Configuration.cs (diffs)
- TabletDirector/Models/DatabaseModels/CartCompartment.cs (diffs)
- TabletDirector/Models/DatabaseModels/ItemMaster.cs (diffs)
- TabletDirector/Models/ServiceModels/SmPacking.cs (diffs)
- TabletDirector/Models/ViewModels/ViewBatchBuild.cs (diffs)
- TabletDirector/Models/ViewModels/ViewCartTypeAssign.cs (diffs)
- TabletDirector/TabletDirector.csproj (diffs)
-
David Butt 2a3344acd9ecc9c20a3584ae6ced2efb7c49e1c7
WM-361 fixed the batching so it would be consistent if a device is not selected.
-
David Butt e2f1203beb30877eba90b9ebe0175f62205e086e
not sure how this got missed...
-
David Butt 1938dea1317ead44354d629af2217cc3e664ad63
More Date Time fields
-
David Butt 55104b4b71601bf430a21e6998f34905a3d00f74
UTC time fix
-
David Butt 62013ef21ca9fdc6762ea1d7eae5aaee230bd007
bypassed microsofts json conversion to finally get date time correct.