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

Dto

mongo 2.5 (prep for retryable writes) and some small fixes

2017-12-14 15:44:24 +03:00

Infrastructure

Fix non-structured traces

2019-02-22 15:05:28 +00:00

IntegrationEvents

General refactoring for documentation

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

Model

mongo 2.5 (prep for retryable writes) and some small fixes

2017-12-14 15:44:24 +03:00

Pics

Remove campaign test images and add new two images and change the name campaign seed

2017-06-16 11:44:51 +02:00

Properties

BFF Purchase - WIP

2018-01-29 16:58:08 +01:00

ViewModel

Check when the user doesn't have any location in database

2017-06-19 00:34:00 +02:00

appsettings.json

Added Seq to Marketing.API

2019-02-18 16:32:08 +00:00

Dockerfile

Merge Netcore2.2 branch

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

Marketing.API.csproj

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

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

MarketingSettings.cs

Created Azure functions for details campaign

2017-06-30 16:31:22 +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