DESKTOP-V1VLQ15\dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							f1ffb95abf 
							
						 
					 
					
						
						
							
							Merge branch 'dev' into integration-events-rmq  
						
						... 
						
						
						
						# Conflicts:
#	docker-compose.override.yml
#	eShopOnContainers-ServicesAndWebApps.sln 
						
						
					 
					
						2017-03-14 11:50:28 +01:00 
						 
				 
			
				
					
						
							
							
								dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							4e5e32c6aa 
							
						 
					 
					
						
						
							
							Add old price property for the basket in the WebMVC  
						
						
						
						
					 
					
						2017-03-13 12:15:41 +01:00 
						 
				 
			
				
					
						
							
							
								etomas 
							
						 
					 
					
						
						
						
						
							
						
						
							12ecc78a18 
							
						 
					 
					
						
						
							
							Solves  #112  
						
						
						
						
					 
					
						2017-03-10 21:51:48 +01:00 
						 
				 
			
				
					
						
							
							
								Bill Wagner 
							
						 
					 
					
						
						
						
						
							
						
						
							74fbbecf58 
							
						 
					 
					
						
						
							
							Update Compiler package  
						
						... 
						
						
						
						This is necessary for C# 7 feature support.
See the pattern match is statement in AutoFacHttpModule 
						
						
					 
					
						2017-03-09 16:38:02 -05:00 
						 
				 
			
				
					
						
							
							
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							3e795ac3ce 
							
						 
					 
					
						
						
							
							Revert "Revert "Removes Docker profile from launchSettings.json""  
						
						
						
						
					 
					
						2017-03-09 12:50:41 -08:00 
						 
				 
			
				
					
						
							
							
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							ee13198242 
							
						 
					 
					
						
						
							
							Revert "Removes Docker profile from launchSettings.json"  
						
						
						
						
					 
					
						2017-03-09 11:59:29 -08:00 
						 
				 
			
				
					
						
							
							
								David Zhao (DEVDIV) 
							
						 
					 
					
						
						
						
						
							
						
						
							9edf68ba11 
							
						 
					 
					
						
						
							
							Removes Docker profile from launchSettings.json  
						
						
						
						
					 
					
						2017-03-09 10:27:33 -08:00 
						 
				 
			
				
					
						
							
							
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							4469a4b851 
							
						 
					 
					
						
						
							
							Raising the number of retries with exponential backoff so in potential slower machines there's time enough.  
						
						... 
						
						
						
						Related to issue:
https://github.com/dotnet/eShopOnContainers/issues/97  
						
						
					 
					
						2017-03-08 17:10:34 -08:00 
						 
				 
			
				
					
						
							
							
								Bill Wagner 
							
						 
					 
					
						
						
						
						
							
						
						
							a3fd171712 
							
						 
					 
					
						
						
							
							inject dependencies into the WebForms application  
						
						
						
						
					 
					
						2017-03-08 16:56:26 -05:00 
						 
				 
			
				
					
						
							
							
								etomas 
							
						 
					 
					
						
						
						
						
							
						
						
							be0e9274ba 
							
						 
					 
					
						
						
							
							Removing Catalog.WebForms  
						
						... 
						
						
						
						It is still in the windows-containers-test branch 
						
						
					 
					
						2017-03-06 18:53:26 +01:00 
						 
				 
			
				
					
						
							
							
								etomas 
							
						 
					 
					
						
						
						
						
							
						
						
							485e8faf03 
							
						 
					 
					
						
						
							
							Removing pokemon catches.  #75  
						
						
						
						
					 
					
						2017-03-06 18:41:27 +01:00 
						 
				 
			
				
					
						
							
							
								etomas 
							
						 
					 
					
						
						
						
						
							
						
						
							c38e078265 
							
						 
					 
					
						
						
							
							Deleting windows container files as they are not still supported  
						
						
						
						
					 
					
						2017-03-06 15:00:41 +01:00 
						 
				 
			
				
					
						
							
							
								glennc 
							
						 
					 
					
						
						
						
						
							
						
						
							4aafa813f5 
							
						 
					 
					
						
						
							
							a couple of quick changes to allow building in the docker-compose.ci.build.yml  
						
						
						
						
					 
					
						2017-03-05 19:55:46 -08:00 
						 
				 
			
				
					
						
							
							
								etomas 
							
						 
					 
					
						
						
						
						
							
						
						
							dd6189fe57 
							
						 
					 
					
						
						
							
							Fixing style error (debug css not included on output) after merging  #68  into master  
						
						
						
						
					 
					
						2017-03-03 20:23:06 +01:00 
						 
				 
			
				
					
						
							
							
								etomas 
							
						 
					 
					
						
						
						
						
							
						
						
							29473b455f 
							
						 
					 
					
						
						
							
							Merge branch 'vs2017'  
						
						
						
						
					 
					
						2017-03-03 19:40:55 +01:00 
						 
				 
			
				
					
						
							
							
								Bill Wagner 
							
						 
					 
					
						
						
						
						
							
						
						
							cc9f6f8e75 
							
						 
					 
					
						
						
							
							trying some things on the docker-compose file.  
						
						
						
						
					 
					
						2017-03-03 11:21:46 -05:00 
						 
				 
			
				
					
						
							
							
								Bill Wagner 
							
						 
					 
					
						
						
						
						
							
						
						
							ed61af1d09 
							
						 
					 
					
						
						
							
							interim checkin  
						
						... 
						
						
						
						Tried to get all the services launched via Visual Studio.  After adding
