| 
							
							
								 Ramón Tomás | ea851bb8ce | Merge from Dev | 2017-05-18 15:39:31 +02:00 |  | 
			
				
					| 
							
							
								 Ramón Tomás | 8abf1e36a5 | Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign | 2017-05-18 15:28:14 +02:00 |  | 
			
				
					| 
							
							
								 Ramón Tomás | 87201a3f35 | Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign | 2017-05-18 15:28:14 +02:00 |  | 
			
				
					| 
							
							
								 Ramón Tomás | 82109476ef | Update order functional test | 2017-05-18 15:27:51 +02:00 |  | 
			
				
					| 
							
							
								 Ramón Tomás | 1df3dc76d6 | Update order functional test | 2017-05-18 15:27:51 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | 1b03da33c4 | Merge remote-tracking branch 'eShopOnContainers/dev' into dev | 2017-05-18 15:15:05 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | cd1193bd56 | Merge remote-tracking branch 'origin/master' into dev | 2017-05-18 15:11:43 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | b435d8d5c3 | Merge remote-tracking branch 'origin/master' into dev | 2017-05-18 15:11:43 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | 1e3b4bf546 | Merge remote-tracking branch 'eShopOnContainers/dev' into dev | 2017-05-18 13:29:31 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | 180fa1bd24 | Android sln for VSTS build | 2017-05-18 13:29:02 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | f6fdd7269d | Android sln for VSTS build | 2017-05-18 13:29:02 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | 9f7a7cda8a | Merge remote-tracking branch 'eShopOnContainers/dev' into dev # Conflicts:
#	k8s/deploy.ps1 | 2017-05-18 13:01:40 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | 427b1d507d | iOS solution for VSTS build | 2017-05-18 12:54:22 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | 61b375ddd9 | iOS solution for VSTS build | 2017-05-18 12:54:22 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 45fff656d0 | - Remove unused IntegrationCommands folders - minor name changes | 2017-05-18 12:03:17 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 689096f4c8 | - Remove unused IntegrationCommands folders - minor name changes | 2017-05-18 12:03:17 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | a2eb2a348d | Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign # Conflicts:
#	src/Services/Ordering/Ordering.API/Startup.cs | 2017-05-18 11:51:12 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | f79e21f2f7 | Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign # Conflicts:
#	src/Services/Ordering/Ordering.API/Startup.cs | 2017-05-18 11:51:12 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | dc7b1098dd | - Change Integration Command to Integration Events - Rename OrderStockNotConfirmedIntegrationEvent to OrderStockRejectedIntegrationEvent | 2017-05-18 11:43:19 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 6b36972a7f | - Change Integration Command to Integration Events - Rename OrderStockNotConfirmedIntegrationEvent to OrderStockRejectedIntegrationEvent | 2017-05-18 11:43:19 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 55a82c24f4 | - Change Integration Command to Integration Events - Refactor PublishThroughEventBusAsync methods from OrderingIntegrationEventService
- Add private empty Address constructor.
- Modify order aggregate methods.
- Remove GetWithDependenciesAsync methods and modify GetAsync with entity framework Explicit loading. | 2017-05-18 11:42:22 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 2228ca3612 | - Change Integration Command to Integration Events - Refactor PublishThroughEventBusAsync methods from OrderingIntegrationEventService
- Add private empty Address constructor.
- Modify order aggregate methods.
- Remove GetWithDependenciesAsync methods and modify GetAsync with entity framework Explicit loading. | 2017-05-18 11:42:22 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | e842cd81b3 | Changing status item condition in order view | 2017-05-18 11:37:50 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 31bdcd0b2f | Changing status item condition in order view | 2017-05-18 11:37:50 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 1ecec231b0 | Change variable parameter name | 2017-05-18 09:43:37 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 429d27b9ca | Change variable parameter name | 2017-05-18 09:43:37 +02:00 |  | 
			
				
					| 
							
							
								 Ramón Tomás | 62a29b6d7e | Fix merge | 2017-05-18 09:14:38 +02:00 |  | 
			
				
					| 
							
							
								 Ramón Tomás | 58b3b6fada | Fix merge | 2017-05-18 09:14:38 +02:00 |  | 
			
				
					| 
							
							
								 Ramón Tomás | 3f9574c8c9 | Merge | 2017-05-18 09:14:21 +02:00 |  | 
			
				
					| 
							
							
								 Ramón Tomás | c7e88d49f1 | Merge | 2017-05-18 09:14:21 +02:00 |  | 
			
				
					| 
							
							
								 Ramón Tomás | 6c9d2cdb31 | Adapt test cases to new order flow Create new service test cases | 2017-05-18 08:40:35 +02:00 |  | 
			
				
					| 
							
							
								 Ramón Tomás | d9d26bebd9 | Adapt test cases to new order flow Create new service test cases | 2017-05-18 08:40:35 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | a84c180e07 | Remove PaymentIntegrationEventService and remove integration command to integration event | 2017-05-17 19:42:45 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | cceca92cf9 | Remove PaymentIntegrationEventService and remove integration command to integration event | 2017-05-17 19:42:45 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | def828aeda | Remove SagaManagerIntegrationEventService frrom SagaManager and remove GracePeriod from dockercompose | 2017-05-17 19:41:49 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 511bc05cb4 | Remove SagaManagerIntegrationEventService frrom SagaManager and remove GracePeriod from dockercompose | 2017-05-17 19:41:49 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | 827018fe99 | Merge branch 'containers-on-80' into dev | 2017-05-17 16:26:32 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | 540f64d848 | Merge branch 'containers-on-80' into dev | 2017-05-17 16:26:32 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 0ee173cd34 | naming changes | 2017-05-17 11:57:02 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 9b449461f2 | naming changes | 2017-05-17 11:57:02 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 63cba2cad9 | Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign # Conflicts:
#	src/Services/SagaManager/SagaManager/Program.cs | 2017-05-17 09:53:14 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 451a56ed2f | Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign # Conflicts:
#	src/Services/SagaManager/SagaManager/Program.cs | 2017-05-17 09:53:14 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | f3b6444e63 | minor changes | 2017-05-17 00:40:40 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 8b80eeae52 | minor changes | 2017-05-17 00:40:40 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | b12e8e399a | revert the last changes | 2017-05-16 18:57:36 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 587de20d85 | revert the last changes | 2017-05-16 18:57:36 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | b95bf247cf | Change SaveEntitiesAsync to SaveChangesAsync | 2017-05-16 18:40:34 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 3556a5d126 | Change SaveEntitiesAsync to SaveChangesAsync | 2017-05-16 18:40:34 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | dcec42a088 | Modify payment DI | 2017-05-16 18:39:54 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | aaa821bb49 | Modify payment DI | 2017-05-16 18:39:54 +02:00 |  |