eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							152fcc8205 
							
						 
					 
					
						
						
							
							Fixed errors and updated config  
						
						
						
						
					 
					
						2018-02-27 17:29:37 +01:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							8cfb74fe93 
							
						 
					 
					
						
						
							
							Fixing SPA for using aggregators  
						
						
						
						
					 
					
						2018-02-27 13:10:39 +01:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomàs 
							
						 
					 
					
						
						
						
						
							
						
						
							6cc87fc80a 
							
						 
					 
					
						
						
							
							renaming of PurchaseBff to Aggregator  
						
						
						
						
					 
					
						2018-02-15 17:30:39 +01:00 
						 
				 
			
				
					
						
							
							
								Cesar De la Torre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c5038ad77e 
							
						 
					 
					
						
						
							
							Merge pull request  #487  from yantang-msft/FixDeployment  
						
						... 
						
						
						
						Update AI k8s package version, otherwise kubernetes deployment will fail 
						
						
					 
					
						2018-02-09 13:12:11 -08:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomàs 
							
						 
					 
					
						
						
						
						
							
						
						
							0be655d2e0 
							
						 
					 
					
						
						
							
							Fixing errors in SPA when calling basket api through apigw  
						
						
						
						
					 
					
						2018-02-07 14:15:17 +01:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomàs 
							
						 
					 
					
						
						
						
						
							
						
						
							8edd736196 
							
						 
					 
					
						
						
							
							Updating SPA for working with PurchaseBFF.  
						
						
						
						
					 
					
						2018-02-06 18:35:01 +01:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomàs 
							
						 
					 
					
						
						
						
						
							
						
						
							b0d4ae5a72 
							
						 
					 
					
						
						
							
							All order flow goes through Purchase BFF API. Also some refactorings.  
						
						
						
						
					 
					
						2018-02-02 12:26:47 +01:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomàs 
							
						 
					 
					
						
						
						
						
							
						
						
							2a81a080ba 
							
						 
					 
					
						
						
							
							Moved Create Order from MVC logic client to Purchase logic.  
						
						
						
						
					 
					
						2018-02-01 15:04:20 +01:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomàs 
							
						 
					 
					
						
						
						
						
							
						
						
							1c6431d503 
							
						 
					 
					
						
						
							
							Moved "AddItemToBasket" from MVC Client to a single call in PurchaseBFF  
						
						
						
						
					 
					
						2018-01-31 16:35:40 +01:00 
						 
				 
			
				
					
						
							
							
								yantang 
							
						 
					 
					
						
						
						
						
							
						
						
							23bdd59b10 
							
						 
					 
					
						
						
							
							Update AI k8s package version, otherwise kubernetes deployment will fail because of deadlock.  
						
						
						
						
					 
					
						2018-01-28 23:33:44 -08:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomàs 
							
						 
					 
					
						
						
						
						
							
						
						
							9371eb1077 
							
						 
					 
					
						
						
							
							Add a endpoint returning only a 200 to be used  as a liveness probe for k8s  
						
						
						
						
					 
					
						2018-01-22 11:46:18 +01:00 
						 
				 
			
				
					
						
							
							
								Cesar De la Torre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ded64feae2 
							
						 
					 
					
						
						
							
							Merge pull request  #452  from SychevIgor/k8appinsbeta2  
						
						... 
						
						
						
						Upgrades to "Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta2" 
						
						
					 
					
						2018-01-16 12:41:29 -08:00 
						 
				 
			
				
					
						
							
							
								yanchenw 
							
						 
					 
					
						
						
						
						
							
						
						
							56a60e3d2f 
							
						 
					 
					
						
						
							
							Try to fix windows container build error  
						
						
						
						
					 
					
						2018-01-05 14:15:20 -08:00 
						 
				 
			
				
					
						
							
							
								yanchenw 
							
						 
					 
					
						
						
						
						
							
						
						
							607a30491e 
							
						 
					 
					
						
						
							
							Optimize multistage build  
						
						
						
						
					 
					
						2018-01-04 15:00:05 -08:00 
						 
				 
			
				
					
						
							
							
								yanchenw 
							
						 
					 
					
						
						
						
						
							
						
						
							e4fa15b813 
							
						 
					 
					
						
						
							
							Optimize multi-stage build Dockerfile  
						
						... 
						
						
						
						Remove explicitly copied dependencies, copy entire solution
