Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							f39fdb92ca 
							
						 
					 
					
						
						
							
							Fix Failing middleware and move it to Basket.api  
						
						 
						
						
						
						
					 
					
						2017-07-13 17:35:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							ec78ef12c5 
							
						 
					 
					
						
						
							
							Separating menu options so it is clearer in the UI  
						
						 
						
						
						
						
					 
					
						2017-07-10 14:11:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							e1d8a8e23e 
							
						 
					 
					
						
						
							
							Fix UI styles MVCApp  
						
						 
						
						
						
						
					 
					
						2017-07-10 14:24:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Arenas 
							
						 
					 
					
						
						
						
						
							
						
						
							06cbab4731 
							
						 
					 
					
						
						
							
							Merge branch 'feature/marketing-details-azure-function' into dev  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	docker-compose.vs.debug.yml
#	docker-compose.vs.release.yml
#	eShopOnContainers-ServicesAndWebApps.sln
#	src/Services/Location/Locations.API/Startup.cs
#	src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs
#	src/Services/Marketing/Marketing.API/Marketing.API.csproj
#	src/Services/Marketing/Marketing.API/Startup.cs
#	src/Web/WebMVC/appsettings.json
#	src/Web/WebSPA/AppSettings.cs
#	test/Services/FunctionalTests/Services/Marketing/MarketingScenarios.cs 
						
						
					 
					
						2017-07-07 11:56:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							525040b9b6 
							
						 
					 
					
						
						
							
							Created Azure functions for details campaign  
						
						 
						
						... 
						
						
						
						Adapt MVC app to azure function details campaign
Adapt SPA app to azure function details campaign 
						
						
					 
					
						2017-06-30 16:31:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							f993463856 
							
						 
					 
					
						
						
							
							Implemented service bus for marketing.api locations.api graceperiodProcess payment.api  
						
						 
						
						
						
						
					 
					
						2017-06-30 08:59:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eduard Tomas 
							
						 
					 
					
						
						
						
						
							
						
						
							96c3f5c2bc 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/feature/data-and-ui-customization-v2' into dev  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	docker-compose.override.yml
#	src/Web/WebMVC/WebMVC.csproj
#	src/Web/WebMVC/wwwroot/css/shared/components/identity/identity.css
#	src/Web/WebMVC/wwwroot/css/site.min.css
#	src/Web/WebSPA/AppSettings.cs 
						
						
					 
					
						2017-06-28 12:20:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Shaun Walker 
							
						 
					 
					
						
						
						
						
							
						
						
							632c023a3f 
							
						 
					 
					
						
						
							
							strip quotes, fix image transparency, format price and amount  
						
						 
						
						
						
						
					 
					
						2017-06-22 17:26:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Shaun Walker 
							
						 
					 
					
						
						
						
						
							
						
						
							445101b376 
							
						 
					 
					
						
						
							
							data and UI customization enhancements  
						
						 
						
						
						
						
					 
					
						2017-06-20 12:54:32 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Arenas 
							
						 
					 
					
						
						
						
						
							
						
						
							db4403b75c 
							
						 
					 
					
						
						
							
							Add Pagination to Campaign View  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 86e40512352a44021ea69ed948062d0b510141cf) 
						
						
					 
					
						2017-06-16 16:51:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Arenas 
							
						 
					 
					
						
						
						
						
							
						
						
							e80c5efdd3 
							
						 
					 
					
						
						
							
							Add details view and add marketing scope in mvc project and identity config  
						
						 
						
						
						
						
					 
					
						2017-06-16 01:20:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Arenas 
							
						 
					 
					
						
						
						
						
							
						
						
							6a315764a8 
							
						 
					 
					
						
						
							
							Create view for index campaing and his controller method  
						
						 
						
						
						
						
					 
					
						2017-06-15 19:23:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Arenas 
							
						 
					 
					
						
						
						
						
							
						
						
							a894e22b74 
							
						 
					 
					
						
						
							
							Add Campaigns.components style  
						
						 
						
						
						
						
					 
					
						2017-06-15 19:22:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Arenas 
							
						 
					 
					
						
						
						
						
							
						
						
							6b9a519332 
							
						 
					 
					
						
						
							
							Add Campaigns items in header list  
						
						 
						
						
						
						
					 
					
						2017-06-15 02:22:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Arenas 
							
						 
					 
					
						
						
						
						
							
						
						
							fdc15fb4f9 
							
						 
					 
					
						
						
							
							Add index campaign view  
						
						 
						
						
						
						
					 
					
						2017-06-15 02:21:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							a9c185a41a 
							
						 
					 
					
						
						
							
							Updated number of products in catalog stock  
						
						 
						
						... 
						
						
						
						Orders list ordered
