149 Commits

Author SHA1 Message Date
Ramón Tomás
87e57b9a44 Merge from Dev 2017-05-18 15:39:31 +02:00
Christian Arenas
e842cd81b3 Changing status item condition in order view 2017-05-18 11:37:50 +02:00
Ramón Tomás
afc247da67 Change SPA app to call basket for order checkout 2017-05-16 09:23:35 +02:00
Ramón Tomás
f79806e899 Created Ship order process in WebMVC app
Create Ship order command and handler in Ordering.api
Create Order management page in WebMVC app
2017-05-14 14:48:37 +02:00
Ramón Tomás
7f5687d91e 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
00a0824bbd Fix issue identityService.getuseridentity fails when called from integration event 2017-05-11 18:34:07 +02:00
Christian Arenas
01211322f7 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
9ae4d93a54 Add Order Description field 2017-05-11 16:04:35 +02:00
Ramón Tomás
21fe9b7be4 Create checkout call in webmvc
Created Cancel call in webmvc
2017-05-11 11:51:13 +02:00
Ramón Tomás
564e2df93a Extract Policies to ResilientHttpClientFactory 2017-05-10 13:25:43 +02:00
Ramón Tomás
d2c950d94e Fix issue WebMVC bootstrap lib not deployed to container in windows cli 2017-05-10 11:37:29 +02:00
Eduard Tomas
efe496e156 ResilientHttp client policies fixed 2017-05-09 20:27:00 +02:00
Eduard Tomas
4ca7dfde09 Merge remote-tracking branch 'origin/reissemberexecutionkey' into dev 2017-05-09 18:34:41 +02:00
Eduard Tomas
37cef95fec Use good endpoints for healthcheck 2017-05-09 16:59:23 +02:00
Eduard Tomas
95af2d9a02 Autorefresh on healthchecks with config timeout 2017-05-09 13:54:45 +02:00
Unai Zorrilla Castro
aa8e943ba9 Added ExecutionKey into PolicyWrap and remove COncurrentDictioanry 2017-05-09 09:19:27 +02:00
Cesar De la Torre
dbbcc95c5e Removing -all rights reserved- as this is Open Source. 2017-05-08 08:50:02 -07:00
Eduard Tomas
2086399a1c Merge branch 'httpclientreview' into dev 2017-05-08 16:08:35 +02:00
Eduard Tomas
aecb81aefa Fixed error on sharing policies between origins 2017-05-08 16:07:51 +02:00
Cesar De la Torre
4c0f0b01ad 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
99cbbe484e Minor description refactoring 2017-05-06 21:41:32 -07:00
Unai Zorrilla Castro
9cc6adbd89 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
Eduard Tomas
829f13aff0 Updated healthcheck lib 2017-05-02 10:29:24 +02:00
RamonTC
9c6b54a7fc Merge pull request #167 from andrelmp/dev
Upgrade to angular-cli and Angular 4
2017-04-25 10:29:31 +02:00
Andre Passos
db1fa9fd5c update to angular-cli and angular 4 2017-04-13 13:06:22 -03: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
Ramón Tomás
9e17d9c85e 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
Cesar De la Torre
3ef6846fe0 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
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
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
6ca7f25669 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
Eduard Tomas
2658a69347 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
André Passos
f337898143
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
Cesar De la Torre
c0c0941c4c Refactored internal ResiliencePolicy base class and ResiliencePolicyFactory 2017-04-04 13:19:22 -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
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