595 Commits

Author SHA1 Message Date
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
9ed2f1ce7b Catalog.API methods following more rest conventions:
Create/Update routed by POST/PUT & Location header returned
A new GET endpoint for returning single item by id created to honour Location header of previous methods.
2017-04-18 17:58:52 +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
Unai Zorrilla Castro
c99e5e8e3b Pending review files 2017-04-17 15:00:53 +02:00
Unai Zorrilla Castro
c33513303d Review on 17/04/2017 2017-04-17 12:28:12 +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
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
4df73b155e Minor change in label 2017-04-08 12:06:27 -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
7805b3e290 Remove commented code 2017-04-07 15:23:05 +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
80bac99f63 SPA checks for its dependences on healthcheck 2017-04-07 10:49:28 +02:00
Cesar De la Torre
dae9fdb471 Added DDD comment about the Address Id as "Shadow property" as a Value Object shouldn't have an ID in the domain model. 2017-04-06 11:47:10 -07: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
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
8039ffe96e upgrade to Identity Server 4 rtm 2017-04-05 09:23:22 -03:00
Eduard Tomas
be440a9a02 Removing PaymentMethod property from order 2017-04-05 13:15:27 +02: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
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