Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							b9dcc80acd
							
						
					 | 
					
						
						
							
							Merge Netcore2.2 branch
						
						
						
						
						
						
					 | 
					
						2019-01-03 18:41:58 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							dbf175f913
							
						
					 | 
					
						
						
							
							Fixed missing env variables in marketing.api in k8s scripts
						
						
						
						
						
						
						
						Added Resource path in webstatus UI when deploying with K8S
Added Liveness healthChecks
Updated k8s healthcheck configuration 
						
						
					 | 
					
						2019-01-03 17:11:56 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							fa0b1a7a6b
							
						
					 | 
					
						
						
							
							Added serilog
						
						
						
						
						
						
					 | 
					
						2018-12-13 12:13:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							ffca2da0b3
							
						
					 | 
					
						
						
							
							Migrated to netcore 2.2
						
						
						
						
						
						
					 | 
					
						2018-12-11 13:51:58 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							eda8a6e90c
							
						
					 | 
					
						
						
							
							Fixed rxjs version in package.json
						
						
						
						
						
						
					 | 
					
						2018-12-05 09:56:02 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							0f6f4e6d14
							
						
					 | 
					
						
						
							
							Integrate HealthCheck to all eShop services and apps
						
						
						
						
						
						
						
						Integrate WebStatus with Healthcheck 
						
						
					 | 
					
						2018-11-30 17:43:22 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eiximenis
							
						 
					 | 
					
						
						
						
						
							
						
						
							c68eed6ad6
							
						
					 | 
					
						
						
							
							udpated npm-watch
						
						
						
						
						
						
					 | 
					
						2018-11-28 11:10:44 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eiximenis
							
						 
					 | 
					
						
						
						
						
							
						
						
							038ea19117
							
						
					 | 
					
						
						
							
							get rid of flatmap-stream
						
						
						
						
						
						
					 | 
					
						2018-11-28 11:02:14 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RamonTC
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							06e641a97f
							
						
					 | 
					
						
						
							
							Merge pull request #851 from erikpique/feature/60697
						
						
						
						
						
						
						
						Feature/60697 
						
						
					 | 
					
						2018-11-26 17:40:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Pique
							
						 
					 | 
					
						
						
						
						
							
						
						
							deb3d38ebe
							
						
					 | 
					
						
						
							
							add features api
						
						
						
						
						
						
					 | 
					
						2018-11-14 16:21:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								erikpique
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							6aaa718af5
							
						
					 | 
					
						
						
							
							Merge branch 'dev' into feature/net22preview3
						
						
						
						
						
						
					 | 
					
						2018-11-13 10:25:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Pique
							
						 
					 | 
					
						
						
						
						
							
						
						
							574e07b09f
							
						
					 | 
					
						
						
							
							update dockerfiles
						
						
						
						
						
						
					 | 
					
						2018-11-13 10:23:00 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Pique
							
						 
					 | 
					
						
						
						
						
							
						
						
							9775219a34
							
						
					 | 
					
						
						
							
							change netcore 2.1 to 2.2 and update nugets
						
						
						
						
						
						
					 | 
					
						2018-11-12 17:27:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							ad76fa01ad
							
						
					 | 
					
						
						
							
							Fixed broken UI in SPA after migrating to Bootstrap 4
						
						
						
						
						
						
					 | 
					
						2018-09-28 14:22:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							dc767eb51c
							
						
					 | 
					
						
						
							
							Fixed issue header not included in requests
						
						
						
						
						
						
						
						Fixed issue httpclient returned response 
						
						
					 | 
					
						2018-09-28 10:14:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								IvanFarkas
							
						 
					 | 
					
						
						
						
						
							
						
						
							77061fc75b
							
						
					 | 
					
						
						
							
							Updated WebSPA to Angular 6, Bootstrap 4, HttpClient and new rxjs
						
						
						
						
						
						
					 | 
					
						2018-08-29 14:44:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								IvanFarkas
							
						 
					 | 
					
						
						
						
						
							
						
						
							f7e2255666
							
						
					 | 
					
						
						
							
							Updated WebSPA to Angular 6, Bootstrap 4, HttpClient and new rxjs
						
						
						
						
						
						
					 | 
					
						2018-08-29 13:59:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Unai Zorrilla Castro
							
						 
					 | 
					
						
						
						
						
							
						
						
							5c06f6e500
							
						
					 | 
					
						
						
							
							Fix issue 685
						
						
						
						
						
						
					 | 
					
						2018-07-31 11:30:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eiximenis
							
						 
					 | 
					
						
						
						
						
							
						
						
							fcff8e45aa
							
						
					 | 
					
						
						
							
							Fixes #630
						
						
						
						
						
						
					 | 
					
						2018-06-12 19:05:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eiximenis
							
						 
					 | 
					
						
						
						
						
							
						
						
							51236fd5af
							
						
					 | 
					
						
						
							
							Update to netcore2.1 RTM
						
						
						
						
						
						
						
						Updates to web Dockerfiles to support microsoft/dotnet:2.1-sdk 
						
						
					 | 
					
						2018-06-01 18:59:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eiximenis
							
						 
					 | 
					
						
						
						
						
							
						
						
							684aa4927f
							
						
					 | 
					
						
						
							
							Updates to make it work with Docker
						
						
						
						
						
						
						
						- Dockerfiles changes
