Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							7fe643f06a
							
						
					 | 
					
						
						
							
							Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign
						
						
						
						
						
						
						
						# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
#	src/Services/Basket/Basket.API/Controllers/BasketController.cs
#	src/Services/Basket/Basket.API/Startup.cs 
						
						
					 | 
					
						2017-05-08 15:11:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							39feb0171a
							
						
					 | 
					
						
						
							
							Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign
						
						
						
						
						
						
						
						# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
#	src/Services/Basket/Basket.API/Controllers/BasketController.cs
#	src/Services/Basket/Basket.API/Startup.cs 
						
						
					 | 
					
						2017-05-08 15:11:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							af24e35b66
							
						
					 | 
					
						
						
							
							Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign
						
						
						
						
						
						
						
						# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
#	src/Services/Basket/Basket.API/Controllers/BasketController.cs
#	src/Services/Basket/Basket.API/Startup.cs 
						
						
					 | 
					
						2017-05-08 15:03:33 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							acccddb96e
							
						
					 | 
					
						
						
							
							Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign
						
						
						
						
						
						
						
						# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
#	src/Services/Basket/Basket.API/Controllers/BasketController.cs
#	src/Services/Basket/Basket.API/Startup.cs 
						
						
					 | 
					
						2017-05-08 15:03:33 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eduard Tomas
							
						 
					 | 
					
						
						
						
						
							
						
						
							ad6ed8a688
							
						
					 | 
					
						
						
							
							Added support for PUT HTTP method
						
						
						
						
						
						
					 | 
					
						2017-05-08 14:40:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eduard Tomas
							
						 
					 | 
					
						
						
						
						
							
						
						
							c0553e239a
							
						
					 | 
					
						
						
							
							Added support for PUT HTTP method
						
						
						
						
						
						
					 | 
					
						2017-05-08 14:40:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Britch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f24626bd9b
							
						
					 | 
					
						
						
							
							Merge pull request #193 from dotnet-architecture/xamarin
						
						
						
						
						
						
						
						Fixed app crash when switching from mock to real services. 
						
						
					 | 
					
						2017-05-08 13:21:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Britch
							
						 
					 | 
					
						
						
						
						
							
						
						
							1564873356
							
						
					 | 
					
						
						
							
							Merge pull request #193 from dotnet-architecture/xamarin
						
						
						
						
						
						
						
						Fixed app crash when switching from mock to real services. 
						
						
					 | 
					
						2017-05-08 13:21:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Britch
							
						 
					 | 
					
						
						
						
						
							
						
						
							9472c7061b
							
						
					 | 
					
						
						
							
							Fixed app crash when switching from mock to real services.
						
						
						
						
						
						
						
						When the previous page is the MainView, switching from mock to real
services will force re-authentication by navigating to the LoginView. 
						
						
					 | 
					
						2017-05-08 13:20:06 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Britch
							
						 
					 | 
					
						
						
						
						
							
						
						
							34d5d689cd
							
						
					 | 
					
						
						
							
							Fixed app crash when switching from mock to real services.
						
						
						
						
						
						
						
						When the previous page is the MainView, switching from mock to real
