| 
							
							
								 Christian Arenas | 699ec0001d | Create IdentityService in marketing API | 2017-06-26 18:31:04 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | b28c650e06 | Remove userId setting from xamarin app and remove userId parameter from GetCampaignsByUserId in Campaign API | 2017-06-26 18:29:51 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | 706423cc8d | Marketing.API nuget updated | 2017-06-21 19:43:02 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomas | 56902a5549 | [WIP] Projects & Dockerfile migrated to 2.0 Lots of things to address yet, because nuget packages are still on 1.1 | 2017-06-21 19:03:48 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | b36a05b64b | Optimize query | 2017-06-19 09:41:24 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | ed97efaf61 | Check when the user doesn't have any location in database | 2017-06-19 00:34:00 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | db4403b75c | Add Pagination to Campaign View (cherry picked from commit 86e40512352a44021ea69ed948062d0b510141cf) | 2017-06-16 16:51:35 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | c88ece26e6 | Change condition in Campaign from and to | 2017-06-16 12:09:48 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | a146fd3239 | Remove campaign test images and add new two images and change the name campaign seed | 2017-06-16 11:44:51 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | e80c5efdd3 | Add details view and add marketing scope in mvc project and identity config | 2017-06-16 01:20:03 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | cd1a091b6f | Add polly to marketing api | 2017-06-15 19:26:24 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | ed7dfc7cb5 | Modify PictureUri name | 2017-06-15 19:25:08 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 31423eebcb | Add test pics (not demo pics) and PicController | 2017-06-15 19:16:26 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 08b4f9187a | Add Name property and rename Url to PictureUri | 2017-06-15 19:14:16 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | dd3237245d | Modify CreatedAtAction parameter, It has an error | 2017-06-15 00:52:18 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 523d27a49f | Add GetLocationByCampaignAndLocationRuleId route name | 2017-06-14 18:25:46 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | b3e5362865 | Merge branch 'feature/marketing-read-model-data' into marketingcampaign # Conflicts:
#	src/Services/Location/Locations.API/Model/Locations.cs | 2017-06-14 16:26:28 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 0ffa9cb981 | Create a LocationId in data read model and change the affected modification | 2017-06-14 15:22:49 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 13a201ba67 | Implement GetCampaignsByUserId in CampaignsController calling a data read model from mongo repository | 2017-06-14 15:14:37 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 9ae6fa8c64 | Modify locationId in Marketing campaing seed | 2017-06-14 15:10:49 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 41654878a7 | Add LocationId field to UserLocation and call GetAsync repository method from marketing controller | 2017-06-13 18:01:24 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 794d366053 | Merge branch 'feature/marketing-read-model-data' into marketingcampaign # Conflicts:
#	src/Services/Location/Locations.API/Infrastructure/Services/LocationsService.cs
#	src/Services/Location/Locations.API/Model/UserLocation.cs | 2017-06-13 17:38:07 +02:00 |  | 
			
				
					| 
							
							
								 Ramón Tomás | 9bf5670020 | Created Marketing read data model | 2017-06-13 17:31:37 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 432994d113 | Create GetCampaignByUserId in CampaignsController | 2017-06-13 14:33:16 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 4a60d97d4d | Add RuleType in MarketingContext | 2017-06-13 14:32:53 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 8d170fe83f | Modify RuleType class | 2017-06-13 14:32:08 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 0586fe5abd | add new migration | 2017-06-09 12:50:26 +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 | 56c07aaafa | 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 | ea8d893d4e | change the FakeCampaignDto private object to an GetFakeCampaignDto funtion | 2017-06-05 19:36:09 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | b5f90cf7b4 | 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 | 385f1f094a | 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 | 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 | 6dcc6f84bc | 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 | 3440427da3 | 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 | 1bd13747f4 | 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 | 8494e77687 | 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 | f993c8c33d | Remove unused class | 2017-06-01 20:26:10 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 32247c503d | Add marketing api | 2017-06-01 20:15:21 +02:00 |  | 
			
				
					| 
							
							
								 Christian Arenas | 1ac1dae9d3 | Add Marketing.API project | 2017-06-01 10:10:00 +02:00 |  |