into the conainter and depends on the cache to reduce build
time.
Addd temporary solution file which does not contains the
dcproj file to work around the issue that the dotnet cli
cannot handle dcproj. 
						
						
					 
					
						2018-01-04 11:01:45 -08:00 
						 
				 
			
				
					
						
							
							
								Sychev Igor 
							
						 
					 
					
						
						
						
						
							
						
						
							470e626802 
							
						 
					 
					
						
						
							
							"Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta2"  
						
						
						
						
					 
					
						2018-01-04 10:11:32 +03:00 
						 
				 
			
				
					
						
							
							
								Sychev Igor 
							
						 
					 
					
						
						
						
						
							
						
						
							77e5f9ba5a 
							
						 
					 
					
						
						
							
							images to support 2.0.3 packages with security fixes  
						
						
						
						
					 
					
						2017-12-14 09:16:34 +03:00 
						 
				 
			
				
					
						
							
							
								Sychev Igor 
							
						 
					 
					
						
						
						
						
							
						
						
							924c735072 
							
						 
					 
					
						
						
							
							microsoft packages to latest. including Logging from .net standard 1.3 to 2.0 upgrade  
						
						
						
						
					 
					
						2017-12-14 09:16:34 +03:00 
						 
				 
			
				
					
						
							
							
								RamonTC 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3e8df7fb95 
							
						 
					 
					
						
						
							
							Merge pull request  #433  from SychevIgor/SF201beta  
						
						... 
						
						
						
						Microsoft.ApplicationInsights.ServiceFabric to 2.0.1-beta1 
						
						
					 
					
						2017-12-12 18:33:14 +01:00 
						 
				 
			
				
					
						
							
							
								dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							2e955c7f13 
							
						 
					 
					
						
						
							
							Fix multistaging build  
						
						
						
						
					 
					
						2017-12-12 17:35:07 +01:00 
						 
				 
			
				
					
						
							
							
								Sychev Igor 
							
						 
					 
					
						
						
						
						
							
						
						
							595e6e49a3 
							
						 
					 
					
						
						
							
							Microsoft.ApplicationInsights.ServiceFabric to 2.0.1-beta1  
						
						
						
						
					 
					
						2017-12-12 10:13:34 +03:00 
						 
				 
			
				
					
						
							
							
								dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							9d7622a59a 
							
						 
					 
					
						
						
							
							Merge branch 'dev' into features/docker-multi-arch  
						
						
						
						
					 
					
						2017-12-11 15:12:26 +01:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							4dff728d11 
							
						 
					 
					
						
						
							
							Replaced custom DataProtection.Redis lib with official Microsoft pkg  
						
						... 
						
						
						
						Removed Sessions in WebMVC app
Fixed GracePeriodMgr issues using multiple instances 
						
						
					 
					
						2017-11-30 11:40:30 +01:00 
						 
				 
			
				
					
						
							
							
								yanchenw 
							
						 
					 
					
						
						
						
						
							
						
						
							091ed81e7b 
							
						 
					 
					
						
						
							
							Converts to use multi-stage build Dockerfile  
						
						... 
						
						
						
						1. Changes the build context of all services to the root level to be
