Eduard Tomas
|
d9b9578e48
|
Merge remote-tracking branch 'origin/dev' into netcore2
# Conflicts:
# docker-compose.dcproj
# docker-compose.vs.debug.yml
# docker-compose.vs.release.yml
# src/BuildingBlocks/EventBus/EventBus/EventBus.csproj
# src/Services/Marketing/Marketing.API/Startup.cs
# src/Web/WebMVC/Startup.cs
# src/Web/WebMVC/WebMVC.csproj
|
2017-07-11 12:01:45 +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 |
|
dsanz
|
a65e9c01eb
|
Add Healthchecks to Locations.API and MArketing.API
|
2017-07-04 13:51:05 +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
|
d65a112535
|
References updated to preview-2
code adjustements to work with preview-2
|
2017-06-29 18:36:57 +02:00 |
|
Eduard Tomas
|
4303cbae89
|
Locations.API nuget updated
|
2017-06-21 19:39:47 +02:00 |
|
Eduard Tomas
|
56902a5549
|
[WIP] Projects & Dockerfile migrated to 2.0
Lots of things to address yet, because nuget packages are still on 1.1
|
2017-06-21 19:03:48 +02:00 |
|
Ramón Tomás
|
9bf5670020
|
Created Marketing read data model
|
2017-06-13 17:31:37 +02:00 |
|
Ramón Tomás
|
05bd964f2b
|
Adapt Locations.api to nosql db
|
2017-06-08 17:33:55 +02:00 |
|
Ramón Tomás
|
bae10b07b8
|
Created UserLocationModel
Map Position to Locations APi
Update current user location
|
2017-06-01 20:16:19 +02:00 |
|
Ramón Tomás
|
9d5cde2057
|
#2412-Create Location Microservice
|
2017-05-30 15:01:58 +02:00 |
|