- Minor csproj updates to bring back "dotnet bundle" cli
- Enable all protocols in SignalR
- Update package-lock.json in spa 
						
						
					 | 
					
						2018-05-16 14:45:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Unai Zorrilla Castro
							
						 
					 | 
					
						
						
						
						
							
						
						
							b02c1b825d
							
						
					 | 
					
						
						
							
							Migrate all dockerfiles to use 2.1 image. Added ApiBehaviorOptions into Catalog
						
						
						
						
						
						
					 | 
					
						2018-05-15 16:27:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Unai Zorrilla Castro
							
						 
					 | 
					
						
						
						
						
							
						
						
							d1b6bc84fa
							
						
					 | 
					
						
						
							
							Migrated projects and references to use 2.1 rc1 libraries
						
						
						
						
						
						
					 | 
					
						2018-05-15 12:42:08 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							7d2a790a8b
							
						
					 | 
					
						
						
							
							Fixed AOT compile issue with signalr pkg version
						
						
						
						
						
						
						
						Removed duplicated ordering.background task in docker compose files 
						
						
					 | 
					
						2018-05-14 13:51:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							04560ff4eb
							
						
					 | 
					
						
						
							
							Created specific service for signalr hub
						
						
						
						
						
						
					 | 
					
						2018-04-19 00:58:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							02f94eeb0e
							
						
					 | 
					
						
						
							
							Updated k8s scripts
						
						
						
						
						
						
					 | 
					
						2018-04-16 19:28:12 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							d9945a9200
							
						
					 | 
					
						
						
							
							Fixed ignored js files when building image
						
						
						
						
						
						
					 | 
					
						2018-04-14 10:43:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							08e8a4ba26
							
						
					 | 
					
						
						
							
							Added signalr client service to SPA app
						
						
						
						
						
						
					 | 
					
						2018-04-13 17:10:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							f1f17798da
							
						
					 | 
					
						
						
							
							Added missing Task.Background service docker-compose configuration
						
						
						
						
						
						
						
						Added signalr client for MVC
Added signalr hub
Added signalr events when order status changes 
						
						
					 | 
					
						2018-04-13 13:45:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Britch
							
						 
					 | 
					
						
						
						
						
							
						
						
							e519fbde43
							
						
					 | 
					
						
						
							
							Merge branch 'bff' into xamarin-settings
						
						
						
						
						
						
					 | 
					
						2018-03-29 13:52:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eiximenis
							
						 
					 | 
					
						
						
						
						
							
						
						
							0e119eac86
							
						
					 | 
					
						
						
							
							Merge branch 'xamarin-oidcclient' into bff
						
						
						
						
						
						
						
						# Conflicts:
#	.dockerignore
#	docker-compose.override.yml
#	docker-compose.yml
#	eShopOnContainers-ServicesAndWebApps.sln
#	k8s/deploy.ps1
#	k8s/deployments.yaml
#	k8s/frontend.yaml
#	src/Services/Identity/Identity.API/Data/ConfigurationDbContextSeed.cs
#	src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs 
						
						
					 | 
					
						2018-03-23 12:37:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miguel Veloso
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							b12b536439
							
						
					 | 
					
						
						
							
							Merge pull request #524 from SychevIgor/packagesupdate
						
						
						
						
						
						
						
						packages update 
						
						
					 | 
					
						2018-03-17 16:25:58 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre Llorente
							
						 
					 | 
					
						
						
						
						
							
						
						
							b78daa4685
							
						
					 | 
					
						
						
							
							Fix microsoft/aspnetcore-build:2.0.5-2.1.4 name in dockerfiles
						
						
						
						
						
						
					 | 
					
						2018-03-16 10:41:23 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre Llorente
							
						 
					 | 
					
						
						
						
						
							
						
						
							c17ecfa16a
							
						
					 | 
					
						
						
							
							Fallback to aspnetcore-build:2.0.5-2.1.4 until issue with aspnetcore-build:2.0 is solved: https://github.com/dotnet-architecture/eShopOnContainers/issues/543
						
						
						
						
						
						
					 | 
					
						2018-03-14 16:35:51 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sychev Igor
							
						 
					 | 
					
						
						
						
						
							
						
						
							039632bebd
							
						
					 | 
					
						
						
							
							docker to 2.0.5 .net core
						
						
						
						
						
						
					 | 
					
						2018-03-05 00:59:27 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sychev Igor
							
						 
					 | 
					
						
						
						
						
							
						
						
							c1db0703a7
							
						
					 | 
					
						
						
							
							packages update 2
						
						
						
						
						
						
					 | 
					
						2018-03-04 14:10:51 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sychev Igor
							
						 
					 | 
					
						
						
						
						
							
						
						
							ccad354645
							
						
					 | 
					
						
						
							
							packages update
						
						
						
						
						
						
					 | 
					
						2018-03-04 14:10:51 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eiximenis
							
						 
					 | 
					
						
						
						
						
							
						
						
							a34ed28445
							
						
					 | 
					
						
						
							
							SPA adapted to gateway
						
						
						
						
						
						
					 | 
					
						2018-02-28 15:40:22 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 |