David Britch
							
						 
					 | 
					
						
						
						
						
							
						
						
							de8c9035bd
							
						
					 | 
					
						
						
							
							Removed Xamarin.Forms.Theme from UWP project #231
						
						
						
						
						
						
					 | 
					
						2017-08-14 09:07:44 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Britch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f4cb659324
							
						
					 | 
					
						
						
							
							Removed TapGestureRecognizer from mock Register button.
						
						
						
						
						
						
						
						The Register button attempts to display the IdentityServer registration
page, which isn’t required when using mock services. 
						
						
					 | 
					
						2017-08-10 15:41:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Britch
							
						 
					 | 
					
						
						
						
						
							
						
						
							19663f7ba3
							
						
					 | 
					
						
						
							
							Removed Xamarin.Forms.Themes and Xamarin.Forms.DataPages NuGet packages in order to help speed up the app startup time #231
						
						
						
						
						
						
					 | 
					
						2017-08-10 15:38:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Britch
							
						 
					 | 
					
						
						
						
						
							
						
						
							15e95aa21e
							
						
					 | 
					
						
						
							
							Refactored methods that create code challenge. Fixes #214
						
						
						
						
						
						
					 | 
					
						2017-08-09 15:33:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Britch
							
						 
					 | 
					
						
						
						
						
							
						
						
							666a9c8735
							
						
					 | 
					
						
						
							
							Implemented PKCE in the authentication flow in the Xamarin client. Fixes #214
						
						
						
						
						
						
					 | 
					
						2017-08-08 15:44:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Britch
							
						 
					 | 
					
						
						
						
						
							
						
						
							b239e81063
							
						
					 | 
					
						
						
							
							Moved converters used by single pages from App class to the pages concerned. Part of #231
						
						
						
						
						
						
					 | 
					
						2017-08-08 08:32:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							a5104d3444
							
						
					 | 
					
						
						
							
							Rename Campaings title and cleanup
						
						
						
						
						
						
					 | 
					
						2017-07-31 15:09:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Britch
							
						 
					 | 
					
						
						
						
						
							
						
						
							eec4c899a3
							
						
					 | 
					
						
						
							
							Fixed iOS project so that it builds. Also fixed iOS test runner project.
						
						
						
						
						
						
					 | 
					
						2017-07-20 16:27:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							292f93ab24
							
						
					 | 
					
						
						
							
							Added geolocator plugin to TestRunner.Droid proj
						
						
						
						
						
						
					 | 
					
						2017-07-19 13:49:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eduard Tomas
							
						 
					 | 
					
						
						
						
						
							
						
						
							7b4d995448
							
						
					 | 
					
						
						
							
							Invalid reference
						
						
						
						
						
						
					 | 
					
						2017-07-18 19:09:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							a757a42217
							
						
					 | 
					
						
						
							
							Add new ApiUrlBase to BasketService in Xamarin App
						
						
						
						
						
						
					 | 
					
						2017-07-12 12:30:38 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							010f805a90
							
						
					 | 
					
						
						
							
							fix xamarin location values when saving the settings with double type
						
						
						
						
						
						
					 | 
					
						2017-07-12 11:34:07 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							3f560757a4
							
						
					 | 
					
						
						
							
							cleanup
						
						
						
						
						
						
					 | 
					
						2017-07-05 13:38:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							34e2e19269
							
						
					 | 
					
						
						
							
							Add DetailsUri property to CampaignItem and Add VIEW SITE button in campaign details when the DetailsUri exists
						
						
						
						
						
						
					 | 
					
						2017-07-05 13:38:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							ae8d38bdf6
							
						
					 | 
					
						
						
							
							Add StringNullOrEmptyBoolConverter to check when string value is null or empty
						
						
						
						
						
						
					 | 
					
						2017-07-05 13:37:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							66ee0039e5
							
						
					 | 
					
						
						
							
							Add StringNullOrEmptyBoolConverter to check when string value is null or empty
						
						
						
						
						
						
					 | 
					
						2017-07-05 13:37:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eduard Tomas
							
						 
					 | 
					
						
						
						
						
							
						
						
							10d03a68e3
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'eShopOnAzure/dev' into dev
						
						
						
						
						
						
						
						# Conflicts:
