CESARDELATORRE 
							
						 
					 
					
						
						
						
						
							
						
						
							505d0f9c16 
							
						 
					 
					
						
						
							
							Minor changes in .sln and projects, updated by VS 2017 15.5.  
						
						... 
						
						
						
						Tested on Android app deployment to device and UWP on local Windows 
						
						
					 
					
						2018-01-03 16:38:56 -08:00 
						 
				 
			
				
					
						
							
							
								David Britch 
							
						 
					 
					
						
						
						
						
							
						
						
							8f6b979f53 
							
						 
					 
					
						
						
							
							Update to iOS project for Forms 2.5.  
						
						
						
						
					 
					
						2017-11-22 17:25:58 +00:00 
						 
				 
			
				
					
						
							
							
								David Britch 
							
						 
					 
					
						
						
						
						
							
						
						
							7acb0bd68e 
							
						 
					 
					
						
						
							
							Updates to ensure app runs on Forms 2.5.  
						
						
						
						
					 
					
						2017-11-22 17:22:21 +00:00 
						 
				 
			
				
					
						
							
							
								David Britch 
							
						 
					 
					
						
						
						
						
							
						
						
							bee76a4523 
							
						 
					 
					
						
						
							
							Updated to Forms 2.5.  Fixes   #416  
						
						
						
						
					 
					
						2017-11-22 15:48:10 +00:00 
						 
				 
			
				
					
						
							
							
								David Britch 
							
						 
					 
					
						
						
						
						
							
						
						
							1545eb80bd 
							
						 
					 
					
						
						
							
							Replaced deprecated OnPlatform API.  Fixes   #399  
						
						
						
						
					 
					
						2017-11-09 11:21:03 +00:00 
						 
				 
			
				
					
						
							
							
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							3218c1b54c 
							
						 
					 
					
						
						
							
							Fixed bug in Xamarin code when mapping from Order to Basket, method MapOrderToBasket(), in order to submit to the Basket microservice.  
						
						
						
						
					 
					
						2017-10-31 21:55:04 -07:00 
						 
				 
			
				
					
						
							
							
								David Britch 
							
						 
					 
					
						
						
						
						
							
						
						
							fc82bba271 
							
						 
					 
					
						
						
							
							Whitespace removed.  
						
						
						
						
					 
					
						2017-10-25 17:04:17 +01:00 
						 
				 
			
				
					
						
							
							
								David Britch 
							
						 
					 
					
						
						
						
						
							
						
						
							771962f054 
							
						 
					 
					
						
						
							
							Removed unused methods.  
						
						
						
						
					 
					
						2017-10-25 16:56:38 +01:00 
						 
				 
			
				
					
						
							
							
								David Britch 
							
						 
					 
					
						
						
						
						
							
						
						
							03e61fae9d 
							
						 
					 
					
						
						
							
							Added a Style to define the margin on Entry controls on the SettingsView.  Fixes   #387  
						
						
						
						
					 
					
						2017-10-25 16:31:25 +01:00 
						 
				 
			
				
					
						
							
							
								David Britch 
							
						 
					 
					
						
						
						
						
							
						
						
							954717b65d 
							
						 
					 
					
						
						
							
							Removed unneeded reference.  
						
						
						
						
					 
					
						2017-10-25 15:47:38 +01:00 
						 
				 
			
				
					
						
							
							
								David Britch 
							
						 
					 
					
						
						
						
						
							
						
						
							2e463f4b25 
							
						 
					 
					
						
						
							
							Fixed SplashScreen implementation on Android.  Fixes   #355  
						
						... 
						
						
						
						The MainTheme set the splash screen image as the window background.
I’ve removed this and ensured that the SplashActivity is the launch
activity.
Also did some code tidy up on the Campaign page classes. 
						
						
					 
					
						2017-09-29 17:25:49 +01:00 
						 
				 
			
				
					
						
							
							
								David Britch 
							
						 
					 
					
						
						
						
						
							
						
						
							0348d882f3 
							
						 
					 
					
						
						
							
							Fixed relationship between XAML and their code-behind files in the PCL.  Fixes   #354  
						
						
						
						
					 
					
						2017-09-29 16:14:18 +01:00 
						 
				 
			
				
					
						
							
							
								David Britch 
							
						 
					 
					
						
						
						
						
							
						
						
							745cb39d76 
							
						 
					 
					
						
						
							
							UWP campaign icon.  Fixes   #353  
						
						
						
						
					 
					
						2017-09-29 12:50:33 +01:00 
						 
				 
			
				
					
						
							
							
								David Britch 
							
						 
					 
					
						
						
						
						
							
						
						
							86af9ec922 
							
						 
					 
					
						
						
							
							New campaign icons for iOS + Android  #353  
						
						
						
						
					 
					
						2017-09-29 12:35:15 +01:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomàs 
							
						 
					 
					
						
						
						
						
							
						
						
							180efc45df 
							
						 
					 
					
						
						
							
							Merge pull request  #347  from jzeferino/feature/readme_fix  
						
						... 
						
						
						
						Fixed header typo. 
						
						
					 
					
						2017-09-28 16:27:16 +02:00 
						 
				 
			
				
					
						
							
							
								jzeferino 
							
						 
					 
					
						
						
						
						
							
						
						
							aca7779fd9 
							
						 
					 
					
						
						
							
							Fixed header typo.  
						
						
						
						
					 
					
						2017-09-25 21:59:59 +01:00 
						 
				 
			
				
					
						
							
							
								Javier Suárez Ruiz 
							
						 
					 
					
						
						
						
						
							
						
						
							0c274d46be 
							
						 
					 
					
						
						
							
							Fixed bindings errors  
						
						... 
						
						
						
						Fixed Checkout process
