Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							e1d8a8e23e 
							
						 
					 
					
						
						
							
							Fix UI styles MVCApp  
						
						 
						
						
						
						
					 
					
						2017-07-10 14:24:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eduard Tomas 
							
						 
					 
					
						
						
						
						
							
						
						
							96c3f5c2bc 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/feature/data-and-ui-customization-v2' into dev  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	docker-compose.override.yml
#	src/Web/WebMVC/WebMVC.csproj
#	src/Web/WebMVC/wwwroot/css/shared/components/identity/identity.css
#	src/Web/WebMVC/wwwroot/css/site.min.css
#	src/Web/WebSPA/AppSettings.cs 
						
						
					 
					
						2017-06-28 12:20:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Shaun Walker 
							
						 
					 
					
						
						
						
						
							
						
						
							632c023a3f 
							
						 
					 
					
						
						
							
							strip quotes, fix image transparency, format price and amount  
						
						 
						
						
						
						
					 
					
						2017-06-22 17:26:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Shaun Walker 
							
						 
					 
					
						
						
						
						
							
						
						
							445101b376 
							
						 
					 
					
						
						
							
							data and UI customization enhancements  
						
						 
						
						
						
						
					 
					
						2017-06-20 12:54:32 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eduard Tomas 
							
						 
					 
					
						
						
						
						
							
						
						
							11a5293fa0 
							
						 
					 
					
						
						
							
							Merge branch 'k8s-update' into dev  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	docker-compose.yml 
						
						
					 
					
						2017-06-20 16:50:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eduard Tomas 
							
						 
					 
					
						
						
						
						
							
						
						
							30f7759fa1 
							
						 
					 
					
						
						
							
							Unwanted file  
						
						 
						
						
						
						
					 
					
						2017-06-19 19:07:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eduard Tomas 
							
						 
					 
					
						
						
						
						
							
						
						
							018f6e9342 
							
						 
					 
					
						
						
							
							Minor issues fixed  
						
						 
						
						... 
						
						
						
						Use current branch as tag 
						
						
					 
					
						2017-06-19 19:01:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Arenas 
							
						 
					 
					
						
						
						
						
							
						
						
							a894e22b74 
							
						 
					 
					
						
						
							
							Add Campaigns.components style  
						
						 
						
						
						
						
					 
					
						2017-06-15 19:22:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							4be61abdde 
							
						 
					 
					
						
						
							
							Merge new creation ordering workflow  
						
						 
						
						
						
						
					 
					
						2017-06-12 13:52:23 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							152bc9fd01 
							
						 
					 
					
						
						
							
							Merge new creation ordering workflow  
						
						 
						
						
						
						
					 
					
						2017-06-12 13:52:23 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							3a10038d71 
							
						 
					 
					
						
						
							
							Fix bug antiforgery decryption issue when deploying in a k8s cluster  
						
						 
						
						... 
						
						
						
						Changed in-memory grant store in idsrv to persist in db 
						
						
					 
					
						2017-06-08 17:45:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							6c855e57c5 
							
						 
					 
					
						
						
							
							Fix bug antiforgery decryption issue when deploying in a k8s cluster  
						
						 
						
						... 
						
						
						
						Changed in-memory grant store in idsrv to persist in db 
						
						
					 
					
						2017-06-08 17:45:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							4410e455e0 
							
						 
					 
					
						
						
							
							Updates to target .NET Core 1.1.2 - Version changes at every .csproj file, dockerfile and the docker-compose.ci.build.yml file for building from the CLI.  
						
						 
						
						
						
						
					 
					
						2017-05-25 17:01:10 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							ad4142b94f 
							
						 
					 
					
						
						
							
							Updates to target .NET Core 1.1.2 - Version changes at every .csproj file, dockerfile and the docker-compose.ci.build.yml file for building from the CLI.  
						
						 
						
						
						
						
					 
					
						2017-05-25 17:01:10 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							7b63c8d409 
							
						 
					 
					
						
						
							
							Added the WebStatus WatchDog to the Kubernetes cluster deployment  
						
						 
						
						
						
						
					 
					
						2017-05-19 17:19:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							c3ca81b03c 
							
						 
					 
					
						
						
							
							Added the WebStatus WatchDog to the Kubernetes cluster deployment  
						
						 
						
						
						
						
					 
					
						2017-05-19 17:19:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							f79806e899 
							
						 
					 
					
						
						
							
							Created Ship order process in WebMVC app  
						
						 
						
						... 
						
						
						
						Create Ship order command and handler in Ordering.api
