Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							0c6bb89d26 
							
						 
					 
					
						
						
							
							Merge branch 'dev'  
						
						
						
						
							
						
					 
					
						2017-07-19 14:00:48 +02:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							292f93ab24 
							
						 
					 
					
						
						
							
							Added geolocator plugin to TestRunner.Droid proj  
						
						
						
						
							
						
					 
					
						2017-07-19 13:49:27 +02:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomas 
							
						 
					 
					
						
						
						
						
							
						
						
							7b4d995448 
							
						 
					 
					
						
						
							
							Invalid reference  
						
						
						
						
							
						
					 
					
						2017-07-18 19:09:24 +02:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomas 
							
						 
					 
					
						
						
						
						
							
						
						
							e516403804 
							
						 
					 
					
						
						
							
							k8s errors fixed  
						
						
						
						
							
						
					 
					
						2017-07-18 18:24:57 +02:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomas 
							
						 
					 
					
						
						
						
						
							
						
						
							27f6e2c5f9 
							
						 
					 
					
						
						
							
							Merge branch 'dev' of  https://github.com/dotnet-architecture/eShopOnContainers  into dev  
						
						
						
						
							
						
					 
					
						2017-07-14 15:12:38 +02:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomas 
							
						 
					 
					
						
						
						
						
							
						
						
							0448742e40 
							
						 
					 
					
						
						
							
							Updates to k8s  
						
						
						
						
							
						
					 
					
						2017-07-14 15:12:30 +02:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							3c39ec5092 
							
						 
					 
					
						
						
							
							Merge branch 'dev' of  https://github.com/dotnet-architecture/eShopOnContainers  into dev  
						
						
						
						
							
						
					 
					
						2017-07-14 14:53:35 +02:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							d42033a83b 
							
						 
					 
					
						
						
							
							Added UI alert and circuit-breaker handlers for components that depend on Basket.api  
						
						
						
						
							
						
					 
					
						2017-07-14 14:53:17 +02:00 
						 
				 
			
				
					
						
							
							
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							c7c176c4c1 
							
						 
					 
					
						
						
							
							Changed HealthCheck Cache duration time (Zero == No Cache) configuration for the Basket microservice. This is better for demos and can be changed at any time.  
						
						
						
						
							
						
					 
					
						2017-07-13 14:48:55 -07:00 
						 
				 
			
				
					
						
							
							
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							73be25e6cf 
							
						 
					 
					
						
						
							
							Minor re-order of services in docker-compose files  
						
						
						
						
							
						
					 
					
						2017-07-13 14:18:10 -07:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							f39fdb92ca 
							
						 
					 
					
						
						
							
							Fix Failing middleware and move it to Basket.api  
						
						
						
						
							
						
					 
					
						2017-07-13 17:35:19 +02:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomas 
							
						 
					 
					
						
						
						
						
							
						
						
							eeda5bcb9d 
							
						 
					 
					
						
						
							
							Order.Address is a value object. It has no table and no ID  
						
						
						
						
							
						
					 
					
						2017-07-13 13:42:29 +02:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomas 
							
						 
					 
					
						
						
						
						
							
						
						
							2f1f1cd616 
							
						 
					 
					
						
						
							
							Address as EF Value object  
						
						
						
						
							
						
					 
					
						2017-07-13 12:34:19 +02:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomas 
							
						 
					 
					
						
						
						
						
							
						
						
							2e64a97b4c 
							
						 
					 
					
						
						
							
							Changes for retrieving all claims under netcore2  
						
						
						
						
							
						
					 
					
						2017-07-12 17:28:04 +02:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							6ed93f0182 
							
						 
					 
					
						
						
							
							Merge from Dev  
						
						
						
						
							
						
					 
					
						2017-07-12 13:07:13 +02:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							bf34bff8dd 
							
						 
					 
					
						
						
							
							Merge branch 'dev' of  https://github.com/dotnet-architecture/eShopOnContainers  into dev  
						
						
						
						
							
						
					 
					
						2017-07-12 12:43:29 +02:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							485505a7be 
							
						 
					 
					
						
						
							
							Adapt changed Basket.Api url to Mvc and SPA apps  
						
						
						
						
							
						
					 
					
						2017-07-12 12:43:15 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Arenas 
							
						 
					 
					
						
						
						
						
							
						
						
							4e9524c9b0 
							
						 
					 
					
						
						
							
							Add new basket api url to test  
						
						
						
						
							
						
					 
					
						2017-07-12 12:41:50 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Arenas 
							
						 
					 
					
						
						
						
						
							
						
						
							a757a42217 
							
						 
					 
					
						
						
							
							Add new ApiUrlBase to BasketService in Xamarin App  
						
						
						
						
							
						
					 
					
						2017-07-12 12:30:38 +02:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							7bb14783b1 
							
						 
					 
					
						
						
							
							Merge branch 'dev' of  https://github.com/dotnet-architecture/eShopOnContainers  into dev  
						
						
						
						
							
						
					 
					
						2017-07-12 12:10:25 +02:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							d289ec00cf 
							
						 
					 
					
						
						
							
							Add swagger authorization option in APIs  
						
						
						
						
							
						
					 
					
						2017-07-12 12:10:10 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Arenas 
							
						 
					 
					
						
						
						
						
							
						
						
							010f805a90 
							
						 
					 
					
						
						
							
							fix xamarin location values when saving the settings with double type  
						
						
						
						
							
						
					 
					
						2017-07-12 11:34:07 +02:00 
						 
				 
			
				
					
						
							
							
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							64782e1d1a 
							
						 
					 
					
						
						
							
							Architecture diagram updated to new version  
						
						
						
						
							
						
					 
					
						2017-07-11 12:11:14 -07:00 
						 
				 
			
				
					
						
							
							
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							8159faccde 
							
						 
					 
					
						
						
							
							Update README.md  
						
						
						
						
							
						
					 
					
						2017-07-11 12:05:26 -07:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							38ade40862 
							
						 
					 
					
						
						
							
							Merge branch 'dev' of  https://github.com/dotnet-architecture/eShopOnContainers  into dev  
						
						
						
						
							
						
					 
					
						2017-07-11 13:48:49 +02:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							84a2d500a7 
							
						 
					 
					
						
						
							
							Added alert when error ocurrs listing catalog products, orders and campaigns in SPA app  
						
						
						
						
							
						
					 
					
						2017-07-11 13:48:07 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Arenas 
							
						 
					 
					
						
						
						
						
							
						
						
							0546040ebc 
							
						 
					 
					
						
						
							
							Modify the mvc client id to mvctest client  
						
						
						
						
							
						
					 
					
						2017-07-11 12:43:29 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Arenas 
							
						 
					 
					
						
						
						
						
							
						
						
							f0f88aee98 
							
						 
					 
					
						
						
							
							Add PicBaseUrl with a replaced parameter  
						
						
						
						
							
						
					 
					
						2017-07-11 12:43:06 +02:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomas 
							
						 
					 
					
						
						
						
						
							
						
						
							d9b9578e48 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into netcore2  
						
						... 
						
						
						
						# Conflicts:
