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 |
|
David Britch
|
b56d609251
|
Formatting change.
|
2017-04-12 16:10:27 +01:00 |
|
David Britch
|
d7fcf472fd
|
Unused namespace imports removed.
|
2017-04-12 16:09:12 +01:00 |
|
David Britch
|
bdcde46b18
|
Removed unused method from IdentityService.
|
2017-04-12 16:01:13 +01:00 |
|
David Britch
|
5507460870
|
Formatting updates to the authorization classes.
|
2017-04-12 15:49:15 +01: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
|
531ed7354d
|
Minor change in label
|
2017-04-08 12:06:27 -07:00 |
|
Cesar De la Torre
|
4df73b155e
|
Minor change in label
|
2017-04-08 12:06:27 -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
|
ccde4a09f4
|
Remove commented code
|
2017-04-07 15:23:05 +02:00 |
|
dsanz
|
7805b3e290
|
Remove commented code
|
2017-04-07 15:23:05 +02: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 |
|
Cesar De la Torre
|
a07a88f9c4
|
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 |
|
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
|
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 |
|
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 |
|