Create Order management page in WebMVC app 
						
						
					 
					
						2017-05-14 14:48:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							e104da9f85 
							
						 
					 
					
						
						
							
							Created Ship order process in WebMVC app  
						
						 
						
						... 
						
						
						
						Create Ship order command and handler in Ordering.api
Create Order management page in WebMVC app 
						
						
					 
					
						2017-05-14 14:48:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							4c0f0b01ad 
							
						 
					 
					
						
						
							
							Removed NMP INSTALL from docker-compose.ci.build.yml. Shouldn't need to do that every time.  
						
						 
						
						
						
						
					 
					
						2017-05-06 23:28:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							14cbbe6bcb 
							
						 
					 
					
						
						
							
							Removed NMP INSTALL from docker-compose.ci.build.yml. Shouldn't need to do that every time.  
						
						 
						
						
						
						
					 
					
						2017-05-06 23:28:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								RamonTC 
							
						 
					 
					
						
						
						
						
							
						
						
							9c6b54a7fc 
							
						 
					 
					
						
						
							
							Merge pull request  #167  from andrelmp/dev  
						
						 
						
						... 
						
						
						
						Upgrade to angular-cli and Angular 4 
						
						
					 
					
						2017-04-25 10:29:31 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								RamonTC 
							
						 
					 
					
						
						
						
						
							
						
						
							1ccc87e743 
							
						 
					 
					
						
						
							
							Merge pull request  #167  from andrelmp/dev  
						
						 
						
						... 
						
						
						
						Upgrade to angular-cli and Angular 4 
						
						
					 
					
						2017-04-25 10:29:31 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andre Passos 
							
						 
					 
					
						
						
						
						
							
						
						
							db1fa9fd5c 
							
						 
					 
					
						
						
							
							update to angular-cli and angular 4  
						
						 
						
						
						
						
					 
					
						2017-04-13 13:06:22 -03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andre Passos 
							
						 
					 
					
						
						
						
						
							
						
						
							7b1d11e4a8 
							
						 
					 
					
						
						
							
							update to angular-cli and angular 4  
						
						 
						
						
						
						
					 
					
						2017-04-13 13:06:22 -03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							411883fddc 
							
						 
					 
					
						
						
							
							Added wwwroot/lib folders to gitignore  
						
						 
						
						
						
						
					 
					
						2017-04-11 16:05:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							cb780add8f 
							
						 
					 
					
						
						
							
							Added wwwroot/lib folders to gitignore  
						
						 
						
						
						
						
					 
					
						2017-04-11 16:05:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eduard Tomas 
							
						 
					 
					
						
						
						
						
							
						
						
							5b9b92397d 
							
						 
					 
					
						
						
							
							Updates to dockerfile / docker-compose for windows containers  
						
						 
						
						
						
						
					 
					
						2017-03-24 13:15:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DESKTOP-V1VLQ15\dsanz 
							
						 
					 
					
						
						
						
						
							
						
						
							0c4f8a49dd 
							
						 
					 
					
						
						
							
							WebMVC and WebSPA show now a changed price in the basket list  
						
						 
						
						
						
						
					 
					
						2017-03-15 14:57:08 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							9ccf7f11ce 
							
						 
					 
					
						
						
							
							Changes for CLI compatibility and New .PDF version  
						
						 
						
						
						
						
					 
					
						2017-02-16 12:31:53 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								PLAINCONCEPTS\ccanizares 
							
						 
					 
					
						
						
						
						
							
						
						
							cdffaf1ce1 
							
						 
					 
					
						
						
							
							MVC: Add To Cart bug.  
						
						 
						
						... 
						
						
						
						SPA: Add To Cart 'bug', Update Basket. 
						
						
					 
					
						2017-01-11 12:23:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								PLAINCONCEPTS\ccanizares 
							
						 
					 
					
						
						
						
						
							
						
						
							b426becd23 
							
						 
					 
					
						
						
							
							.  
						
						 
						
						
						
						
					 
					
						2017-01-04 17:41:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								PLAINCONCEPTS\ccanizares 
							
						 
					 
					
						
						
						
						
							
						
						
							6c64c72896 
							
						 
					 
					
						
						
							
							.  
						
						 
						
						
						
						
					 
					
						2017-01-04 17:40:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Carlos Cañizares Estévez 
							
						 
					 
					
						
						
						
						
							
						
						
							f2681b93d2 
							
						 
					 
					
						
						
							
							SPA: Merge  
						
						 
						
						
						
						
					 
					
						2016-12-30 12:28:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Carlos Cañizares Estévez 
							
						 
					 
					
						
						
						
						
							
						
						
							a42f47b3f6 
							
						 
					 
					
						
						
							
							SPA: Observable for basket-status refresh when basket is dropped  
						
						 
						
						
						
						
					 
					
						2016-12-30 12:26:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quique Fernandez 
							
						 
					 
					
						
						
						
						
							
						
						
							de5c81b9d7 
							
						 
					 
					
						
						
							
							Fix uppercase text on some views on both websites  
						
						 
						
						
						
						
					 
					
						2016-12-30 12:07:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quique Fernandez 
							
						 
					 
					
						
						
						
						
							
						
						
							4104e6d931 
							
						 
					 
					
						
						
							
							Fix Edge and IE11 bug with pointer-events  
						
						 
						
						
						
						
					 
					
						2016-12-30 11:55:48 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quique Fernandez 
							
						 
					 
					
						
						
						
						
							
						
						
							9bd73c42cb 
							
						 
					 
					
						
						
							
							Fix pager styles on SPA and MVC webstes  
						
						 
						
						
						
						
					 
					
						2016-12-29 18:52:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quique Fernandez 
							
						 
					 
					
						
						
						
						
							
						
						
							423cee76b6 
							
						 
					 
					
						
						
							
							minify css and fix fonts paths  
						
						 
						
						
						
						
					 
					
						2016-12-29 17:56:48 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quique Fernandez 
							
						 
					 
					
						
						
						
						
							
						
						
							fcefa53f81 
							
						 
					 
					
						
						
							
							beautify css  
						
						 
						
						
						
						
					 
					
						2016-12-29 17:45:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quique Fernandez 
							
						 
					 
					
						
						
						
						
							
						
						
							78265984af 
							
						 
					 
					
						
						
							
							add orders css to mvc app  
						
						 
						
						
						
						
					 
					
						2016-12-29 17:19:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quique Fernandez 
							
						 
					 
					
						
						
						
						
							
						
						
							35ef9740db 
							
						 
					 
					
						
						
							
							Update some MVC componentes  
						
						 
						
						
						
						
					 
					
						2016-12-29 17:16:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quique Fernandez 
							
						 
					 
					
						
						
						
						
							
						
						
							f1a662e3e0 
							
						 
					 
					
						
						
							
							Upate all CSS on MVW website  
						
						 
						
						
						
						
					 
					
						2016-12-29 12:16:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Carlos Cañizares Estévez 
							
						 
					 
					
						
						
						
						
							
						
						
							6f6530b5f6 
							
						 
					 
					
						
						
							
							SPA: Login Logout (Identity Component)  
						
						 
						
						
						
						
					 
					
						2016-12-27 10:32:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Carlos Cañizares Estévez 
							
						 
					 
					
						
						
						
						
							
						
						
							d8a0d9bb66 
							
						 
					 
					
						
						
							
							BasketApi: Add authorizationHeader (pass bearer from Swagger Ui to authorize request...).  
						
						 
						
						... 
						
						
						
						MVC: Solve some design feedback (filter selector in catalog)
