| 
							
							
								 Christian Arenas | 5794e25d6e | Merge branch 'azurestorage' into dev | 2017-05-30 18:35:18 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 4d07fecc3b | fix merge error | 2017-05-30 18:35:09 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | ea02ecc160 | Merge branch 'azureredis' into dev # Conflicts:
#	src/Services/Basket/Basket.API/Startup.cs
#	src/Services/Basket/Basket.API/appsettings.json | 2017-05-30 18:32:28 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 7694602be2 | Rename property PictureFile to PictureFileName in Migration Designer | 2017-05-30 17:53:15 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 2cad62d642 | Add ESHOP_AZURE_REDIS variable from .env with default value | 2017-05-30 17:30:01 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 9866aae07c | Change version of docker-compose from 2 to 2.1 for default values. I set "http://localhost:5101/api/v1/pic/" because docker-compose doesn't allow to declare another variable such as default value | 2017-05-30 17:24:46 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 1a385a2179 | Add AzureStorageEnabled environment variable to get the origin of the product image from PicBaseUrl environment variable | 2017-05-30 17:16:17 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 45ed8a60ad | Add PictureFileName field for saving the name of the file. PictureUri will be the url of the image (api or azure storage) | 2017-05-30 17:14:28 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 6b480e3d41 | Apply ConnectionString changes (remove condition) | 2017-05-29 16:04:35 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | e309d97d18 | remove AzureRedisConnectionString variable from settings | 2017-05-29 16:03:51 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | 64b9ea6f79 | Redis deploy ARM template and doc | 2017-05-29 15:42:59 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 0473a97225 | change the "AzureRedisEnabled" condition to configure declaration | 2017-05-29 12:42:51 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | ad1637e76b | Merge branch 'servicebus' of https://github.com/dotnet-architecture/eShopOnAzure into servicebus | 2017-05-29 11:51:45 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | bd03600aaa | sql template updated | 2017-05-29 11:51:34 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 60c08ce9c5 | Revert "Remove basket.data from docker-compose" This reverts commit 9549786003d723493d865ba83420ed127bc34d53. | 2017-05-29 11:06:22 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | db7d2a3ff3 | Add "AzureRedisConnectionString" environment variable and add a connectionString condition when "AzureRedisEnabled" environment variable is true | 2017-05-29 11:01:56 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 41a6814293 | Add new connection string | 2017-05-29 10:12:07 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | ec7a251839 | Service Bus deploy template and doc | 2017-05-29 09:21:27 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | cd790f276f | Update StackExchange.Redis version | 2017-05-27 18:35:44 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | c23d2551cd | Add new redis connection getting data from environment variable | 2017-05-27 18:35:28 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | b30d09fbf5 | Add Redis connectionString to environment variable | 2017-05-27 18:34:36 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 9549786003 | Remove basket.data from docker-compose | 2017-05-27 18:33:38 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | ed0e548e2d | minor naming | 2017-05-26 01:35:44 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 4399d6a4f3 | Remove "Default" rule when the class is Instantiated | 2017-05-26 01:35:19 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | e454940801 | environment variable renaming | 2017-05-24 19:23:14 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 9a100c9a27 | Remove retry policy from  DefaultServiceBusPersisterConnection parameter | 2017-05-24 18:59:29 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 390654a885 | Remove old ServiceBusConnection declaration | 2017-05-24 16:26:56 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | d3bd0fabfd | change log leve | 2017-05-24 16:26:40 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 64430618d7 | remove declaration from interface | 2017-05-24 16:26:21 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 04b35492c3 | Add SubscriptionClientName EnvironmentVariable | 2017-05-24 16:25:41 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | aa7556a1bd | Create EventBusServiceBus project and add EventBusServiceBus/ServiceBusPersisterConnection to project | 2017-05-24 15:34:55 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 721a4fd02b | - Declare new ServiceBus instance with "AzureServiceBus" boolean condition DI - Add ServiceBusConnection and AzureServiceBus variables in settings
- Add EventBusServiceBus dependencies | 2017-05-24 15:33:38 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 3acd556c5c | - Declare new ServiceBus instance with "AzureServiceBus" boolean condition DI - Add ServiceBusConnection and AzureServiceBus variables in settings
- Add EventBusServiceBus dependencies | 2017-05-24 15:33:05 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 7980c2679d | - Declare new ServiceBus instance with "AzureServiceBus" boolean condition - Add ServiceBusConnection and AzureServiceBus variables in settings
- Add EventBusServiceBus dependencies | 2017-05-24 15:32:22 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | fc06230c5a | Merge remote-tracking branch 'eShopOnContainers/dev' into dev # Conflicts:
#	k8s/deploy.ps1 | 2017-05-22 10:06:39 +02:00 |  | 
			
				
					| 
							
							
								 Cesar De la Torre | 7b63c8d409 | Added the WebStatus WatchDog to the Kubernetes cluster deployment | 2017-05-19 17:19:29 -07:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | 1b1764f3aa | Doc updated with docker-machine | 2017-05-19 20:22:55 +02:00 |  | 
			
				
					| 
							
							
								 Cesar De la Torre | 58005c73dc | Update readme.md | 2017-05-19 09:58:56 -07:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | c9976d4248 | minor fixes | 2017-05-19 14:40:56 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | 09b0e3ee48 | Doc updated | 2017-05-19 14:38:16 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | fb72a0efc6 | update to doc | 2017-05-19 13:19:20 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | 440a83ecdb | Merge remote-tracking branch 'eShopOnContainers/dev' into deploy | 2017-05-19 12:23:06 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | af09d0a8ee | Forcing SDK version | 2017-05-19 12:22:50 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | 5d2d2dc986 | VMs deploy doc added VMs deploy template updated
SQL deploy template | 2017-05-19 11:27:32 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | 76b6ec2582 | Error in image link in ios build doc | 2017-05-18 18:54:40 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | 40681c184a | iOS build doc | 2017-05-18 18:52:46 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | 87236db27b | android build docs | 2017-05-18 17:08:11 +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 | 1e3b4bf546 | Merge remote-tracking branch 'eShopOnContainers/dev' into dev | 2017-05-18 13:29:31 +02:00 |  |