| 
							
							
								 Ramón Tomás | 3c6b4ad44e | Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev | 2017-06-08 17:45:21 +02:00 |  | 
			
				
					| 
							
							
								 Ramón Tomás | 3a10038d71 | Fix bug antiforgery decryption issue when deploying in a k8s cluster Changed in-memory grant store in idsrv to persist in db | 2017-06-08 17:45:07 +02:00 |  | 
			
				
					| 
							
							
								 Ramón Tomás | 6c855e57c5 | Fix bug antiforgery decryption issue when deploying in a k8s cluster Changed in-memory grant store in idsrv to persist in db | 2017-06-08 17:45:07 +02:00 |  | 
			
				
					| 
							
							
								 Ramón Tomás | 05bd964f2b | Adapt Locations.api to nosql db | 2017-06-08 17:33:55 +02:00 |  | 
			
				
					| 
							
							
								 Ramón Tomás | 896ab5b4dc | Adapt Locations.api to nosql db | 2017-06-08 17:33:55 +02:00 |  | 
			
				
					| 
							
							
								 Ramón Tomás | 27fd97b92e | Merge from Dev | 2017-06-07 17:54:53 +02:00 |  | 
			
				
					| 
							
							
								 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 | 6ff6864f91 | Edit the integration test | 2017-06-06 14:19:01 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 1900ee2b61 | Edit the integration test | 2017-06-06 14:19:01 +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 | 55c3364f28 | Corrected ASP.NET Web API to ASP.NET Core MVC. | 2017-06-05 16:25:40 +01:00 |  | 
			
				
					| 
							
							
								 David Britch | c8b3010a0b | Corrected ASP.NET Web API to ASP.NET Core MVC. | 2017-06-05 16:25:40 +01: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 |  | 
			
				
					| 
							
							
								 David Britch | 6321e2d96b | Added Xamarin eBook cover image. | 2017-06-05 13:20:22 +01:00 |  | 
			
				
					| 
							
							
								 David Britch | dd10decfb1 | Added Xamarin eBook cover image. | 2017-06-05 13:20:22 +01:00 |  | 
			
				
					| 
							
							
								 David Britch | fbf52f628c | Deleted Xamarin eBook cover image. | 2017-06-05 13:19:49 +01:00 |  | 
			
				
					| 
							
							
								 David Britch | 767f725f56 | Deleted Xamarin eBook cover image. | 2017-06-05 13:19:49 +01:00 |  | 
			
				
					| 
							
							
								 David Britch | 8320a92eec | Final Xamarin eBook. | 2017-06-05 13:14:58 +01:00 |  | 
			
				
					| 
							
							
								 David Britch | f56d283919 | Final Xamarin eBook. | 2017-06-05 13:14:58 +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 | 3e47c840d5 | Add integration test | 2017-06-02 16:33:01 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 21dc4e3772 | Add integration test | 2017-06-02 16:33:01 +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 |  |