#	docker-compose.dcproj
#	docker-compose.vs.debug.yml
#	docker-compose.vs.release.yml
#	src/BuildingBlocks/EventBus/EventBus/EventBus.csproj
#	src/Services/Marketing/Marketing.API/Startup.cs
#	src/Web/WebMVC/Startup.cs
#	src/Web/WebMVC/WebMVC.csproj 
						
						
							
						
					 
					
						2017-07-11 12:01:45 +02:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							dba16fd1d1 
							
						 
					 
					
						
						
							
							Fixed eShopOnContainers.sln does not build  #237  
						
						... 
						
						
						
						Include Marketing and Locations api in eShopOnContainers sln 
						
						
							
						
					 
					
						2017-07-11 11:04:27 +02:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomas 
							
						 
					 
					
						
						
						
						
							
						
						
							62a14e1006 
							
						 
					 
					
						
						
							
							Upgrade IntegrationEventLogEF to netcore2  
						
						
						
						
							
 
						
					 
					
						2017-07-11 10:12:32 +02:00 
						 
				 
			
				
					
						
							
							
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							96c55b8682 
							
						 
					 
					
						
						
							
							Minor change in docker-compose.prod  
						
						
						
						
							
						
					 
					
						2017-07-10 15:02:22 -07:00 
						 
				 
			
				
					
						
							
							
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							27fae7c5d3 
							
						 
					 
					
						
						
							
							Fixed namespace copied/pasted from the Locations.API service into the Marketing service  
						
						
						
						
							
						
					 
					
						2017-07-10 14:49:26 -07:00 
						 
				 
			
				
					
						
							
							
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							260b2cdf2c 
							
						 
					 
					
						
						
							
							Added a comment about the simulated payment  
						
						
						
						
							
						
					 
					
						2017-07-10 14:17:16 -07:00 
						 
				 
			
				
					
						
							
							
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							ec78ef12c5 
							
						 
					 
					
						
						
							
							Separating menu options so it is clearer in the UI  
						
						
						
						
							
						
					 
					
						2017-07-10 14:11:43 -07:00 
						 
				 
			
				
					
						
							
							
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							6b18c36f26 
							
						 
					 
					
						
						
							
							Eliminated the GracePeriod Logger message when querying as it is not needed and is quite anoying.  
						
						
						
						
							
						
					 
					
						2017-07-10 13:37:55 -07:00 
						 
				 
			
				
					
						
							
							
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							740caee4ae 
							
						 
					 
					
						
						
							
							Minor changes to the GracePeriodManager: Moved to the Ordering folder as it is part of the same BOUNDED CONTEXT or Ordering BUSINESS MICROSERVICE. Also, changed a log description when querying the database  
						
						
						
						
							
						
					 
					
						2017-07-10 13:32:22 -07:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							cee8d6e9e5 
							
						 
					 
					
						
						
							
							Added documentation for deploying Marketing Azure functions  
						
						
						
						
							
						
					 
					
						2017-07-10 16:44:24 +02:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							59c9b21420 
							
						 
					 
					
						
						
							
							Merge branch 'dev' of  https://github.com/dotnet-architecture/eShopOnContainers  into dev  
						
						
						
						
							
						
					 
					
						2017-07-10 16:04:18 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Arenas 
							
						 
					 
					
						
						
						
						
							
						
						
							03f23eafa4 
							
						 
					 
					
						
						
							
							Merge branch 'load-testing' into dev  
						
						... 
						
						
						
						# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
