| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 Unai Zorrilla Castro | 62126f5cf5 | 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 |  | 
			
				
					| 
							
							
								 Ramón Tomás | fa048c22c1 | Merge from Dev | 2017-05-04 11:57:49 +02:00 |  | 
			
				
					| 
							
							
								 Ramón Tomás | 0d71edf214 | Merge from Dev | 2017-05-04 11:57:49 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | 829f13aff0 | Updated healthcheck lib | 2017-05-02 10:29:24 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | 22cc8daa65 | 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 |  | 
			
				
					| 
							
							
								 RamonTC | 1ccc87e743 | Merge pull request #167 from andrelmp/dev Upgrade to angular-cli and Angular 4 | 2017-04-25 10:29:31 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | 952bd41e39 | Merge of eShopOnContainers/master branch into master /docs not merged (won't be on this repo). | 2017-04-24 12:25:10 +02:00 |  | 
			
				
					| 
							
							
								 Ramón Tomás | 6c6532c0f4 | Merge from Dev | 2017-04-21 15:46:15 +02:00 |  | 
			
				
					| 
							
							
								 Ramón Tomás | add8bc2c11 | Merge from Dev | 2017-04-21 15:46:15 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | 101fc58418 | Solves error building SPA on linux host due to case error | 2017-04-19 15:45:32 +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 | 6ea2e1ed8b | Merge branch 'reviews/uzorrilla' into dev # Conflicts:
#	src/Services/Basket/Basket.API/Model/RedisBasketRepository.cs | 2017-04-18 15:34:31 +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 |  | 
			
				
					| 
							
							
								 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 | b06bcdcd58 | 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 |  | 
			
				
					| 
							
							
								 André Passos | 28426e95c0 | fix controller routes Signed-off-by: André Passos <andre-ap2@hotmail.com> | 2017-04-17 09:11:43 -03:00 |  | 
			
				
					| 
							
							
								 Andre Passos | db1fa9fd5c | update to angular-cli and angular 4 | 2017-04-13 13:06:22 -03:00 |  | 
			
				
					| 
							
							
								 Andre Passos | 7b1d11e4a8 | update to angular-cli and angular 4 | 2017-04-13 13:06:22 -03: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 |  | 
			
				
					| 
							
							
								 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 | 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 |  | 
			
				
					| 
							
							
								 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 | 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 | 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 |  | 
			
				
					| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 André Passos | f337898143 | upgrade to Identity Server 4 rtm | 2017-04-05 09:23:22 -03:00 |  |