Changed some UWP icons 
						
						
					 
					
						2017-09-25 08:17:20 +02:00 
						 
				 
			
				
					
						
							
							
								David Britch 
							
						 
					 
					
						
						
						
						
							
						
						
							39b3a0ec3b 
							
						 
					 
					
						
						
							
							Windows test runner uses same target version as Windows app.  
						
						
						
						
					 
					
						2017-09-22 12:35:10 +01:00 
						 
				 
			
				
					
						
							
							
								David Britch 
							
						 
					 
					
						
						
						
						
							
						
						
							68fc5d158e 
							
						 
					 
					
						
						
							
							Removed async warning.  
						
						
						
						
					 
					
						2017-09-21 17:40:51 +01:00 
						 
				 
			
				
					
						
							
							
								David Britch 
							
						 
					 
					
						
						
						
						
							
						
						
							c92b54d29c 
							
						 
					 
					
						
						
							
							Changed minimum deployment target to iOS 9.  
						
						... 
						
						
						
						This ensures the launch storyboard doesn’t generate an error, and is
line with Xamarin policy for samples. 
						
						
					 
					
						2017-09-21 17:32:24 +01:00 
						 
				 
			
				
					
						
							
							
								Javier Suárez Ruiz 
							
						 
					 
					
						
						
						
						
							
						
						
							20b14edea6 
							
						 
					 
					
						
						
							
							Created new PCL projects to fix compilation in Visual Studio for macOS  
						
						
						
						
					 
					
						2017-09-21 16:20:26 +02:00 
						 
				 
			
				
					
						
							
							
								Javier Suárez Ruiz 
							
						 
					 
					
						
						
						
						
							
						
						
							c22a443cfd 
							
						 
					 
					
						
						
							
							Changes in csprojs  
						
						
						
						
					 
					
						2017-09-20 16:44:30 +02:00 
						 
				 
			
				
					
						
							
							
								Javier Suárez Ruiz 
							
						 
					 
					
						
						
						
						
							
						
						
							cc3b010fcb 
							
						 
					 
					
						
						
							
							Reverted net standard libraries to pcl  
						
						
						
						
					 
					
						2017-09-20 16:42:35 +02:00 
						 
				 
			
				
					
						
							
							
								jacano 
							
						 
					 
					
						
						
						
						
							
						
						
							41d9afb84d 
							
						 
					 
					
						
						
							
							Core, Android and iOS project updated to netstandard 2.0  
						
						
						
						
					 
					
						2017-09-04 12:45:01 +02:00 
						 
				 
			
				
					
						
							
							
								jacano 
							
						 
					 
					
						
						
						
						
							
						
						
							208047c6ca 
							
						 
					 
					
						
						
							
							test runners updated  
						
						
						
						
					 
					
						2017-09-04 12:45:01 +02:00 
						 
				 
			
				
					
						
							
							
								jacano 
							
						 
					 
					
						
						
						
						
							
						
						
							d3aa16f27d 
							
						 
					 
					
						
						
							
							UITest to package reference  
						
						
						
						
					 
					
						2017-09-04 12:45:01 +02:00 
						 
				 
			
				
					
						
							
							
								jacano 
							
						 
					 
					
						
						
						
						
							
						
						
							f01431407a 
							
						 
					 
					
						
						
							
							UWP in netstandard 2  
						
						
						
						
					 
					
						2017-09-04 12:45:00 +02:00 
						 
				 
			
				
					
						
							
							
								jacano 
							
						 
					 
					
						
						
						
						
							
						
						
							c722d4907b 
							
						 
					 
					
						
						
							
							project.json removed from core  
						
						
						
						
					 
					
						2017-09-04 12:45:00 +02:00 
						 
				 
			
				
					
						
							
							
								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