271 Commits

Author SHA1 Message Date
Ramón Tomás
8045d6302b Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign 2017-05-11 18:35:12 +02:00
Ramón Tomás
f302316cb0 Fix issue identityService.getuseridentity fails when called from integration event 2017-05-11 18:34:07 +02:00
Christian Arenas
09a2ab4058 Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign
# Conflicts:
#	src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/UserCheckoutAcceptedIntegrationEventHandler.cs
2017-05-11 16:08:49 +02:00
Christian Arenas
38f86f2cd6 Add Order Description field 2017-05-11 16:04:35 +02:00
Ramón Tomás
9e00dceeb1 Create checkout call in webmvc
Created Cancel call in webmvc
2017-05-11 11:51:13 +02:00
Cesar De la Torre
f9e60c53a3 Removing -all rights reserved- as this is Open Source. 2017-05-08 08:50:02 -07:00
Eduard Tomas
6f7ee11cd3 Merge branch 'httpclientreview' into dev 2017-05-08 16:08:35 +02:00
Eduard Tomas
af6c942aac Fixed error on sharing policies between origins 2017-05-08 16:07:51 +02:00
Cesar De la Torre
14cbbe6bcb Removed NMP INSTALL from docker-compose.ci.build.yml. Shouldn't need to do that every time. 2017-05-06 23:28:38 -07:00
Cesar De la Torre
53777d5105 Minor description refactoring 2017-05-06 21:41:32 -07:00
Unai Zorrilla Castro
62126f5cf5 Remove reference to HttpClient from IHttpClient. Change methods to allow specify authorization token and requestid headers in each request. Added API to group uri definitions 2017-05-04 13:01:14 +02:00
Ramón Tomás
0d71edf214 Merge from Dev 2017-05-04 11:57:49 +02:00
Eduard Tomas
22cc8daa65 Updated healthcheck lib 2017-05-02 10:29:24 +02:00
RamonTC
1ccc87e743 Merge pull request #167 from andrelmp/dev
Upgrade to angular-cli and Angular 4
2017-04-25 10:29:31 +02:00
Ramón Tomás
add8bc2c11 Merge from Dev 2017-04-21 15:46:15 +02:00
Eduard Tomas
39813424f9 Solves error building SPA on linux host due to case error 2017-04-19 15:45:32 +02:00
Eduard Tomas
658904ce5c Merge branch 'reviews/uzorrilla' into dev
# Conflicts:
#	src/Services/Basket/Basket.API/Model/RedisBasketRepository.cs
2017-04-18 15:34:31 +02:00
André Passos
b06bcdcd58 Changes to make SPA compatible with angular-cli AOT
Signed-off-by: André Passos <andre-ap2@hotmail.com>
2017-04-17 10:00:51 -03:00
André Passos
28426e95c0 fix controller routes
Signed-off-by: André Passos <andre-ap2@hotmail.com>
2017-04-17 09:11:43 -03:00
Andre Passos
7b1d11e4a8 update to angular-cli and angular 4 2017-04-13 13:06:22 -03:00
Ramón Tomás
6420357e07 Fix issue error when building the SPA app from the CLI #164 2017-04-13 10:51:19 +02:00
dsanz
4575487153 Merge branch 'master' into dev
# Conflicts:
#	src/Web/WebMVC/Views/Shared/Components/CartList/Default.cshtml
#	src/Web/WebSPA/Client/modules/basket/basket.component.html
2017-04-13 09:54:12 +02:00
Charles Lowell
25f23d2503 Merge branch 'master' 2017-04-11 12:20:39 -07:00
Ramón Tomás
cb4a3503df Added wwwroot/lib folders to gitignore 2017-04-11 16:05:27 +02:00
Ramón Tomás
cb780add8f Added wwwroot/lib folders to gitignore 2017-04-11 16:05:08 +02:00
Cesar De la Torre
33281474af Minor change in label 2017-04-08 12:06:51 -07:00
Cesar De la Torre
868c37e4f9 Minor change in label 2017-04-08 12:05:25 -07:00
Cesar De la Torre
d652c4027c Merge pull request #142 from chlowell/hosting-changes
Set application discriminators, work around Redis client issue
2017-04-08 11:15:28 -07:00
dsanz
243d9a7ee3 Refactoring resilience implementation in order to use Polly directly when creating the resilience policies 2017-04-07 12:48:22 +02:00
Eduard Tomas
80bac99f63 SPA checks for its dependences on healthcheck 2017-04-07 10:49:28 +02:00
dsanz
5cdb5afa2d Renaming of the resilience.http project 2017-04-06 16:59:17 +02:00
dsanz
edd72d2160 Fix warnings 2017-04-06 11:59:11 +02:00
Eduard Tomas
51359dea94 Fixes after merge :) 2017-04-05 19:01:48 +02:00
Eduard Tomas
9c4f4a4e7f Merge branch 'master' into dev
# Conflicts:
#	src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj
#	src/Services/Catalog/Catalog.API/Startup.cs
#	src/Services/Ordering/Ordering.API/Infrastructure/AutofacModules/MediatorModule.cs
#	src/Web/WebMVC/Startup.cs
2017-04-05 17:05:14 +02:00
André Passos
8039ffe96e upgrade to Identity Server 4 rtm 2017-04-05 09:23:22 -03:00
Ramón Tomás
6803781bf8 Merge from Dev 2017-04-05 11:12:49 +02:00
Ramón Tomás
00f7226f30 Rename OrderingIntegrationEvent service methods
Remove clean basket instruction from SPA client
2017-04-05 11:07:26 +02:00
Cesar De la Torre
c0c0941c4c Refactored internal ResiliencePolicy base class and ResiliencePolicyFactory 2017-04-04 13:19:22 -07:00
Cesar De la Torre
a373ace60b delete temp readme 2017-03-31 14:42:50 -07:00
dsanz
54d62b8a2c Merge branch 'resilience-buildingblock' into dev 2017-03-31 14:58:00 +02:00
dsanz
e9bdeb6f13 Make resilient policies configurable. 2017-03-31 14:20:03 +02:00
Eduard Tomas
202882aa7c Fixed healthcheck errors 2017-03-31 12:47:56 +02:00
Ramón Tomás
d9c004a92d Added integration event for cleaning basket when order is created 2017-03-31 10:30:56 +02:00
Cesar De la Torre
fa541444c7 Fixed bug in HealthChecks so the Catalog.API microservice checks the SQL database.
Also, added more UrlChecks to the MVC app so it checks all its dependencies.
Plus minor bugs/missing code in docker-compose.pro.yml that was evolved in the .override.yml
2017-03-30 18:25:19 -07:00
dsanz
6ac5a8cc70 Move Polly implementation to Building block project 2017-03-30 15:05:19 +02:00
Cesar De la Torre
ce8b89e48e Uploading the early Draft Xamarin Patterns eBook 2017-03-29 13:16:00 -07:00
dsanz
35cc2f9d7b Merge branch 'dev'
# Conflicts:
#	src/Services/Basket/Basket.API/Model/IBasketRepository.cs
#	src/Services/Basket/Basket.API/Model/RedisBasketRepository.cs
#	src/Services/Catalog/Catalog.API/Startup.cs
#	src/Services/Ordering/Ordering.API/Application/Commands/CreateOrderCommandHandler.cs
#	src/Services/Ordering/Ordering.Infrastructure/Repositories/OrderRepository.cs
#	test/Services/UnitTest/Ordering/Application/NewOrderCommandHandlerTest.cs
2017-03-29 11:43:30 +02:00
Ramón Tomás
482b5d239c Fix bug logger not working in HttpClient 2017-03-29 11:20:33 +02:00
Cesar De la Torre
649950f2df Minor change in Exponential Backoff config for the RetryPolicy 2017-03-28 23:58:04 -07:00
Cesar De la Torre
2e5dca4467 Minor refactoring related to Circuit Breaker, Exponential Backoff and the Order controller 2017-03-28 19:48:04 -07:00