eShopOnContainers

History

Christian Arenas 06cbab4731 Merge branch 'feature/marketing-details-azure-function' into dev

# Conflicts:
#	docker-compose.vs.debug.yml
#	docker-compose.vs.release.yml
#	eShopOnContainers-ServicesAndWebApps.sln
#	src/Services/Location/Locations.API/Startup.cs
#	src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs
#	src/Services/Marketing/Marketing.API/Marketing.API.csproj
#	src/Services/Marketing/Marketing.API/Startup.cs
#	src/Web/WebMVC/appsettings.json
#	src/Web/WebSPA/AppSettings.cs
#	test/Services/FunctionalTests/Services/Marketing/MarketingScenarios.cs

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

appsettings.json

Created Azure functions for details campaign

2017-06-30 16:31:22 +02:00

CampaignScenariosBase.cs

remove userId parameter from GetCampaignsByUserId from functional test

2017-06-26 19:22:17 +02:00

MarketingScenarios.cs

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

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

MarketingScenariosBase.cs

Add functional test: Check The user has an location campaign