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
Eduard Tomàs
70fc4c90ca
Merge pull request #156 from dotnet/idsvr-new-config
...
Idsvr new config
2017-04-05 16:07:47 +02:00
Eduard Tomas
d00588ae37
Updated IdSvr for Xamarin-UWP signin related problems
2017-04-05 15:53:04 +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
David Britch
25aeb2f9ab
Updated sentences displayed on SettingsView.
2017-04-05 12:38:34 +01:00
Eduard Tomas
be440a9a02
Removing PaymentMethod property from order
2017-04-05 13:15:27 +02:00
David Britch
5563da46b5
Unused namespace removed.
2017-04-05 10:48:17 +01: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
393b47fa93
CatalogIntegrationEventService Refactored
2017-04-04 17:01:58 -07:00
Cesar De la Torre
c0c0941c4c
Refactored internal ResiliencePolicy base class and ResiliencePolicyFactory
2017-04-04 13:19:22 -07:00
Eduard Tomas
46fd872fe8
Merge branch 'dev' of https://github.com/dotnet/eShopOnContainers into dev
2017-04-04 19:22:52 +02:00
Eduard Tomas
5eb5db1b8c
Error on registring event handlers
2017-04-04 19:22:18 +02:00
David Britch
3defa08c74
Replaced Unity with Autofac.
2017-04-03 16:32:53 +01:00
Sergio Escalada
8f34999d66
Xamarin clients: on basket view, show a message to user for every item that has its price updated
2017-04-03 15:25:24 +02:00
Ramón Tomás
3c909ff392
Refactor transaction and publishing in integration events
2017-04-03 13:13:40 +02:00
Eduard Tomas
a7c7426659
Removing Buyer navigation property in Order
2017-04-03 11:32:35 +02:00
Eduard Tomas
75629193b7
Xamarin callback client configurable
2017-04-03 10:18:56 +02:00
Cesar De la Torre
a373ace60b
delete temp readme
2017-03-31 14:42:50 -07:00
Eduard Tomas
47b7cabdcd
Merge remote-tracking branch 'origin/xamarin-fix-uwp-login' into dev
2017-03-31 17:52:23 +02: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
2e50097c65
Merge branch 'master' of https://github.com/dotnet/eShopOnContainers
2017-03-31 11:04:03 +02:00
Ramón Tomás
25a70605de
Fix issue ordering event handler registration
2017-03-31 11:03:29 +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
David Britch
3d34581582
Merge branch 'master' into xamarin
2017-03-30 13:51:52 +01:00
David Britch
ff188c8357
Made the mobile app use mock services by default.
2017-03-30 13:50:35 +01:00
Sergio Escalada
dd07066351
Merge remote-tracking branch 'origin/master' into xamarin-fix-uwp-login
2017-03-30 12:02:13 +02:00
Sergio Escalada
9ea68ae7a2
Xamarin UWP client login working again (needs to add a new redirect URI for Identity Server in server side)
2017-03-30 12:02:01 +02:00
dsanz
4dece916fc
Merge branch 'dev'
2017-03-30 11:39:18 +02:00
dsanz
3b4556b9c4
Add comment.
2017-03-30 11:38:10 +02:00
Cesar De la Torre
ce8b89e48e
Uploading the early Draft Xamarin Patterns eBook
2017-03-29 13:16:00 -07:00
dsanz
ba71b192a9
Fix issue #118 Token lifetime handling
2017-03-29 16:49:48 +02: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
3ef2aeff9a
Fix issue after merge
2017-03-28 16:37:48 +02: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
David Britch
10586b984f
Renamed a variable.
2017-03-28 13:39:48 +01:00
dsanz
e596926b9b
add comment about known bug in .net core 1.1
2017-03-28 13:55:27 +02:00
