996 Commits

Author SHA1 Message Date
Eduard Tomas
6ea2e1ed8b Merge branch 'reviews/uzorrilla' into dev
# Conflicts:
#	src/Services/Basket/Basket.API/Model/RedisBasketRepository.cs
2017-04-18 15:34:31 +02:00
André Passos
eb2981f72d remove .vscode folder and add to .gitignore 2017-04-17 10:43:39 -03:00
Unai Zorrilla Castro
7b779f0015 Pending review files 2017-04-17 15:00:53 +02:00
André Passos
676ba796ae
Changes to make SPA compatible with angular-cli AOT
Signed-off-by: André Passos <andre-ap2@hotmail.com>
2017-04-17 10:00:51 -03:00
André Passos
fe1216d5d8
fix controller routes
Signed-off-by: André Passos <andre-ap2@hotmail.com>
2017-04-17 09:11:43 -03:00
Unai Zorrilla Castro
4ef6b63913 Review on 17/04/2017 2017-04-17 12:28:12 +02:00
Andre Passos
db1fa9fd5c update to angular-cli and angular 4 2017-04-13 13:06:22 -03:00
David Britch
d9eda87256 Merge branch 'master' into xamarin 2017-04-13 10:44:20 +01:00
Ramón Tomás
0aea1b2bd2 Merge branch 'master' of https://github.com/dotnet/eShopOnContainers 2017-04-13 10:56:26 +02: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
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
Cesar De la Torre
d5d7bcafe5 eBook updated 2017-04-12 16:48:57 -07:00
Cesar De la Torre
eb9ad952bd ebook Update 2017-04-12 16:18:45 -07:00
Cesar De la Torre
c1660ac7e1 Updated Guide/eBook with the latest draft version (v0.4) 2017-04-12 14:24:17 -07: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
fb3c85ef56 update k8s deploy script 2017-04-11 15:04:20 -07:00
Charles Lowell
6cabf6691d update k8s configuration
- add event bus
- remove ASPNETCORE_ENVIRONMENT = Development (apps will default to Production)
2017-04-11 13:38:19 -07:00
Charles Lowell
1eae6a9ea2 Merge branch 'master' 2017-04-11 12:20:39 -07:00
Charles Lowell
0e55af7338 update READMEs 2017-04-11 11:20:42 -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
411883fddc Added wwwroot/lib folders to gitignore 2017-04-11 16:05:08 +02:00
dsanz
35417a6bf2 Add Webstatus to eShopContainers.sln 2017-04-11 10:25:38 +02:00
Cesar De la Torre
3ef6846fe0 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
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
d0e488f724 Merge branch 'dev' 2017-04-07 17:20:35 +02:00
dsanz
396ba60b72 Fix integration tests 2017-04-07 17:19:25 +02:00
dsanz
237c5424d8 Modify tests to use different settings for each microsevice 2017-04-07 16:12:58 +02:00
dsanz
ccde4a09f4 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
Eduard Tomas
e05cbfa809 Added WebStatus to cli build scripts.
Removed old script build for windows.
2017-04-07 10:49:51 +02:00
Eduard Tomas
97d8e80294 SPA checks for its dependences on healthcheck 2017-04-07 10:49:28 +02:00
Eduard Tomas
a12a53b44e Updated global sln with new projects 2017-04-07 09:24:30 +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
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
Eduard Tomàs
d934185ebf Merge pull request #155 from andrelmp/master
Upgrade to Identity Server 4 rtm
2017-04-05 16:39:18 +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
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
RamonTC
4c7f92f9c2 Merge pull request #150 from dotnet/features/#146-Clean-basket-with-integrate-event
Features/#146 clean basket with integrate event
2017-04-05 11:14:30 +02:00