Build: #47 was successful
Job: Tablet Director was successful
Code commits
TabletDirector-develop
-
Clint Furse d99f7b4a9e27dcad68d0cc0f550e0ee74caed453
Merge branch 'release/1.9.0' into develop
Conflicts:
TabletDirector/Controllers/BatchController.cs
TabletDirector/Controllers/WebServiceController.cs
TabletDirector/Models/DatabaseModels/AppSettings.cs
TabletDirector/TabletDirector.csproj
TabletDirector/Views/AppSettings/Edit.cshtml
TabletDirector/Views/Label/Index.cshtml
TabletDirector/Views/Location/HomeLocs.cshtml
TabletDirector/Views/Order/Edit.cshtml -
Clint Furse ea50c8ff72ae41e40e21fb31724a697d607ff8ea
added 'Place on Hold' link on the order Edit Screen
-
Clint Furse 9afb8747b784e2940ef6e7a41bee7c99cb5adca2
fixed some minor bugs in the DataImporter
-
Clint Furse 888499427bffd8c0e386042a747c5d7b90d3edcc
xpedx functions should now be working with new code
- TabletDirector/Controllers/AppSettingsController.cs (diffs)
- TabletDirector/Controllers/LicenseController.cs (diffs)
- TabletDirector/Controllers/WebServiceController.cs (diffs)
- TabletDirector/LocalServices/InventoryService.cs (diffs)
- TabletDirector/Migrations/201409151810361_TrackInvFlag.Designer.cs (diffs)
- TabletDirector/Migrations/201409151810361_TrackInvFlag.cs (diffs)
- TabletDirector/Migrations/201409151810361_TrackInvFlag.resx (diffs)
- TabletDirector/Models/DatabaseModels/AppSettings.cs (diffs)
- TabletDirector/TabletDirector.csproj (diffs)
- TabletDirector/Views/AppSettings/Edit.cshtml (diffs)
-
Clint Furse 974c4996fba277e070e430a6de1831cebcf3f2d9
fixed host agent installer
-
Clint Furse 24a1431257379778062f1db01a9ae660599ba030
added label service for xpedx printing
- DataImporter/App.config (diffs)
- DataImporter/CSV/CsvOrderLine.cs (diffs)
- DataImporter/TypeProcessors/OrderProcessor.cs (diffs)
- HostAgentInstaller/HostAgentInstaller.aip (diffs)
- HostAgentInstaller/HostAgentInstaller.aiproj (diffs)
- TabletDirector.sln (diffs)
- TabletDirector/Views/Label/Index.cshtml (diffs)
- TabletDirectorInstaller/TabletDirectorInstaller.aip (diffs)
- TabletDirectorInstaller/TabletDirectorInstaller.aiproj (diffs)
- XpedxPrintingService/App_Start/BundleConfig.cs (diffs)
- XpedxPrintingService/App_Start/FilterConfig.cs (diffs)
- XpedxPrintingService/App_Start/RouteConfig.cs (diffs)
- XpedxPrintingService/App_Start/WebApiConfig.cs (diffs)
- XpedxPrintingService/Areas/HelpPage/ApiDescriptionExtensions.cs (diffs)
- XpedxPrintingService/Areas/HelpPage/App_Start/HelpPageConfig.cs (diffs)
- XpedxPrintingService/Areas/HelpPage/Controllers/HelpController.cs (diffs)
- XpedxPrintingService/Areas/HelpPage/HelpPage.css (diffs)
- XpedxPrintingService/Areas/HelpPage/HelpPageAreaRegistration.cs (diffs)
- XpedxPrintingService/Areas/HelpPage/HelpPageConfigurationExtensions.cs (diffs)
- XpedxPrintingService/Areas/HelpPage/ModelDescriptions/CollectionModelDescription.cs (diffs)
- XpedxPrintingService/Areas/HelpPage/ModelDescriptions/ComplexTypeModelDescription.cs (diffs)
- XpedxPrintingService/Areas/HelpPage/ModelDescriptions/DictionaryModelDescription.cs (diffs)
- XpedxPrintingService/Areas/HelpPage/ModelDescriptions/EnumTypeModelDescription.cs (diffs)
- XpedxPrintingService/Areas/HelpPage/ModelDescriptions/EnumValueDescription.cs (diffs)
- XpedxPrintingService/Areas/HelpPage/ModelDescriptions/IModelDocumentationProvider.cs (diffs)
- XpedxPrintingService/Areas/HelpPage/ModelDescriptions/KeyValuePairModelDescription.cs (diffs)
- XpedxPrintingService/Areas/HelpPage/ModelDescriptions/ModelDescription.cs (diffs)
- XpedxPrintingService/Areas/HelpPage/ModelDescriptions/ModelDescriptionGenerator.cs (diffs)
- XpedxPrintingService/Areas/HelpPage/ModelDescriptions/ModelNameAttribute.cs (diffs)
- XpedxPrintingService/Areas/HelpPage/ModelDescriptions/ModelNameHelper.cs (diffs)
- XpedxPrintingService/Areas/HelpPage/ModelDescriptions/ParameterAnnotation.cs (diffs)
- XpedxPrintingService/Areas/HelpPage/ModelDescriptions/ParameterDescription.cs (diffs)
- XpedxPrintingService/Areas/HelpPage/ModelDescriptions/SimpleTypeModelDescription.cs (diffs)
- XpedxPrintingService/Areas/HelpPage/Models/HelpPageApiModel.cs (diffs)
- XpedxPrintingService/Areas/HelpPage/SampleGeneration/HelpPageSampleGenerator.cs (diffs)
- XpedxPrintingService/Areas/HelpPage/SampleGeneration/HelpPageSampleKey.cs (diffs)
- XpedxPrintingService/Areas/HelpPage/SampleGeneration/ImageSample.cs (diffs)
- XpedxPrintingService/Areas/HelpPage/SampleGeneration/InvalidSample.cs (diffs)
- XpedxPrintingService/Areas/HelpPage/SampleGeneration/ObjectGenerator.cs (diffs)
- XpedxPrintingService/Areas/HelpPage/SampleGeneration/SampleDirection.cs (diffs)
- XpedxPrintingService/Areas/HelpPage/SampleGeneration/TextSample.cs (diffs)
- XpedxPrintingService/Areas/HelpPage/Views/Help/Api.cshtml (diffs)
- XpedxPrintingService/Areas/HelpPage/Views/Help/DisplayTemplates/ApiGroup.cshtml (diffs)
- XpedxPrintingService/Areas/HelpPage/Views/Help/DisplayTemplates/CollectionModelDescription.cshtml (diffs)
- XpedxPrintingService/Areas/HelpPage/Views/Help/DisplayTemplates/ComplexTypeModelDescription.cshtml (diffs)
- XpedxPrintingService/Areas/HelpPage/Views/Help/DisplayTemplates/DictionaryModelDescription.cshtml (diffs)
- XpedxPrintingService/Areas/HelpPage/Views/Help/DisplayTemplates/EnumTypeModelDescription.cshtml (diffs)
- XpedxPrintingService/Areas/HelpPage/Views/Help/DisplayTemplates/HelpPageApiModel.cshtml (diffs)
- XpedxPrintingService/Areas/HelpPage/Views/Help/DisplayTemplates/ImageSample.cshtml (diffs)
- XpedxPrintingService/Areas/HelpPage/Views/Help/DisplayTemplates/InvalidSample.cshtml (diffs)
- XpedxPrintingService/Areas/HelpPage/Views/Help/DisplayTemplates/KeyValuePairModelDescription.cshtml (diffs)
- XpedxPrintingService/Areas/HelpPage/Views/Help/DisplayTemplates/ModelDescriptionLink.cshtml (diffs)
- XpedxPrintingService/Areas/HelpPage/Views/Help/DisplayTemplates/Parameters.cshtml (diffs)
- XpedxPrintingService/Areas/HelpPage/Views/Help/DisplayTemplates/Samples.cshtml (diffs)
- XpedxPrintingService/Areas/HelpPage/Views/Help/DisplayTemplates/SimpleTypeModelDescription.cshtml (diffs)
- XpedxPrintingService/Areas/HelpPage/Views/Help/DisplayTemplates/TextSample.cshtml (diffs)
- XpedxPrintingService/Areas/HelpPage/Views/Help/Index.cshtml (diffs)
- XpedxPrintingService/Areas/HelpPage/Views/Help/ResourceModel.cshtml (diffs)
- XpedxPrintingService/Areas/HelpPage/Views/Shared/_Layout.cshtml (diffs)
- XpedxPrintingService/Areas/HelpPage/Views/Web.config (diffs)
- XpedxPrintingService/Areas/HelpPage/Views/_ViewStart.cshtml (diffs)
- XpedxPrintingService/Areas/HelpPage/XmlDocumentationProvider.cs (diffs)
- XpedxPrintingService/Content/Site.css (diffs)
- XpedxPrintingService/Content/bootstrap-theme.css (diffs)
- XpedxPrintingService/Content/bootstrap-theme.min.css (diffs)
- XpedxPrintingService/Content/bootstrap.css (diffs)
- XpedxPrintingService/Content/bootstrap.min.css (diffs)
- XpedxPrintingService/Controllers/HomeController.cs (diffs)
- XpedxPrintingService/Controllers/PrintController.cs (diffs)
- XpedxPrintingService/Global.asax (diffs)
- XpedxPrintingService/Global.asax.cs (diffs)
- XpedxPrintingService/Models/PrintOrderDetail.cs (diffs)
- XpedxPrintingService/Models/ServiceResponse.cs (diffs)
- XpedxPrintingService/NLog.config (diffs)
- XpedxPrintingService/NLog.xsd (diffs)
- XpedxPrintingService/Project_Readme.html (diffs)
- XpedxPrintingService/Properties/AssemblyInfo.cs (diffs)
- XpedxPrintingService/RawPrinterHelper.cs (diffs)
- XpedxPrintingService/Scripts/_references.js (diffs)
- XpedxPrintingService/Scripts/bootstrap.js (diffs)
- XpedxPrintingService/Scripts/bootstrap.min.js (diffs)
- XpedxPrintingService/Scripts/jquery-1.10.2.intellisense.js (diffs)
- XpedxPrintingService/Scripts/jquery-1.10.2.js (diffs)
- XpedxPrintingService/Scripts/jquery-1.10.2.min.js (diffs)
- XpedxPrintingService/Scripts/jquery-1.10.2.min.map (diffs)
- XpedxPrintingService/Scripts/modernizr-2.6.2.js (diffs)
- XpedxPrintingService/Scripts/respond.js (diffs)
- XpedxPrintingService/Scripts/respond.min.js (diffs)
- XpedxPrintingService/Views/Home/Index.cshtml (diffs)
- XpedxPrintingService/Views/Shared/Error.cshtml (diffs)
- XpedxPrintingService/Views/Shared/_Layout.cshtml (diffs)
- XpedxPrintingService/Views/Web.config (diffs)
- XpedxPrintingService/Views/_ViewStart.cshtml (diffs)
- XpedxPrintingService/Web.Debug.config (diffs)
- XpedxPrintingService/Web.Release.config (diffs)
- XpedxPrintingService/Web.config (diffs)
- XpedxPrintingService/XpedxPrintingService.csproj (diffs)
- XpedxPrintingService/favicon.ico (diffs)
- XpedxPrintingService/fonts/glyphicons-halflings-regular.eot (diffs)
- XpedxPrintingService/fonts/glyphicons-halflings-regular.svg (diffs)
- XpedxPrintingService/fonts/glyphicons-halflings-regular.ttf (diffs)
- XpedxPrintingService/fonts/glyphicons-halflings-regular.woff (diffs)
- XpedxPrintingService/logs/service.txt (diffs)
- XpedxPrintingService/packages.config (diffs)
-
Clint Furse e48db0820a03103b93ace1da32f280bfd5468f11
Merge branch 'master' into release/1.9.0
Conflicts:
TabletDirector/Properties/AssemblyInfo.cs -
Clint Furse 2e66b3b39b5909f888ab5be7a05765f406022e88
updated version
-
Clint Furse 96157c1b6bde8950a2b58aaaf299d876a05c4cd8
output host messages in xml now include xml declaration line
-
Clint Furse 98c9a9a6d4027deced336ef573f25734e05e4e66
pre-pick fixes
-
Clint Furse 0cabd3a7d579d6f96a1f479f7268f07cb0591752
logger can now correctly show class/line of code
-
Clint Furse 1150a4880b10a8d314cb369a7fee335d836112ee
preventing order stealing during batch build. WM-164
-
Clint Furse 8d851404612ec7873b9eab95fad4797ed59a97d4
implemented logging per site