Refresh orders list periodically
Fix bug SPA basket not dropped after creating order 
						
						
					 
					
						2017-06-14 16:38:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							2a7c1d740b 
							
						 
					 
					
						
						
							
							Minor refactoring  
						
						 
						
						
						
						
					 
					
						2017-05-20 12:35:16 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Arenas 
							
						 
					 
					
						
						
						
						
							
						
						
							e842cd81b3 
							
						 
					 
					
						
						
							
							Changing status item condition in order view  
						
						 
						
						
						
						
					 
					
						2017-05-18 11:37:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							f79806e899 
							
						 
					 
					
						
						
							
							Created Ship order process in WebMVC app  
						
						 
						
						... 
						
						
						
						Create Ship order command and handler in Ordering.api
Create Order management page in WebMVC app 
						
						
					 
					
						2017-05-14 14:48:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Arenas 
							
						 
					 
					
						
						
						
						
							
						
						
							01211322f7 
							
						 
					 
					
						
						
							
							Merge branch 'order-processflow-redesign' of  https://github.com/dotnet-architecture/eShopOnContainers  into order-processflow-redesign  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/UserCheckoutAcceptedIntegrationEventHandler.cs 
						
						
					 
					
						2017-05-11 16:08:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Arenas 
							
						 
					 
					
						
						
						
						
							
						
						
							9ae4d93a54 
							
						 
					 
					
						
						
							
							Add Order Description field  
						
						 
						
						
						
						
					 
					
						2017-05-11 16:04:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							21fe9b7be4 
							
						 
					 
					
						
						
							
							Create checkout call in webmvc  
						
						 
						
						... 
						
						
						
						Created Cancel call in webmvc 
						
						
					 
					
						2017-05-11 11:51:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							dbbcc95c5e 
							
						 
					 
					
						
						
							
							Removing -all rights reserved- as this is Open Source.  
						
						 
						
						
						
						
					 
					
						2017-05-08 08:50:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							345e275a0e 
							
						 
					 
					
						
						
							
							Minor change in label  
						
						 
						
						
						
						
					 
					
						2017-04-08 12:05:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							313976da80 
							
						 
					 
					
						
						
							
							Fixed bugs related to the Product Update and PriceChangedIntegrationEvent. It was updating only when the price was changing... additional refactoring performed, too.  
						
						 
						
						
						
						
					 
					
						2017-03-25 14:47:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							cb3f682872 
							
						 
					 
					
						
						
							
							Created Retry and CircuitBreaker policies for MVC App  
						
						 
						
						
						
						
					 
					
						2017-03-17 10:00:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DESKTOP-V1VLQ15\dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							0c4f8a49dd 
							
						 
					 
					
						
						
							
							WebMVC and WebSPA show now a changed price in the basket list  
						
						 
						
						
						
						
					 
					
						2017-03-15 14:57:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							4e5e32c6aa 
							
						 
					 
					
						
						
							
							Add old price property for the basket in the WebMVC  
						
						 
						
						
						
						
					 
					
						2017-03-13 12:15:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								etomas 
							
						 
					 
					
						
						
						
						
							
						
						
							29473b455f 
							
						 
					 
					
						
						
							
							Merge branch 'vs2017'  
						
						 
						
						
						
						
					 
					
						2017-03-03 19:40:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							7be05293f9 
							
						 
					 
					
						
						
							
							Refactor in pagination view to use tag helpers  
						
						 
						
						
						
						
					 
					
						2017-03-03 16:17:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							a1f2cc9975 
							
						 
					 
					
						
						
							
							Fix for issue  #67   https://github.com/dotnet/eShopOnContainers/issues/67  renamed Models folder to ViewModels in WebMVC  
						
						 
						
						
						
						
					 
					
						2017-03-03 16:00:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								etomas 
							
						 
					 
					
						
						
						
						
							
						
						
							f9b15481d1 
							
						 
					 
					
						
						
							
							Idempotent updates based on requestid  
						
						 
						
						
						
						
					 
					
						2017-03-03 12:03:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Charles Lowell 
							
						 
					 
					
						
						
						
						
							
						
						
							75d5c3695a 
							
						 
					 
					
						
						
							
							Fix Identity.API and WebMVC publishing  
						
						 
						
						... 
						
						
						
						- upgrade BundlerMinifier.Core dependencies (fixes a globbing bug)
