23 Commits

Author SHA1 Message Date
Eduard Tomàs
7321d5e5fc Base path fix and k8s config updated 2017-09-07 19:18:53 +02:00
Eduard Tomàs
6fd4f46058 Fix for rabbitMQ under windows containers.
Also some config tweaking on windows
2017-09-05 15:55:17 +02:00
Ramón Tomás
c9ff332b84 Fix merging duplicated ConfigureAuth method 2017-08-30 08:59:39 +02:00
Ramón Tomás
faea50f715 Merge 2017-08-30 08:08:01 +02:00
Ramón Tomás
9ed7325e0e Downgrade Identity.api version due to compatibility issues
Updated Test project version
Fix issue Idsrv token
2017-08-29 18:11:30 +02:00
Unai Zorrilla Castro
6ac34cbdaa Update functional tests 2017-08-29 12:48:04 +02:00
Unai Zorrilla Castro
c4454b005b Migrated Payment.API to .NETCoreApp2.0. Update Startup and Program to new template. Minor refactorings. Remove unused PaymentController.cs 2017-08-29 11:17:09 +02:00
Unai Zorrilla Castro
360456f051 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
Ramón Tomás
2baedadc7a Merge from Dev 2017-08-22 19:46:53 +02:00
Ramón Tomás
d289ec00cf Add swagger authorization option in APIs 2017-07-12 12:10:10 +02:00
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
Cesar De la Torre
27fae7c5d3 Fixed namespace copied/pasted from the Locations.API service into the Marketing service 2017-07-10 14:49:26 -07:00
dsanz
a8ad3edf30 Add Azure Storage Account Health Checks to Marketing.API 2017-07-07 14:05:52 +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
Christian Arenas
699ec0001d Create IdentityService in marketing API 2017-06-26 18:31:04 +02:00
Christian Arenas
cd1a091b6f Add polly to marketing api 2017-06-15 19:26:24 +02:00
Ramón Tomás
9bf5670020 Created Marketing read data model 2017-06-13 17:31:37 +02:00
Christian Arenas
1bd13747f4 Add exceptions filters 2017-06-02 16:31:03 +02:00
Christian Arenas
32247c503d Add marketing api 2017-06-01 20:15:21 +02:00
Christian Arenas
1ac1dae9d3 Add Marketing.API project 2017-06-01 10:10:00 +02:00