eiximenis
							
						 
					 | 
					
						
						
						
						
							
						
						
							51236fd5af
							
						
					 | 
					
						
						
							
							Update to netcore2.1 RTM
						
						
						
						
						
						
						
						Updates to web Dockerfiles to support microsoft/dotnet:2.1-sdk 
						
						
					 | 
					
						2018-06-01 18:59:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Unai Zorrilla Castro
							
						 
					 | 
					
						
						
						
						
							
						
						
							d1b6bc84fa
							
						
					 | 
					
						
						
							
							Migrated projects and references to use 2.1 rc1 libraries
						
						
						
						
						
						
					 | 
					
						2018-05-15 12:42:08 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miguel Veloso
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							455b2562ee
							
						
					 | 
					
						
						
							
							Merge pull request #529 from raboud/CreateOrder
						
						
						
						
						
						
						
						Create order 
						
						
					 | 
					
						2018-03-18 17:29:50 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miguel Veloso
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							49cf975af5
							
						
					 | 
					
						
						
							
							Fixed PackageId for consistency
						
						
						
						
						
						
					 | 
					
						2018-03-18 17:27:59 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miguel Veloso
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							b12b536439
							
						
					 | 
					
						
						
							
							Merge pull request #524 from SychevIgor/packagesupdate
						
						
						
						
						
						
						
						packages update 
						
						
					 | 
					
						2018-03-17 16:25:58 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sychev Igor
							
						 
					 | 
					
						
						
						
						
							
						
						
							ccad354645
							
						
					 | 
					
						
						
							
							packages update
						
						
						
						
						
						
					 | 
					
						2018-03-04 14:10:51 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Robert Raboud
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e2bd35285
							
						
					 | 
					
						
						
							
							Assembly name was incorrect
						
						
						
						
						
						
					 | 
					
						2018-03-02 21:54:35 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miguel Veloso
							
						 
					 | 
					
						
						
						
						
							
						
						
							62a40c3109
							
						
					 | 
					
						
						
							
							Fixed dummy basket data so CreateOrderCommand created from it passes validations.
						
						
						
						
						
						
					 | 
					
						2018-03-01 23:15:25 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							e9a89ae553
							
						
					 | 
					
						
						
							
							Fixed issue #403
						
						
						
						
						
						
						
						Fixed issue #419 
						
						
					 | 
					
						2017-12-11 16:25:00 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bradley Grainger
							
						 
					 | 
					
						
						
						
						
							
						
						
							f42c32c63b
							
						
					 | 
					
						
						
							
							Fix xUnit warnings.
						
						
						
						
						
						
					 | 
					
						2017-11-03 12:22:42 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							5c19eef316
							
						
					 | 
					
						
						
							
							Fix issue StackExchange.Redis strongname
						
						
						
						
						
						
					 | 
					
						2017-10-23 12:49:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							f671cc692b
							
						
					 | 
					
						
						
							
							Fix Unit, Integration and Functional Tests
						
						
						
						
						
						
					 | 
					
						2017-10-20 15:29:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RamonTC
							
						 
					 | 
					
						
						
						
						
							
						
						
							d0e9cc58a9
							
						
					 | 
					
						
						
							
							Merge pull request #311 from egorikas/dev
						
						
						
						
						
						
						
						Fix "DRY up RedisBasketRepository" 
						
						
					 | 
					
						2017-10-13 16:41:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Sychev
							
						 
					 | 
					
						
						
						
						
							
						
						
							e1c93bd05a
							
						
					 | 
					
						
						
							
							update to latest packages
						
						
						
						
						
						
					 | 
					
						2017-10-13 13:04:06 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Sychev
							
						 
					 | 
					
						
						
						
						
							
						
						
							7dfb2db7c3
							
						
					 | 
					
						
						
							
							packages update and clean up *.csproj files from useless content
						
						
						
						
						
						
					 | 
					
						2017-10-13 13:04:06 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Egor Grishechko
							
						 
					 | 
					
						
						
						
						
							
						
						
							62ea7064c2
							
						
					 | 
					
						
						
							
							Fix "DRY up RedisBasketRepository"
						
						
						
						
						
						
						
						https://github.com/dotnet-architecture/eShopOnContainers/issues/62 
						
						
					 | 
					
						2017-09-02 20:02:55 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							05aa265c60
							
						
					 | 
					
						
						
							
							Updated aspnetcore.host to v2.0 in testing projects
						
						
						
						
						
						
					 | 
					
						2017-08-30 18:51:22 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							c9ff332b84
							
						
					 | 
					
						
						
							
							Fix merging duplicated ConfigureAuth method
						
						
						
						
						
						
					 | 
					
						2017-08-30 08:59:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ed7325e0e
							
						
					 | 
					
						
						
							
							Downgrade Identity.api version due to compatibility issues
						
						
						
						
						
						
						
						Updated Test project version
Fix issue Idsrv token 
						
						
					 | 
					
						2017-08-29 18:11:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							2baedadc7a
							
						
					 | 
					
						
						
							
							Merge from Dev
						
						
						
						
						
						
					 | 
					
						2017-08-22 19:46:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							4e9524c9b0
							
						
					 | 
					
						
						
							
							Add new basket api url to test
						
						
						
						
						
						
					 | 
					
						2017-07-12 12:41:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eduard Tomas
							
						 
					 | 
					
						
						
						
						
							
						
						
							d9b9578e48
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into netcore2
						
						
						
						
						
						
						
						# Conflicts:
