867 Commits

Author SHA1 Message Date
Andre Passos
7b1d11e4a8 update to angular-cli and angular 4 2017-04-13 13:06:22 -03:00
Ramón Tomás
f48a503885 Fix issue error when building the SPA app from the CLI #164 2017-04-13 10:51:19 +02: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
97d0283db1 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
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
1eae6a9ea2 Merge branch 'master' 2017-04-11 12:20:39 -07:00
Charles Lowell
25f23d2503 Merge branch 'master' 2017-04-11 12:20:39 -07:00
Ramón Tomás
9e17d9c85e Added wwwroot/lib folders to gitignore 2017-04-11 16:05:27 +02:00
Ramón Tomás
cb4a3503df Added wwwroot/lib folders to gitignore 2017-04-11 16:05:27 +02:00
Ramón Tomás
411883fddc Added wwwroot/lib folders to gitignore 2017-04-11 16:05:08 +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
3ef6846fe0 Minor change in label 2017-04-08 12:06:51 -07:00
Cesar De la Torre
33281474af Minor change in label 2017-04-08 12:06:51 -07:00
Cesar De la Torre
345e275a0e Minor change in label 2017-04-08 12:05:25 -07:00
Cesar De la Torre
868c37e4f9 Minor change in label 2017-04-08 12:05:25 -07:00
Cesar De la Torre
63eed87292 Merge pull request #142 from chlowell/hosting-changes
Set application discriminators, work around Redis client issue
2017-04-08 11:15:28 -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
0c317d56f3 Refactoring resilience implementation in order to use Polly directly when creating the resilience policies 2017-04-07 12:48:22 +02: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
97d8e80294 SPA checks for its dependences on healthcheck 2017-04-07 10:49:28 +02:00
Eduard Tomas
80bac99f63 SPA checks for its dependences on healthcheck 2017-04-07 10:49:28 +02:00
dsanz
6ca7f25669 Renaming of the resilience.http project 2017-04-06 16:59:17 +02:00
dsanz
5cdb5afa2d Renaming of the resilience.http project 2017-04-06 16:59:17 +02:00
dsanz
c16941cf25 Fix warnings 2017-04-06 11:59:11 +02:00
dsanz
edd72d2160 Fix warnings 2017-04-06 11:59:11 +02:00
Eduard Tomas
2658a69347 Fixes after merge :) 2017-04-05 19:01:48 +02:00
Eduard Tomas
51359dea94 Fixes after merge :) 2017-04-05 19:01:48 +02:00
Eduard Tomas
756cb3dafa 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
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
f337898143
upgrade to Identity Server 4 rtm 2017-04-05 09:23:22 -03: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
Cesar De la Torre
61df92872a Renaming to ResilientHttpClient and StandardHttpClient 2017-03-28 14:30:30 -07:00
Ramón Tomás
fd0a30d62a Merge from Dev 2017-03-28 16:37:36 +02:00
Ramón Tomás
e08fe895a3 Added MVC and SPA Apps to healthChecker
Added styles to view
2017-03-28 16:16:01 +02:00
dsanz
53bdf6de04 Add error message in WebSPA when create order returns exception 2017-03-28 11:03:59 +02:00