Miguel Veloso c1d7ca8951 Merge branch 'dev' into features/add-seq-sink ...

# Conflicts SOLVED:
#	.gitignore
#	src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHostExtensions.cs
#	src/Services/Basket/Basket.API/Basket.API.csproj
#	src/Services/Basket/Basket.API/Program.cs
#	src/Services/Basket/Basket.API/Startup.cs
#	src/Services/Catalog/Catalog.API/Catalog.API.csproj
#	src/Services/Catalog/Catalog.API/Program.cs
#	src/Services/Catalog/Catalog.API/Startup.cs
#	src/Services/Identity/Identity.API/Identity.API.csproj
#	src/Services/Identity/Identity.API/Program.cs
#	src/Services/Identity/Identity.API/Startup.cs
#	src/Services/Location/Locations.API/Locations.API.csproj
#	src/Services/Location/Locations.API/Program.cs
#	src/Services/Location/Locations.API/Startup.cs
#	src/Services/Marketing/Marketing.API/Marketing.API.csproj
#	src/Services/Marketing/Marketing.API/Program.cs
#	src/Services/Marketing/Marketing.API/Startup.cs
#	src/Services/Ordering/Ordering.API/Ordering.API.csproj
#	src/Services/Ordering/Ordering.API/Program.cs
#	src/Services/Ordering/Ordering.API/Startup.cs
#	src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj
#	src/Services/Ordering/Ordering.SignalrHub/Program.cs
#	src/Services/Ordering/Ordering.SignalrHub/Startup.cs
#	src/Services/Payment/Payment.API/Payment.API.csproj
#	src/Services/Payment/Payment.API/Program.cs
#	src/Services/Payment/Payment.API/Startup.cs
#	src/Web/WebMVC/Program.cs
#	src/Web/WebMVC/Startup.cs
#	src/Web/WebStatus/Program.cs
#	src/Web/WebStatus/Startup.cs
#	src/Web/WebStatus/WebStatus.csproj

2019-02-28 15:34:12 +00:00

..

Controllers

standar names and fixed response for swagger apis

2018-11-15 12:50:37 +01:00

Infrastructure

General refactoring for documentation

2019-02-26 21:55:04 +00:00

IntegrationEvents/Events

Merge branch 'feature/marketing-details-azure-function' into dev

2017-07-07 11:56:57 +02:00

Model

Migrated Marketing.API and Locations.API to .NETCoreApp2.0. Update Startup and Program to new .NETCoreApp2.0 templates

2017-08-29 11:01:27 +02:00

Properties

Fixing errors in SPA when calling basket api through apigw

2018-02-07 14:15:17 +01:00

ViewModel

Migrated Marketing.API and Locations.API to .NETCoreApp2.0. Update Startup and Program to new .NETCoreApp2.0 templates

2017-08-29 11:01:27 +02:00

appsettings.json

Added Seq to Locations.API

2019-02-18 15:02:21 +00:00

Dockerfile

Merge Netcore2.2 branch

2019-01-03 18:41:58 +01:00

Locations.API.csproj

Merge branch 'dev' into features/add-seq-sink

2019-02-28 15:34:12 +00:00

LocationSettings.cs

Adapt Locations.api to nosql db

2017-06-08 17:33:55 +02:00

Program.cs

runfix

2019-02-28 11:43:44 +03:00

Startup.cs

Merge branch 'dev' into features/add-seq-sink

2019-02-28 15:34:12 +00:00