CatalogApi: Move models from infrastructure to Model folder. 
						
						
					 
					
						2016-12-21 11:30:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Carlos Cañizares Estévez 
							
						 
					 
					
						
						
						
						
							
						
						
							0e7e4e41d7 
							
						 
					 
					
						
						
							
							MVC: Solve feedback, improve validations  
						
						 
						
						... 
						
						
						
						Identity: Solve Microsoft Edge problem
Ordering: Remove application tier 
						
						
					 
					
						2016-12-20 12:22:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Carlos Cañizares Estévez 
							
						 
					 
					
						
						
						
						
							
						
						
							10f3e17b55 
							
						 
					 
					
						
						
							
							Add Swagger to Basket Api  
						
						 
						
						... 
						
						
						
						SQL databases with the same prefix for services
Move application tier to api tier in ordering api 
						
						
					 
					
						2016-12-19 10:20:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Carlos Cañizares Estévez 
							
						 
					 
					
						
						
						
						
							
						
						
							31753fc057 
							
						 
					 
					
						
						
							
							MVC: Finish Orders integration (detail), validations, some refactor ...  
						
						 
						
						... 
						
						
						
						Orders: Detail Query, new field in OrderDetail..
Identity: Validations in Register View, ensure all claims are returned in user end point.. 
						
						
					 
					
						2016-12-17 14:41:16 +01:00