services will force re-authentication by navigating to the LoginView. 
						
						
					 | 
					
						2017-05-08 13:20:06 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							c5cca8f320
							
						
					 | 
					
						
						
							
							Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign
						
						
						
						
						
						
						
						# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln 
						
						
					 | 
					
						2017-05-08 13:59:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							8d09abbb75
							
						
					 | 
					
						
						
							
							Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign
						
						
						
						
						
						
						
						# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln 
						
						
					 | 
					
						2017-05-08 13:59:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eduard Tomas
							
						 
					 | 
					
						
						
						
						
							
						
						
							50f904f74a
							
						
					 | 
					
						
						
							
							Fixing registers missing and routes
						
						
						
						
						
						
					 | 
					
						2017-05-08 13:36:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eduard Tomas
							
						 
					 | 
					
						
						
						
						
							
						
						
							32859023f4
							
						
					 | 
					
						
						
							
							Fixing registers missing and routes
						
						
						
						
						
						
					 | 
					
						2017-05-08 13:36:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							81b8950ced
							
						
					 | 
					
						
						
							
							Updated k8s deploy script
						
						
						
						
						
						
					 | 
					
						2017-05-08 12:03:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							04b5577e99
							
						
					 | 
					
						
						
							
							Fix some errors
						
						
						
						
						
						
					 | 
					
						2017-05-08 11:32:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							f5ab8333ce
							
						
					 | 
					
						
						
							
							Fix some errors
						
						
						
						
						
						
					 | 
					
						2017-05-08 11:32:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							cde4c3a258
							
						
					 | 
					
						
						
							
							Create a SagaManager events
						
						
						
						
						
						
					 | 
					
						2017-05-08 10:48:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							6f7605776d
							
						
					 | 
					
						
						
							
							Create a SagaManager events
						
						
						
						
						
						
					 | 
					
						2017-05-08 10:48:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							4c0f0b01ad
							
						
					 | 
					
						
						
							
							Removed NMP INSTALL from docker-compose.ci.build.yml. Shouldn't need to do that every time.
						
						
						
						
						
						
					 | 
					
						2017-05-06 23:28:38 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							14cbbe6bcb
							
						
					 | 
					
						
						
							
							Removed NMP INSTALL from docker-compose.ci.build.yml. Shouldn't need to do that every time.
						
						
						
						
						
						
					 | 
					
						2017-05-06 23:28:38 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							860d699a69
							
						
					 | 
					
						
						
							
							Merge pull request #192 from dotnet-architecture/revert-191-revert-190-fix-mac-ci-build
						
						
						
						
						
						
						
						Revert "Revert "Fix mac ci build"" 
						
						
					 | 
					
						2017-05-06 22:59:59 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							bba63008d0
							
						
					 | 
					
						
						
							
							Merge pull request #192 from dotnet-architecture/revert-191-revert-190-fix-mac-ci-build
						
						
						
						
						
						
						
						Revert "Revert "Fix mac ci build"" 
						
						
					 | 
					
						2017-05-06 22:59:59 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							e0c96de685
							
						
					 | 
					
						
						
							
							Revert "Revert "Fix mac ci build""
						
						
						
						
						
						
					 | 
					
						2017-05-06 22:59:24 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							697b2dde73
							
						
					 | 
					
						
						
							
							Revert "Revert "Fix mac ci build""
						
						
						
						
						
						
					 | 
					
						2017-05-06 22:59:24 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							51fcd6b9de
							
						
					 | 
					
						
						
							
							Merge pull request #191 from dotnet-architecture/revert-190-fix-mac-ci-build
						
						
						
						
						
						
						
						Revert "Fix mac ci build" 
						
						
					 | 
					
						2017-05-06 22:04:49 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							549b6afa1d
							
						
					 | 
					
						
						
							
							Merge pull request #191 from dotnet-architecture/revert-190-fix-mac-ci-build
						
						
						
						
						
						
						
						Revert "Fix mac ci build" 
						
						
					 | 
					
						2017-05-06 22:04:49 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							2aba3acd9f
							
						
					 | 
					
						
						
							
							Revert "Fix mac ci build"
						
						
						
						
						
						
					 | 
					
						2017-05-06 22:04:22 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							98cebe9df7
							
						
					 | 
					
						
						
							
							Revert "Fix mac ci build"
						
						
						
						
						
						
					 | 
					
						2017-05-06 22:04:22 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							1c15297648
							
						
					 | 
					
						
						
							
							Merge pull request #190 from BillWagner/fix-mac-ci-build
						
						
						
						
						
						
						
						Fix mac ci build 
						
						
					 | 
					
						2017-05-06 21:42:06 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							15206ef633
							
						
					 | 
					
						
						
							
							Merge pull request #190 from BillWagner/fix-mac-ci-build
						
						
						
						
						
						
						
						Fix mac ci build 
						
						
					 | 
					
						2017-05-06 21:42:06 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							99cbbe484e
							
						
					 | 
					
						
						
							
							Minor description refactoring
						
						
						
						
						
						
					 | 
					
						2017-05-06 21:41:32 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							53777d5105
							
						
					 | 
					
						
						
							
							Minor description refactoring
						
						
						
						
						
						
					 | 
					
						2017-05-06 21:41:32 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							18c879a1a3
							
						
					 | 
					
						
						
							
							Deleted policy class not being used
						
						
						
						
						
						
					 | 
					
						2017-05-06 15:38:04 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd19973a9f
							
						
					 | 
					
						
						
							
							Deleted policy class not being used
						
						
						
						
						
						
					 | 
					
						2017-05-06 15:38:04 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							5156ec81f7
							
						
					 | 
					
						
						
							
							Minor refactoring and deleted a ResilientPolicy class not being used.
						
						
						
						
						
						
					 | 
					
						2017-05-06 15:37:31 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							940ea16948
							
						
					 | 
					
						
						
							
							Minor refactoring and deleted a ResilientPolicy class not being used.
						
						
						
						
						
						
					 | 
					
						2017-05-06 15:37:31 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bill Wagner
							
						 
					 | 
					
						
						
						
						
							
						
						
							47978017aa
							
						
					 | 
					
						
						
							
							Update the CI Build docker file to build the SPA alient bits
						
						
						
						
						
						
						
						While at it, update the sh script too. 
						
						
					 | 
					
						2017-05-06 17:04:24 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bill Wagner
							
						 
					 | 
					
						
						
						
						
							
						
						
							9271bb916b
							
						
					 | 
					
						
						
							
							Update the CI Build docker file to build the SPA alient bits
						
						
						
						
						
						
						
						While at it, update the sh script too. 
						
						
					 | 
					
						2017-05-06 17:04:24 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e5d38dae1
							
						
					 | 
					
						
						
							
							Merge pull request #181 from BillWagner/use-IEnumerable-dynamic
						
						
						
						
						
						
						
						Use IEnumerable<dynamic> instead of dynamic for collections 
						
						
					 | 
					
						2017-05-05 15:53:44 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							660e1932a3
							
						
					 | 
					
						
						
							
							Merge pull request #181 from BillWagner/use-IEnumerable-dynamic
						
						
						
						
						
						
						
						Use IEnumerable<dynamic> instead of dynamic for collections 
						
						
					 | 
					
						2017-05-05 15:53:44 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Britch
							
						 
					 | 
					
						
						
						
						
							
						
						
							0457e26e4f
							
						
					 | 
					
						
						
							
							Merge branch 'master' into xamarin
						
						
						
						
						
						
					 | 
					
						2017-05-05 16:06:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Britch
							
						 
					 | 
					
						
						
						
						
							
						
						
							59b4204c7a
							
						
					 | 
					
						
						
							
							Merge branch 'master' into xamarin
						
						
						
						
						
						
					 | 
					
						2017-05-05 16:06:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Britch
							
						 
					 | 
					
						
						
						
						
							
						
						
							b5fecbbff6
							
						
					 | 
					
						
						
							
							Merge pull request #189 from dotnet-architecture/xamarin
						
						
						
						
						
						
						
						Fixed Windows unit test runner project. 
						
						
					 | 
					
						2017-05-05 16:04:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Britch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f85b1312be
							
						
					 | 
					
						
						
							
							Merge pull request #189 from dotnet-architecture/xamarin
						
						
						
						
						
						
						
						Fixed Windows unit test runner project. 
						
						
					 | 
					
						2017-05-05 16:04:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Britch
							
						 
					 | 
					
						
						
						
						
							
						
						
							dc8df9e65b
							
						
					 | 
					
						
						
							
							Fixed Windows unit test runner project.
						
						
						
						
						
						
					 | 
					
						2017-05-05 15:18:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Britch
							
						 
					 | 
					
						
						
						
						
							
						
						
							90482cc32a
							
						
					 | 
					
						
						
							
							Fixed Windows unit test runner project.
						
						
						
						
						
						
					 | 
					
						2017-05-05 15:18:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							867afa3df4
							
						
					 | 
					
						
						
							
							Update k8s script
						
						
						
						
						
						
					 | 
					
						2017-05-05 16:17:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							f724c6b91b
							
						
					 | 
					
						
						
							
							Modify kubernetes deploy script to support CI vsts
						
						
						
						
						
						
					 | 
					
						2017-05-05 15:29:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eduard Tomas
							
						 
					 | 
					
						
						
						
						
							
						
						
							2af88e74c8
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'eShopOnContainers/dev' into dev
						
						
						
						
						
						
						
						# Conflicts:
#	README.md
#	docs/Enterprise-Application-Patterns-using-XamarinForms.pdf
#	docs/architecting-and-developing-containerized-and-microservice-based-net-applications-ebook-early-draft.pdf 
						
						
					 | 
					
						2017-05-05 10:05:51 +02:00 | 
					
					
						
						
							
							
							
						
					 |