Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							6811797ae4
							
						
					 | 
					
						
						
							
							Merge from Dev
						
						
						
						
						
						
					 | 
					
						2017-06-07 17:54:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							8c0d41e4ad
							
						
					 | 
					
						
						
							
							Fix issue Autofac IAsyncRequestHandler not registered with Mediatr 3.0
						
						
						
						
						
						
					 | 
					
						2017-06-06 19:20:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							d8b6d5ec8b
							
						
					 | 
					
						
						
							
							Fix issue Autofac IAsyncRequestHandler not registered with Mediatr 3.0
						
						
						
						
						
						
					 | 
					
						2017-06-06 19:20:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							ce56a42bd1
							
						
					 | 
					
						
						
							
							Redesign marketing campaign api in two different controllers (campaigns/locations)
						
						
						
						
						
						
					 | 
					
						2017-06-06 14:18:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							99685b3eae
							
						
					 | 
					
						
						
							
							Redesign marketing campaign api in two different controllers (campaigns/locations)
						
						
						
						
						
						
					 | 
					
						2017-06-06 14:18:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							56c07aaafa
							
						
					 | 
					
						
						
							
							Edit campaigns controller
						
						
						
						
						
						
					 | 
					
						2017-06-06 10:26:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							31b1c4a197
							
						
					 | 
					
						
						
							
							Edit campaigns controller
						
						
						
						
						
						
					 | 
					
						2017-06-06 10:26:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							3c81115603
							
						
					 | 
					
						
						
							
							Edit mapper methods
						
						
						
						
						
						
					 | 
					
						2017-06-05 23:20:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							f62131f832
							
						
					 | 
					
						
						
							
							Edit mapper methods
						
						
						
						
						
						
					 | 
					
						2017-06-05 23:20:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							375780e3a4
							
						
					 | 
					
						
						
							
							Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
						
						
						
						
						
						
					 | 
					
						2017-06-05 21:54:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							b7c5613238
							
						
					 | 
					
						
						
							
							Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
						
						
						
						
						
						
					 | 
					
						2017-06-05 21:54:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							41101164fa
							
						
					 | 
					
						
						
							
							Persist identity grant store to db
						
						
						
						
						
						
						
						Persist machine Keys to Redis 
						
						
					 | 
					
						2017-06-05 21:54:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							8d0ef809a8
							
						
					 | 
					
						
						
							
							Persist identity grant store to db
						
						
						
						
						
						
						
						Persist machine Keys to Redis 
						
						
					 | 
					
						2017-06-05 21:54:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							ea8d893d4e
							
						
					 | 
					
						
						
							
							change the FakeCampaignDto private object to an GetFakeCampaignDto funtion
						
						
						
						
						
						
					 | 
					
						2017-06-05 19:36:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							bb167617bf
							
						
					 | 
					
						
						
							
							change the FakeCampaignDto private object to an GetFakeCampaignDto funtion
						
						
						
						
						
						
					 | 
					
						2017-06-05 19:36:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Britch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f406c55894
							
						
					 | 
					
						
						
							
							Update README.md
						
						
						
						
						
						
					 | 
					
						2017-06-05 16:19:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Britch
							
						 
					 | 
					
						
						
						
						
							
						
						
							33fd78420f
							
						
					 | 
					
						
						
							
							Update README.md
						
						
						
						
						
						
					 | 
					
						2017-06-05 16:19:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							b5f90cf7b4
							
						
					 | 
					
						
						
							
							Create RuleType class to manage RuleTypeEnum
						
						
						
						
						
						
					 | 
					
						2017-06-03 01:00:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							7842194637
							
						
					 | 
					
						
						
							
							Create RuleType class to manage RuleTypeEnum
						
						
						
						
						
						
					 | 
					
						2017-06-03 01:00:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							a8178fbbb4
							
						
					 | 
					
						
						
							
							remove unused dbset
						
						
						
						
						
						
					 | 
					
						2017-06-03 00:59:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							2111d56766
							
						
					 | 
					
						
						
							
							remove unused dbset
						
						
						
						
						
						
					 | 
					
						2017-06-03 00:59:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							385f1f094a
							
						
					 | 
					
						
						
							
							fix error merge
						
						
						
						
						
						
					 | 
					
						2017-06-02 16:36:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							f058cfde21
							
						
					 | 
					
						
						
							
							fix error merge
						
						
						
						
						
						
					 | 
					
						2017-06-02 16:36:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							82182e3184
							
						
					 | 
					
						
						
							
							cleanup
						
						
						
						
						
						
					 | 
					
						2017-06-02 16:35:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							345b71b50e
							
						
					 | 
					
						
						
							
							cleanup
						
						
						
						
						
						
					 | 
					
						2017-06-02 16:35:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							c349596ca7
							
						
					 | 
					
						
						
							
							Merge branch 'marketingcampaign' of https://github.com/dotnet-architecture/eShopOnContainers into marketingcampaign
						
						
						
						
						
						
						
						# Conflicts:
#	src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs 
						
						
					 | 
					
						2017-06-02 16:34:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e3fd13362
							
						
					 | 
					
						
						
							
							Merge branch 'marketingcampaign' of https://github.com/dotnet-architecture/eShopOnContainers into marketingcampaign
						
						
						
						
						
						
						
						# Conflicts:
#	src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs 
						
						
					 | 
					
						2017-06-02 16:34:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							6dcc6f84bc
							
						
					 | 
					
						
						
							
							initialitze the list in constructor
						
						
						
						
						
						
					 | 
					
						2017-06-02 16:32:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							ae7f1e8e7a
							
						
					 | 
					
						
						
							
							initialitze the list in constructor
						
						
						
						
						
						
					 | 
					
						2017-06-02 16:32:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							4c59c5ebe4
							
						
					 | 
					
						
						
							
							Add migration folder
						
						
						
						
						
						
					 | 
					
						2017-06-02 16:32:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							a705127653
							
						
					 | 
					
						
						
							
							Add migration folder
						
						
						
						
						
						
					 | 
					
						2017-06-02 16:32:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							3440427da3
							
						
					 | 
					
						
						
							
							modify context
						
						
						
						
						
						
					 | 
					
						2017-06-02 16:31:48 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							59b8fed228
							
						
					 | 
					
						
						
							
							modify context
						
						
						
						
						
						
					 | 
					
						2017-06-02 16:31:48 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							c132d944d7
							
						
					 | 
					
						
						
							
							update inital migration
						
						
						
						
						
						
					 | 
					
						2017-06-02 16:31:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							5f976e90d4
							
						
					 | 
					
						
						
							
							update inital migration
						
						
						
						
						
						
					 | 
					
						2017-06-02 16:31:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							1bd13747f4
							
						
					 | 
					
						
						
							
							Add exceptions filters
						
						
						
						
						
						
					 | 
					
						2017-06-02 16:31:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							05fe4ccd6d
							
						
					 | 
					
						
						
							
							Add exceptions filters
						
						
						
						
						
						
					 | 
					
						2017-06-02 16:31:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							a5aea54cc8
							
						
					 | 
					
						
						
							
							Add dtos
						
						
						
						
						
						
					 | 
					
						2017-06-02 16:30:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							d4ab5b24d2
							
						
					 | 
					
						
						
							
							Add dtos
						
						
						
						
						
						
					 | 
					
						2017-06-02 16:30:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							d657428e78
							
						
					 | 
					
						
						
							
							Merge from Dev
						
						
						
						
						
						
					 | 
					
						2017-06-02 13:22:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							31ca759662
							
						
					 | 
					
						
						
							
							Merge from Dev
						
						
						
						
						
						
					 | 
					
						2017-06-02 13:22:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							8494e77687
							
						
					 | 
					
						
						
							
							add version 1 to Campaigns web api
						
						
						
						
						
						
					 | 
					
						2017-06-01 22:19:07 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							ac5daa6146
							
						
					 | 
					
						
						
							
							add version 1 to Campaigns web api
						
						
						
						
						
						
					 | 
					
						2017-06-01 22:19:07 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							83b229f4a1
							
						
					 | 
					
						
						
							
							rename file name
						
						
						
						
						
						
					 | 
					
						2017-06-01 22:13:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							314768b9ce
							
						
					 | 
					
						
						
							
							rename file name
						
						
						
						
						
						
					 | 
					
						2017-06-01 22:13:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							f993c8c33d
							
						
					 | 
					
						
						
							
							Remove unused class
						
						
						
						
						
						
					 | 
					
						2017-06-01 20:26:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							baab0d2a98
							
						
					 | 
					
						
						
							
							Remove unused class
						
						
						
						
						
						
					 | 
					
						2017-06-01 20:26:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							37af8a0e82
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into marketingcampaing
						
						
						
						
						
						
						
						# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln 
						
						
					 | 
					
						2017-06-01 20:19:33 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							8d3ae671a8
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into marketingcampaing
						
						
						
						
						
						
						
						# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln 
						
						
					 | 
					
						2017-06-01 20:19:33 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							bae10b07b8
							
						
					 | 
					
						
						
							
							Created UserLocationModel
						
						
						
						
						
						
						
						Map Position to Locations APi
Update current user location 
						
						
					 | 
					
						2017-06-01 20:16:19 +02:00 | 
					
					
						
						
							
							
							
						
					 |