#	src/Services/Identity/Identity.API/Configuration/Config.cs
#	src/Web/WebMVC/appsettings.json 
						
						
							
						
					 
					
						2017-07-10 14:40:26 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Arenas 
							
						 
					 
					
						
						
						
						
							
						
						
							540f7510b9 
							
						 
					 
					
						
						
							
							Create a mvctest client, check when is the environment variable UseLoadTest in MVC project to true  
						
						
						
						
							
						
					 
					
						2017-07-10 14:25:03 +02:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							e1d8a8e23e 
							
						 
					 
					
						
						
							
							Fix UI styles MVCApp  
						
						
						
						
							
						
					 
					
						2017-07-10 14:24:01 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Arenas 
							
						 
					 
					
						
						
						
						
							
						
						
							c367b01791 
							
						 
					 
					
						
						
							
							Merge branch 'dev' of  https://github.com/dotnet-architecture/eShopOnContainers  into dev  
						
						
						
						
							
						
					 
					
						2017-07-10 12:10:20 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Arenas 
							
						 
					 
					
						
						
						
						
							
						
						
							d440198180 
							
						 
					 
					
						
						
							
							Add release/debug docker-compose file to project  
						
						
						
						
							
						
					 
					
						2017-07-10 12:10:13 +02:00 
						 
				 
			
				
					
						
							
							
								dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							ecf9933908 
							
						 
					 
					
						
						
							
							Add readme.md for the .env variables  
						
						
						
						
							
						
					 
					
						2017-07-10 10:57:22 +02:00 
						 
				 
			
				
					
						
							
							
								Dexter Valkyrie 
							
						 
					 
					
						
						
						
						
							
						
						
							24ca050458 
							
						 
					 
					
						
						
							
							Update Startup.cs  
						
						... 
						
						
						
						The more general `builder.AddUserSecrets();` is deprecated and will not be available in ASP.NET Core 2.0. You must now qualify it with a type parameter. 
						
						
							
						
					 
					
						2017-07-08 09:53:43 +01:00 
						 
				 
			
				
					
						
							
							
								dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							a8ad3edf30 
							
						 
					 
					
						
						
							
							Add Azure Storage Account Health Checks to Marketing.API  
						
						
						
						
							
						
					 
					
						2017-07-07 14:05:52 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Arenas 
							
						 
					 
					
						
						
						
						
							
						
						
							b74a1b6db5 
							
						 
					 
					
						
						
							
							Add 100 stock units to products  
						
						
						
						
							
						
					 
					
						2017-07-07 12:36:26 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Arenas 
							
						 
					 
					
						
						
						
						
							
						
						
							4a3e2d4612 
							
						 
					 
					
						
						
							
							rename ESHOP_AZURE_STORAGE_ACCOUNT_NAME/KEY variable to ESHOP_AZURE_STORAGE_CATALOG_NAME/KEY  
						
						
						
						
							
						
					 
					
						2017-07-07 12:22:48 +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