the SQL engine and catalog container, it failed. 
						
						
					 
					
						2017-03-03 11:21:46 -05:00 
						 
				 
			
				
					
						
							
							
								Bill Wagner 
							
						 
					 
					
						
						
						
						
							
						
						
							1c840df8e1 
							
						 
					 
					
						
						
							
							Stub out the code for the catalog service.  
						
						
						
						
					 
					
						2017-03-03 11:21:46 -05:00 
						 
				 
			
				
					
						
							
							
								Bill Wagner 
							
						 
					 
					
						
						
						
						
							
						
						
							a4a5cd8c45 
							
						 
					 
					
						
						
							
							The basics of the site are working.  
						
						
						
						
					 
					
						2017-03-03 11:21:45 -05:00 
						 
				 
			
				
					
						
							
							
								Bill Wagner 
							
						 
					 
					
						
						
						
						
							
						
						
							2fdc6e2fd9 
							
						 
					 
					
						
						
							
							catalog fake service is in place.  
						
						
						
						
					 
					
						2017-03-03 11:21:45 -05:00 
						 
				 
			
				
					
						
							
							
								Bill Wagner 
							
						 
					 
					
						
						
						
						
							
						
						
							43cbd62784 
							
						 
					 
					
						
						
							
							update namespaces  
						
						... 
						
						
						
						The default for this app is
