9 Commits

Author SHA1 Message Date
Ramón Tomás
cecdc40ac1 Fix Authentication issue in Locations.api
Created input in user campaigns view to update the user's location
2017-09-15 13:54:48 +02:00
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
Ramón Tomás
f993463856 Implemented service bus for marketing.api locations.api graceperiodProcess payment.api 2017-06-30 08:59:26 +02:00
Eduard Tomas
96c3f5c2bc Merge remote-tracking branch 'origin/feature/data-and-ui-customization-v2' into dev
# Conflicts:
#	docker-compose.override.yml
#	src/Web/WebMVC/WebMVC.csproj
#	src/Web/WebMVC/wwwroot/css/shared/components/identity/identity.css
#	src/Web/WebMVC/wwwroot/css/site.min.css
#	src/Web/WebSPA/AppSettings.cs
2017-06-28 12:20:20 +02:00
Shaun Walker
445101b376 data and UI customization enhancements 2017-06-20 12:54:32 -07:00
Christian Arenas
870ac403af Add Marketing endpoint 2017-06-15 02:20:33 +02:00
Carlos Cañizares Estévez
6cff3aaf50 Basket microservice integration in MVC web, remove session from MVC Site, docker-compose to include Basket.api and Redis image. 2016-11-16 10:19:00 +01:00
Cesar De la Torre
67e94c3c45 - Consuming Ordering.API microservice from WebMVC app
- SQL DB updated with EF Migrations
- build-images.ps1 updated
2016-10-10 21:52:57 -07:00
Cesar De la Torre
8cc57c2542 WebMVC project folder simplified and migrated to latest version of VS Tools for Docker 2016-10-07 17:13:05 -07:00