- ensure minification includes all css
- only copy what's needed in production to the publish directory 
						
						
					 
					
						2017-02-28 15:01:52 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Charles Lowell 
							
						 
					 
					
						
						
						
						
							
						
						
							7755f30618 
							
						 
					 
					
						
						
							
							Use relative paths & URLs  
						
						 
						
						
						
						
					 
					
						2017-02-28 14:54:22 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								etomas 
							
						 
					 
					
						
						
						
						
							
						
						
							289d15b79a 
							
						 
					 
					
						
						
							
							Removed unwanted style for solving  #31  
						
						 
						
						
						
						
					 
					
						2017-02-10 16:08:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								PLAINCONCEPTS\ccanizares 
							
						 
					 
					
						
						
						
						
							
						
						
							1c1f7571e6 
							
						 
					 
					
						
						
							
							- Some minor refactoring (renaming) and make work web clients applications that were 'broken' after refactoring dtos in ordering service in this branch.  
						
						 
						
						... 
						
						
						
						- Update dockerfile to asp.net 1.1 in ordering 
						
						
					 
					
						2017-01-30 15:46:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								PLAINCONCEPTS\ccanizares 
							
						 
					 
					
						
						
						
						
							
						
						
							cdffaf1ce1 
							
						 
					 
					
						
						
							
							MVC: Add To Cart bug.  
						
						 
						
						... 
						
						
						
						SPA: Add To Cart 'bug', Update Basket. 
						
						
					 
					
						2017-01-11 12:23:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quique Fernandez 
							
						 
					 
					
						
						
						
						
							
						
						
							a29e9d6357 
							
						 
					 
					
						
						
							
							Fix form styles and placeholders on both websites  
						
						 
						
						
						
						
					 
					
						2016-12-30 16:44:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quique Fernandez 
							
						 
					 
					
						
						
						
						
							
						
						
							de5c81b9d7 
							
						 
					 
					
						
						
							
							Fix uppercase text on some views on both websites  
						
						 
						
						
						
						
					 
					
						2016-12-30 12:07:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quique Fernandez 
							
						 
					 
					
						
						
						
						
							
						
						
							0337d91732 
							
						 
					 
					
						
						
							
							Fix "Total box" alignment on both websites  
						
						 
						
						
						
						
					 
					
						2016-12-30 11:33:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quique Fernandez 
							
						 
					 
					
						
						
						
						
							
						
						
							827d6ff0f5 
							
						 
					 
					
						
						
							
							update new orders layout on MVC  
						
						 
						
						
						
						
					 
					
						2016-12-30 11:28:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quique Fernandez 
							
						 
					 
					
						
						
						
						
							
						
						
							1b3194d97d 
							
						 
					 
					
						
						
							
							Update orders layout on mvc  
						
						 
						
						
						
						
					 
					
						2016-12-29 17:42:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quique Fernandez 
							
						 
					 
					
						
						
						
						
							
						
						
							8496748453 
							
						 
					 
					
						
						
							
							change header to partial  
						
						 
						
						
						
						
					 
					
						2016-12-29 17:27:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quique Fernandez 
							
						 
					 
					
						
						
						
						
							
						
						
							35ef9740db 
							
						 
					 
					
						
						
							
							Update some MVC componentes  
						
						 
						
						
						
						
					 
					
						2016-12-29 17:16:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Carlos Cañizares Estévez 
							
						 
					 
					
						
						
						
						
							
						
						
							0e7e4e41d7 
							
						 
					 
					
						
						
							
							MVC: Solve feedback, improve validations  
						
						 
						
						... 
						
						
						
						Identity: Solve Microsoft Edge problem
Ordering: Remove application tier 
						
						
					 
					
						2016-12-20 12:22:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Carlos Cañizares Estévez 
							
						 
					 
					
						
						
						
						
							
						
						
							31753fc057 
							
						 
					 
					
						
						
							
							MVC: Finish Orders integration (detail), validations, some refactor ...  
						
						 
						
						... 
						
						
						
						Orders: Detail Query, new field in OrderDetail..
Identity: Validations in Register View, ensure all claims are returned in user end point.. 
						
						
					 
					
						2016-12-17 14:41:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Carlos Cañizares Estévez 
							
						 
					 
					
						
						
						
						
							
						
						
							42f3537441 
							
						 
					 
					
						
						
							
							scripts to build individual services, readme files for all services and clients, compose in all projects, fix build problems (Dependent seeds), solve some kwnon build problems in solution (identity on localhost, ...)  
						
						 
						
						
						
						
					 
					
						2016-12-07 13:57:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Carlos Cañizares Estévez 
							
						 
					 
					
						
						
						
						
							
						
						
							0a344f6cdc 
							
						 
					 
					
						
						
							
							Improvements in identity, securice basket api, login-logout from mvc application and consume securiced basket.  
						
						 
						
						
						
						
					 
					
						2016-11-29 15:10:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Carlos Cañizares Estévez 
							
						 
					 
					
						
						
						
						
							
						
						
							a939fe7a51 
							
						 
					 
					
						
						
							
							MVC App: Authentication against IdentityService and Order Api basic integration.  
						
						 
						
						
						
						
					 
					
						2016-11-28 12:58:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Carlos Cañizares Estévez 
							
						 
					 
					
						
						
						
						
							
						
						
							6cff3aaf50 
							
						 
					 
					
						
						
							
							Basket microservice integration in MVC web, remove session from MVC Site, docker-compose to include Basket.api and Redis image.  
						
						 
						
						
						
						
					 
					
						2016-11-16 10:19:00 +01:00