'Microsoft.eShopOnContainers.Catalog.WebForms' 
						
						
					 
					
						2017-03-03 11:21:45 -05:00 
						 
				 
			
				
					
						
							
							
								Bill Wagner 
							
						 
					 
					
						
						
						
						
							
						
						
							dfcf9e7540 
							
						 
					 
					
						
						
							
							add docker support  
						
						
						
						
					 
					
						2017-03-03 11:21:44 -05:00 
						 
				 
			
				
					
						
							
							
								Bill Wagner 
							
						 
					 
					
						
						
						
						
							
						
						
							19373057c5 
							
						 
					 
					
						
						
							
							initial template generated app  
						
						
						
						
					 
					
						2017-03-03 11:21:44 -05:00 
						 
				 
			
				
					
						
							
							
								dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							7be05293f9 
							
						 
					 
					
						
						
							
							Refactor in pagination view to use tag helpers  
						
						
						
						
					 
					
						2017-03-03 16:17:40 +01:00 
						 
				 
			
				
					
						
							
							
								dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							a8d2fafb79 
							
						 
					 
					
						
						
							
							Fix for wrong items per page calculation for the view  
						
						
						
						
					 
					
						2017-03-03 16:12:38 +01:00 
						 
				 
			
				
					
						
							
							
								dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							a1f2cc9975 
							
						 
					 
					
						
						
							
							Fix for issue  #67   https://github.com/dotnet/eShopOnContainers/issues/67  renamed Models folder to ViewModels in WebMVC  
						
						
						
						
					 
					
						2017-03-03 16:00:15 +01:00 
						 
				 
			
				
					
						
							
							
								etomas 
							
						 
					 
					
						
						
						
						
							
						
						
							b1b3abfcff 
							
						 
					 
					
						
						
							
							Merge branch 'idempotent-command'  
						
						
						
						
					 
					
						2017-03-03 12:11:12 +01:00 
						 
				 
			
				
					
						
							
							
								etomas 
							
						 
					 
					
						
						
						
						
							
						
						
							f9b15481d1 
							
						 
					 
					
						
						
							
							Idempotent updates based on requestid  
						
						
						
						
					 
					
						2017-03-03 12:03:31 +01:00 
						 
				 
			
				
					
						
							
							
								dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							a5e52cb435 
							
						 
					 
					
						
						
							
							Merge branch 'web-monolithic'  
						
						
						
						
					 
					
						2017-03-03 11:18:24 +01:00 
						 
				 
			
				
					
						
							
							
								dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							ce0e36bb82 
							
						 
					 
					
						
						
							
							Fix wrong calculation of items per page in catalog controller (last page was showing always 10)  
						
						
						
						
					 
					
						2017-03-03 11:10:39 +01:00 
						 
				 
			
				
					
						
							
							
								dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							e5c0340de5 
							
						 
					 
					
						
						
							
							Rename namespaces to the correct format.  
						
						
						
						
					 
					
						2017-03-03 10:22:28 +01:00 
						 
				 
			
				
					
						
							
							
								dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							bba34b73ab 
							
						 
					 
					
						
						
							
							Add use of tag-helpers instead of razor elements. Remove useless displayfor.  
						
						
						
						
					 
					
						2017-03-03 09:49:56 +01:00 
						 
				 
			
				
					
						
							
							
								dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							817edc8791 
							
						 
					 
					
						
						
							
							Add ef migrations to the monolithic application  
						
						
						
						
					 
					
						2017-03-02 17:37:31 +01:00 
						 
				 
			
				
					
						
							
							
								dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							fb2da83805 
							
						 
					 
					
						
						
							
							Fix in monolithic part for issue  #67   https://github.com/dotnet/eShopOnContainers/issues/67  ViewModels folder  
						
						
						
						
					 
					
						2017-03-02 16:59:03 +01:00 
						 
				 
			
				
					
						
							
							
								dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							76be6dbb1e 
							
						 
					 
					
						
						
							
							Solution changes due to VS 2017 version upgrade  
						
						
						
						
					 
					
						2017-03-02 16:18:17 +01:00 
						 
				 
			
				
					
						
							
							
								dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							2b67a3b4b2 
							
						 
					 
					
						
						
							
							Fix link to error view  
						
						
						
						
					 
					
						2017-03-02 16:17:20 +01:00 
						 
				 
			
				
					
						
							
							
								dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							812552cf3f 
							
						 
					 
					
						
						
							
							Add line to csproj for an issue with VS 2017 RTM  
						
						
						
						
					 
					
						2017-03-02 16:06:47 +01:00 
						 
				 
			
				
					
						
							
							
								dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							54636b7cbd 
							
						 
					 
					
						
						
							
							Remove unused css files for monolithic app  
						
						
						
						
					 
					
						2017-03-02 16:05:43 +01:00 
						 
				 
			
				
					
						
							
							
								etomas 
							
						 
					 
					
						
						
						
						
							
						
						
							32bb724d80 
							
						 
					 
					
						
						
							
							Simplifying use of windows containers  
						
						
						
						
					 
					
						2017-03-02 15:54:30 +01:00 
						 
				 
			
				
					
						
							
							
								dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							0716bff126 
							
						 
					 
					
						
						
							
							Removed hardcoded addresses for persisted picture uris  
						
						
						
						
					 
					
						2017-03-01 17:57:29 +01:00 
						 
				 
			
				
					
						
							
							
								dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							10ea5f74c9 
							
						 
					 
					
						
						
							
							Add css style for paginator  
						
						
						
						
					 
					
						2017-03-01 15:35:55 +01:00 
						 
				 
			
				
					
						
							
							
								dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							cb6b616581 
							
						 
					 
					
						
						
							
							Remove unused by default mvc core app elements  
						
						
						
						
					 
					
						2017-03-01 13:47:23 +01:00 
						 
				 
			
				
					
						
							
							
								dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							09944114a8 
							
						 
					 
					
						
						
							
							Add usage of persited data to populate the view.  
						
						
						
						
					 
					
						2017-03-01 12:23:39 +01:00 
						 
				 
			
				
					
						
							
							
								etomas 
							
						 
					 
					
						
						
						
						
							
						
						
							faa24c757c 
							
						 
					 
					
						
						
							
							Docker files added again  
						
						... 
						
						
						
						docker-use-platform creates mark file 
						
						
					 
					
						2017-03-01 12:03:37 +01:00 
						 
				 
			
				
					
						
							
							
								dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							37908c3f83 
							
						 
					 
					
						
						
							
							Add db connection and data model generation.  
						
						
						
						
					 
					
						2017-03-01 10:50:04 +01:00 
						 
				 
			
				
					
						
							
							
								Charles Lowell 
							
						 
					 
					
						
						
						
						
							
						
						
							75d5c3695a 
							
						 
					 
					
						
						
							
							Fix Identity.API and WebMVC publishing  
						
						... 
						
						
						
						- upgrade BundlerMinifier.Core dependencies (fixes a globbing bug)
- ensure minification includes all css
- only copy what's needed in production to the publish directory 
						
						
					 
					
						2017-02-28 15:01:52 -08:00 
						 
				 
			
				
					
						
							
							
								Charles Lowell 
							
						 
					 
					
						
						
						
						
							
						
						
							7755f30618 
							
						 
					 
					
						
						
							
							Use relative paths & URLs  
						
						
						
						
					 
					
						2017-02-28 14:54:22 -08:00 
						 
				 
			
				
					
						
							
							
								Charles Lowell 
							
						 
					 
					
						
						
						
						
							
						
						
							3df4f3a206 
							
						 
					 
					
						
						
							
							Configure service URLs via environment variables  
						
						
						
						
					 
					
						2017-02-28 14:54:21 -08:00 
						 
				 
			
				
					
						
							
							
								dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							400e44dc34 
							
						 
					 
					
						
						
							
							Add docker to the monolithic app  
						
						
						
						
					 
					
						2017-02-28 12:22:51 +01:00 
						 
				 
			
				
					
						
							
							
								dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							272781df41 
							
						 
					 
					
						
						
							
							Add filter logic for the catalog items  
						
						
						
						
					 
					
						2017-02-27 19:44:30 +01:00