#	docker-compose.override.yml
#	src/Services/Catalog/Catalog.API/CatalogSettings.cs
#	src/Services/Catalog/Catalog.API/Controllers/CatalogController.cs
#	src/Services/Catalog/Catalog.API/Controllers/PicController.cs
#	src/Services/Catalog/Catalog.API/Infrastructure/CatalogContextSeed.cs
#	src/Services/Catalog/Catalog.API/settings.json
#	src/Services/Ordering/Ordering.API/Startup.cs 
						
						
					 | 
					
						2017-06-28 12:40:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							83e425da2b
							
						
					 | 
					
						
						
							
							Add Cancel button in order detail view when the status is submitted and add requestId guid to create a new order
						
						
						
						
						
						
					 | 
					
						2017-06-26 18:32:25 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							a3e63c11aa
							
						
					 | 
					
						
						
							
							Merge from eShopOnContainers Dev
						
						
						
						
						
						
					 | 
					
						2017-06-26 13:51:49 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							4f198f179e
							
						
					 | 
					
						
						
							
							Add a shipped order mock
						
						
						
						
						
						
					 | 
					
						2017-06-23 13:01:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							4f54dae03d
							
						
					 | 
					
						
						
							
							Rename OrderState property to OrderStatus and add new status items
						
						
						
						
						
						
					 | 
					
						2017-06-23 12:57:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							290057789b
							
						
					 | 
					
						
						
							
							Add styling
						
						
						
						
						
						
					 | 
					
						2017-06-22 19:05:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							55c2c666c0
							
						
					 | 
					
						
						
							
							clean up and style improving
						
						
						
						
						
						
					 | 
					
						2017-06-22 15:10:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							56ec1d9ed9
							
						
					 | 
					
						
						
							
							clean up and style improving
						
						
						
						
						
						
					 | 
					
						2017-06-22 15:10:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							f34a4fee2a
							
						
					 | 
					
						
						
							
							Add text message when gps system is enabled and change the name GpsUsage to AllowGpsLocation
						
						
						
						
						
						
					 | 
					
						2017-06-21 19:39:49 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							5f4d42520d
							
						
					 | 
					
						
						
							
							Add GeolocatorPlugin-1.0.3 to IOS and Windows project
						
						
						
						
						
						
					 | 
					
						2017-06-21 19:26:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							5d124369a1
							
						
					 | 
					
						
						
							
							Add Location permissions in ios
						
						
						
						
						
						
					 | 
					
						2017-06-21 17:30:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							6a02eb31c9
							
						
					 | 
					
						
						
							
							Add gps usage options
						
						
						
						
						
						
					 | 
					
						2017-06-21 17:30:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							d75f48035f
							
						
					 | 
					
						
						
							
							Clean up and add location permissions in windows phone project
						
						
						
						
						
						
					 | 
					
						2017-06-21 11:04:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							1d3cad9e67
							
						
					 | 
					
						
						
							
							Get gps location from core project.
						
						
						
						
						
						
					 | 
					
						2017-06-20 18:47:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							33acdcf9dc
							
						
					 | 
					
						
						
							
							Clean up
						
						
						
						
						
						
					 | 
					
						2017-06-20 10:59:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							cdfe85bdaf
							
						
					 | 
					
						
						
							
							Add marketing unit test to project
						
						
						
						
						
						
					 | 
					
						2017-06-20 10:58:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							c9266e8fea
							
						
					 | 
					
						
						
							
							remove MoreDetailsCampaignButton.xaml from project
						
						
						
						
						
						
					 | 
					
						2017-06-19 18:56:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							85c9af690f
							
						
					 | 
					
						
						
							
							Add serviceHelper and add campaingTemplate in campaing view
						
						
						
						
						
						
					 | 
					
						2017-06-19 18:50:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							8a73ee4c59
							
						
					 | 
					
						
						
							
							Resolve big margin problem in fake location settings
						
						
						
						
						
						
					 | 
					
						2017-06-19 18:49:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							ca46125c83
							
						
					 | 
					
						
						
							
							Add campaign view template
						
						
						
						
						
						
					 | 
					
						2017-06-19 18:48:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							f0b2845a6f
							
						
					 | 
					
						
						
							
							Add marketing scope to Xamarin client
						
						
						
						
						
						
					 | 
					
						2017-06-19 18:47:48 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							bfb9eff00a
							
						
					 | 
					
						
						
							
							Add CampaignDetail view and model view
						
						
						
						
						
						
					 | 
					
						2017-06-19 18:47:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							9bdfddc496
							
						
					 | 
					
						
						
							
							Modify the campaign response of the marketing api
						
						
						
						
						
						
					 | 
					
						2017-06-19 18:45:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							80c10a1465
							
						
					 | 
					
						
						
							
							Add default fake location in settings
						
						
						
						
						
						
					 | 
					
						2017-06-19 18:44:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							d8969aa60a
							
						
					 | 
					
						
						
							
							Add fake_campaign_ images
						
						
						
						
						
						
					 | 
					
						2017-06-19 18:43:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							fbb3b570b8
							
						
					 | 
					
						
						
							
							Add new campaign tab and mocks services
						
						
						
						
						
						
					 | 
					
						2017-06-16 16:50:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							d6c6582b51
							
						
					 | 
					
						
						
							
							Merge from Master
						
						
						
						
						
						
					 | 
					
						2017-06-15 08:54:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							e5a59a1bdf
							
						
					 | 
					
						
						
							
							Merge branch 'feature/track-user-location-mongodb' into dev
						
						
						
						
						
						
						
						# Conflicts:
#	src/Services/Ordering/Ordering.API/Infrastructure/AutofacModules/MediatorModule.cs 
						
						
					 | 
					
						2017-06-13 11:26:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							19647d8b7d
							
						
					 | 
					
						
						
							
							Add userIsLogged contiditon in view for fake location
						
						
						
						
						
						
					 | 
					
						2017-06-12 20:22:38 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							dde8e686fc
							
						
					 | 
					
						
						
							
							Add token when call location api
						
						
						
						
						
						
					 | 
					
						2017-06-12 20:21:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							c84b4707e3
							
						
					 | 
					
						
						
							
							Add locations to allow scopes to dictionary
						
						
						
						
						
						
					 | 
					
						2017-06-12 20:20:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Britch
							
						 
					 | 
					
						
						
						
						
							
						
						
							d3ea7ec853
							
						
					 | 
					
						
						
							
							Refactored TokenService into IdentityService.
						
						
						
						
						
						
					 | 
					
						2017-06-12 13:35:19 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							4be61abdde
							
						
					 | 
					
						
						
							
							Merge new creation ordering workflow
						
						
						
						
						
						
					 | 
					
						2017-06-12 13:52:23 +02:00 | 
					
					
						
						
							
							
							
						
					 |