able to access the dependencies for each project.
2. Commented out the prepublish scripts, these steps are moved into the
Dockerfile
Did not change any script yet, need help to identify what scripts we
need to change. 
						
						
					 
					
						2017-11-27 13:48:31 -08:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							c51c101f90 
							
						 
					 
					
						
						
							
							Updated Load Tests  
						
						... 
						
						
						
						Added middleware to bypass authorization in load testing 
						
						
					 
					
						2017-10-23 17:39:45 +02:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							42ce196270 
							
						 
					 
					
						
						
							
							Updated SF Linux manifests  
						
						
						
						
					 
					
						2017-10-16 16:10:40 +02:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							dc98e6a4c6 
							
						 
					 
					
						
						
							
							Added Appinsights Linux SF telemetry initializer  
						
						
						
						
					 
					
						2017-10-13 11:35:26 +02:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							c3e15969b9 
							
						 
					 
					
						
						
							
							Added Appinsights K8s telemetry initializer  
						
						
						
						
					 
					
						2017-10-11 18:53:26 +02:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							a04cef97ef 
							
						 
					 
					
						
						
							
							Added AppInsights service  
						
						
						
						
					 
					
						2017-10-11 16:26:44 +02:00 
						 
				 
			
				
					
						
							
							
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							6d8a33bbb9 
							
						 
					 
					
						
						
							
							Set NO-CACHE for HealthCheck to Basket microservice, and MVC and SPA apps so it is faster for demoing HealthChecks.  
						
						
						
						
					 
					
						2017-09-25 14:45:53 -04:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomàs 
							
						 
					 
					
						
						
						
						
							
						
						
							7321d5e5fc 
							
						 
					 
					
						
						
							
							Base path fix and k8s config updated  
						
						
						
						
					 
					
						2017-09-07 19:18:53 +02:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomàs 
							
						 
					 
					
						
						
						
						
							
						
						
							8198126daf 
							
						 
					 
					
						
						
							
							Use dotnet multi-architecture images.  
						
						... 
						
						
						
						Removing docker-compose.windows.override (not needed as is identical to docker-compose.override) 
						
						
					 
					
						2017-09-04 19:07:53 +02:00 
						 
				 
			
				
					
						
							
							
								RamonTC 
							
						 
					 
					
						
						
						
						
							
						
						
							4ea8f6814e 
							
						 
					 
					
						
						
							
							Merge pull request  #299  from SychevIgor/SychevIgor/WindowsDockerFiles20  
						
						... 
						
						
						
						windows docker files update to 2.0 base images 
						
						
					 
					
						2017-08-30 17:55:26 +02:00 
						 
				 
			
				
					
						
							
							
								Igor Sychev 
							
						 
					 
					
						
						
						
						
							
						
						
							dc566ea2a1 
							
						 
					 
					
						
						
							
							nanowin  
						
						
						
						
					 
					
						2017-08-30 08:48:06 +03:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							9ed7325e0e 
							
						 
					 
					
						
						
							
							Downgrade Identity.api version due to compatibility issues  
						
						... 
						
						
						
						Updated Test project version
Fix issue Idsrv token 
						
						
					 
					
						2017-08-29 18:11:30 +02:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							e20223b6e2 
							
						 
					 
					
						
						
							
							Included Aspnetcore.all metapackage  
						
						
						
						
					 
					
						2017-08-29 12:14:10 +02:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							364c07a528 
							
						 
					 
					
						
						
							
							Included AspnetCore.all metapackage  
						
						
						
						
					 
					
						2017-08-29 12:03:20 +02:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							b44b347ea9 
							
						 
					 
					
						
						
							
							Merge branch 'dev' into netcore2  
						
						
						
						
					 
					
						2017-08-23 16:43:02 +02:00 
						 
				 
			
				
					
						
							
							
								PLAINCONCEPTS\lruiz 
							
						 
					 
					
						
						
						
						
							
						
						
							8d14869ca0 
							
						 
					 
					
						
						
							
							Fix bug  #259  
						
						
						
						
					 
					
						2017-08-23 11:06:50 +02:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							8288acf3a4 
							
						 
					 
					
						
						
							
							Update projects from netcore 2.0.0 preview to 2.0.0  
						
						... 
						
						
						
						Fix netcore 2.0.0 breaking changes in authentication middleware 
						
						
					 
					
						2017-08-22 22:36:23 +02:00 
						 
				 
			
				
					
						
							
							
								PLAINCONCEPTS\lruiz 
							
						 
					 
					
						
						
						
						
							
						
						
							a6acdabf85 
							
						 
					 
					
						
						
							
							Fix bug  #283  
						
						
						
						
					 
					
						2017-08-22 20:03:48 +02:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							2baedadc7a 
							
						 
					 
					
						
						
							
							Merge from Dev  
						
						
						
						
					 
					
						2017-08-22 19:46:53 +02:00 
						 
				 
			
				
					
						
							
							
								PLAINCONCEPTS\lruiz 
							
						 
					 
					
						
						
						
						
							
						
						
							737bddadc2 
							
						 
					 
					
						
						
							
							Fix issue  #259  
						
						
						
						
					 
					
						2017-08-22 18:03:12 +02:00 
						 
				 
			
				
					
						
							
							
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							dca1b5eedd 
							
						 
					 
					
						
						
							
							Updated UserSecrets() obsolete API to AddUserSecrets<Startup>() update heading NET Core 2.0. See:  https://github.com/aspnet/Announcements/issues/223  
						
						
						
						
					 
					
						2017-08-16 13:47:07 -07:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomàs 
							
						 
					 
					
						
						
						
						
							
						
						
							31d71d0f1f 
							
						 
					 
					
						
						
							
							update angular-cli  
						
						
						
						
					 
					
						2017-08-10 12:11:21 +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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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