#	docker-compose.dcproj
#	docker-compose.vs.debug.yml
#	docker-compose.vs.release.yml
#	src/BuildingBlocks/EventBus/EventBus/EventBus.csproj
#	src/Services/Marketing/Marketing.API/Startup.cs
#	src/Web/WebMVC/Startup.cs
#	src/Web/WebMVC/WebMVC.csproj 
						
						
					 | 
					
						2017-07-11 12:01:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eduard Tomas
							
						 
					 | 
					
						
						
						
						
							
						
						
							d65a112535
							
						
					 | 
					
						
						
							
							References updated to preview-2
						
						
						
						
						
						
						
						code adjustements to work with preview-2 
						
						
					 | 
					
						2017-06-29 18:36:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							ddcb665bcd
							
						
					 | 
					
						
						
							
							Edit the test assert
						
						
						
						
						
						
					 | 
					
						2017-06-28 18:06:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							6a0001b9c6
							
						
					 | 
					
						
						
							
							Add new LoadTest project, add new Catalog integration test and add new webMVC load test
						
						
						
						
						
						
					 | 
					
						2017-06-28 17:59:59 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							e80c5efdd3
							
						
					 | 
					
						
						
							
							Add details view and add marketing scope in mvc project and identity config
						
						
						
						
						
						
					 | 
					
						2017-06-16 01:20:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							46db196633
							
						
					 | 
					
						
						
							
							Remove url from test
						
						
						
						
						
						
					 | 
					
						2017-06-15 19:23:33 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							4ba9d66423
							
						
					 | 
					
						
						
							
							Add new environment variables values to appsettings
						
						
						
						
						
						
					 | 
					
						2017-06-14 16:21:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							486ba1872a
							
						
					 | 
					
						
						
							
							Modify marketing functional test
						
						
						
						
						
						
					 | 
					
						2017-06-13 18:00:09 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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
							
						 
					 | 
					
						
						
						
						
							
						
						
							06f978bc97
							
						
					 | 
					
						
						
							
							Modify test. UserId is a Guid type
						
						
						
						
						
						
					 | 
					
						2017-06-12 20:18:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							4be61abdde
							
						
					 | 
					
						
						
							
							Merge new creation ordering workflow
						
						
						
						
						
						
					 | 
					
						2017-06-12 13:52:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							0337932697
							
						
					 | 
					
						
						
							
							Merge locations feature  branch
						
						
						
						
						
						
					 | 
					
						2017-06-09 12:43:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							ea6084db28
							
						
					 | 
					
						
						
							
							Added location.api integration tests
						
						
						
						
						
						
					 | 
					
						2017-06-09 12:16:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							05bd964f2b
							
						
					 | 
					
						
						
							
							Adapt Locations.api to nosql db
						
						
						
						
						
						
					 | 
					
						2017-06-08 17:33:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							6ff6864f91
							
						
					 | 
					
						
						
							
							Edit the integration test
						
						
						
						
						
						
					 | 
					
						2017-06-06 14:19:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							ea8d893d4e
							
						
					 | 
					
						
						
							
							change the FakeCampaignDto private object to an GetFakeCampaignDto funtion
						
						
						
						
						
						
					 | 
					
						2017-06-05 19:36:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e47c840d5
							
						
					 | 
					
						
						
							
							Add integration test
						
						
						
						
						
						
					 | 
					
						2017-06-02 16:33:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							bae10b07b8
							
						
					 | 
					
						
						
							
							Created UserLocationModel
						
						
						
						
						
						
						
						Map Position to Locations APi
Update current user location 
						
						
					 | 
					
						2017-06-01 20:16:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							1ac1dae9d3
							
						
					 | 
					
						
						
							
							Add Marketing.API project
						
						
						
						
						
						
					 | 
					
						2017-06-01 10:10:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							9d5cde2057
							
						
					 | 
					
						
						
							
							#2412-Create Location Microservice
						
						
						
						
						
						
					 | 
					
						2017-05-30 15:01:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								igorsych
							
						 
					 | 
					
						
						
						
						
							
						
						
							9e75504690
							
						
					 | 
					
						
						
							
							Newtonsoft.Json and MediatR with fixes of all based on MediatR classes
						
						
						
						
						
						
						
						also from csproj files excluded direct specification of runtime to make compile happy if on a system we have higher version. 
						
						
					 | 
					
						2017-05-19 18:03:05 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								igorsych
							
						 
					 | 
					
						
						
						
						
							
						
						
							85b61a2bfd
							
						
					 | 
					
						
						
							
							Test packages update to the latest version
						
						
						
						
						
						
						
						Redis and RabbitMQ also updated
Identity server changes reflectiong  ac59db6e16 commit 
						
						
					 | 
					
						2017-05-19 09:02:05 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							6c9d2cdb31
							
						
					 | 
					
						
						
							
							Adapt test cases to new order flow
						
						
						
						
						
						
						
						Create new service test cases 
						
						
					 | 
					
						2017-05-18 08:40:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							afc247da67
							
						
					 | 
					
						
						
							
							Change SPA app to call basket for order checkout
						
						
						
						
						
						
					 | 
					
						2017-05-16 09:23:35 +02:00 | 
					
					
						
						
							
							
							
						
					 |