n-stefan
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							5974647b52
							
						
					 | 
					
						
						
							
							Fix WebSPA catalog filter (#1637)
						
						
						
						
						
						
					 | 
					
						2021-03-25 14:21:53 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								n-stefan
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							68f5afd09c
							
						
					 | 
					
						
						
							
							Fix WebSPA pager display (#1629)
						
						
						
						
						
						
					 | 
					
						2021-03-15 12:22:46 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Borja García Rodríguez
							
						 
					 | 
					
						
						
						
						
							
						
						
							98552b7785
							
						
					 | 
					
						
						
							
							delete marketing and locations references
						
						
						
						
						
						
					 | 
					
						2020-12-21 16:44:02 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Borja García Rodríguez
							
						 
					 | 
					
						
						
						
						
							
						
						
							f53e2c0286
							
						
					 | 
					
						
						
							
							remove campaings from SPA
						
						
						
						
						
						
					 | 
					
						2020-12-21 15:47:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Carlos de Miguel Ferrero
							
						 
					 | 
					
						
						
						
						
							
						
						
							ab3059665a
							
						
					 | 
					
						
						
							
							Fix CampaignDetailFunctionEnabled required when conf isReady
						
						
						
						
						
						
					 | 
					
						2020-12-16 15:34:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Carlos de Miguel Ferrero
							
						 
					 | 
					
						
						
						
						
							
						
						
							279dc6f1c0
							
						
					 | 
					
						
						
							
							Fixed call  error when filter item is applied
						
						
						
						
						
						
					 | 
					
						2020-12-15 17:18:55 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Carlos de Miguel Ferrero
							
						 
					 | 
					
						
						
						
						
							
						
						
							634d42022b
							
						
					 | 
					
						
						
							
							Upgrade to ng version 9
						
						
						
						
						
						
					 | 
					
						2020-12-15 15:51:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Carlos de Miguel Ferrero
							
						 
					 | 
					
						
						
						
						
							
						
						
							687dc56418
							
						
					 | 
					
						
						
							
							Prepare to update ng version
						
						
						
						
						
						
					 | 
					
						2020-12-15 15:21:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sumit Ghosh
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							d910eb416d
							
						
					 | 
					
						
						
							
							Fixed invalid number format in webspa (#1496)
						
						
						
						
						
						
					 | 
					
						2020-10-21 16:34:21 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								epique@plainconcepts.com
							
						 
					 | 
					
						
						
						
						
							
						
						
							5f1bdbcc47
							
						
					 | 
					
						
						
							
							Fix npm & docker build warnings #1224
						
						
						
						
						
						
						
						Update Angular 7 to 8 to fix warnings and vulnerabilities 
						
						
					 | 
					
						2020-01-24 10:32:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miguel Veloso
							
						 
					 | 
					
						
						
						
						
							
						
						
							5a442cb7c0
							
						
					 | 
					
						
						
							
							Don't force LongPolling for SignalR
						
						
						
						
						
						
					 | 
					
						2019-12-16 18:52:12 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miguel Veloso
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd536dce4d
							
						
					 | 
					
						
						
							
							Fix SignalR + SPA through Envoy
						
						
						
						
						
						
					 | 
					
						2019-12-02 21:56:48 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Miguel Veloso
							
						 
					 | 
					
						
						
						
						
							
						
						
							30aeec8b72
							
						
					 | 
					
						
						
							
							Remove SignalR transport parameter on clients
						
						
						
						
						
						
					 | 
					
						2019-11-16 15:41:25 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eiximenis
							
						 
					 | 
					
						
						
						
						
							
						
						
							d68c9e40aa
							
						
					 | 
					
						
						
							
							Configuration of envoy routes and minor code fixes
						
						
						
						
						
						
					 | 
					
						2019-09-19 18:26:04 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ericuss
							
						 
					 | 
					
						
						
						
						
							
						
						
							01b8d50f64
							
						
					 | 
					
						
						
							
							format
						
						
						
						
						
						
					 | 
					
						2019-09-04 15:02:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ericuss
							
						 
					 | 
					
						
						
						
						
							
						
						
							791e7d646c
							
						
					 | 
					
						
						
							
							standarize the productId type
						
						
						
						
						
						
					 | 
					
						2019-09-04 15:02:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jmanuelcorral
							
						 
					 | 
					
						
						
						
						
							
						
						
							a1909521fd
							
						
					 | 
					
						
						
							
							Fixed NPM Issues and nuget packages
						
						
						
						
						
						
					 | 
					
						2019-03-21 15:24:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							ad76fa01ad
							
						
					 | 
					
						
						
							
							Fixed broken UI in SPA after migrating to Bootstrap 4
						
						
						
						
						
						
					 | 
					
						2018-09-28 14:22:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							dc767eb51c
							
						
					 | 
					
						
						
							
							Fixed issue header not included in requests
						
						
						
						
						
						
						
						Fixed issue httpclient returned response 
						
						
					 | 
					
						2018-09-28 10:14:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								IvanFarkas
							
						 
					 | 
					
						
						
						
						
							
						
						
							f7e2255666
							
						
					 | 
					
						
						
							
							Updated WebSPA to Angular 6, Bootstrap 4, HttpClient and new rxjs
						
						
						
						
						
						
					 | 
					
						2018-08-29 13:59:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Unai Zorrilla Castro
							
						 
					 | 
					
						
						
						
						
							
						
						
							5c06f6e500
							
						
					 | 
					
						
						
							
							Fix issue 685
						
						
						
						
						
						
					 | 
					
						2018-07-31 11:30:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							04560ff4eb
							
						
					 | 
					
						
						
							
							Created specific service for signalr hub
						
						
						
						
						
						
					 | 
					
						2018-04-19 00:58:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							08e8a4ba26
							
						
					 | 
					
						
						
							
							Added signalr client service to SPA app
						
						
						
						
						
						
					 | 
					
						2018-04-13 17:10:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eiximenis
							
						 
					 | 
					
						
						
						
						
							
						
						
							a34ed28445
							
						
					 | 
					
						
						
							
							SPA adapted to gateway
						
						
						
						
						
						
					 | 
					
						2018-02-28 15:40:22 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eiximenis
							
						 
					 | 
					
						
						
						
						
							
						
						
							152fcc8205
							
						
					 | 
					
						
						
							
							Fixed errors and updated config
						
						
						
						
						
						
					 | 
					
						2018-02-27 17:29:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eiximenis
							
						 
					 | 
					
						
						
						
						
							
						
						
							8cfb74fe93
							
						
					 | 
					
						
						
							
							Fixing SPA for using aggregators
						
						
						
						
						
						
					 | 
					
						2018-02-27 13:10:39 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eduard Tomàs
							
						 
					 | 
					
						
						
						
						
							
						
						
							6cc87fc80a
							
						
					 | 
					
						
						
							
							renaming of PurchaseBff to Aggregator
						
						
						
						
						
						
					 | 
					
						2018-02-15 17:30:39 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eduard Tomàs
							
						 
					 | 
					
						
						
						
						
							
						
						
							0be655d2e0
							
						
					 | 
					
						
						
							
							Fixing errors in SPA when calling basket api through apigw
						
						
						
						
						
						
					 | 
					
						2018-02-07 14:15:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eduard Tomàs
							
						 
					 | 
					
						
						
						
						
							
						
						
							8edd736196
							
						
					 | 
					
						
						
							
							Updating SPA for working with PurchaseBFF.
						
						
						
						
						
						
					 | 
					
						2018-02-06 18:35:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								PLAINCONCEPTS\lruiz
							
						 
					 | 
					
						
						
						
						
							
						
						
							8d14869ca0
							
						
					 | 
					
						
						
							
							Fix bug #259
						
						
						
						
						
						
					 | 
					
						2017-08-23 11:06:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								PLAINCONCEPTS\lruiz
							
						 
					 | 
					
						
						
						
						
							
						
						
							a6acdabf85
							
						
					 | 
					
						
						
							
							Fix bug #283
						
						
						
						
						
						
					 | 
					
						2017-08-22 20:03:48 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								PLAINCONCEPTS\lruiz
							
						 
					 | 
					
						
						
						
						
							
						
						
							737bddadc2
							
						
					 | 
					
						
						
							
							Fix issue #259
						
						
						
						
						
						
					 | 
					
						2017-08-22 18:03:12 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							485505a7be
							
						
					 | 
					
						
						
							
							Adapt changed Basket.Api url to Mvc and SPA apps
						
						
						
						
						
						
					 | 
					
						2017-07-12 12:43:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							84a2d500a7
							
						
					 | 
					
						
						
							
							Added alert when error ocurrs listing catalog products, orders and campaigns in SPA app
						
						
						
						
						
						
					 | 
					
						2017-07-11 13:48:07 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							06cbab4731
							
						
					 | 
					
						
						
							
							Merge branch 'feature/marketing-details-azure-function' into dev
						
						
						
						
						
						
						
						# Conflicts:
#	docker-compose.vs.debug.yml
#	docker-compose.vs.release.yml
#	eShopOnContainers-ServicesAndWebApps.sln
#	src/Services/Location/Locations.API/Startup.cs
#	src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs
#	src/Services/Marketing/Marketing.API/Marketing.API.csproj
#	src/Services/Marketing/Marketing.API/Startup.cs
#	src/Web/WebMVC/appsettings.json
#	src/Web/WebSPA/AppSettings.cs
#	test/Services/FunctionalTests/Services/Marketing/MarketingScenarios.cs 
						
						
					 | 
					
						2017-07-07 11:56:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							525040b9b6
							
						
					 | 
					
						
						
							
							Created Azure functions for details campaign
						
						
						
						
						
						
						
						Adapt MVC app to azure function details campaign
Adapt SPA app to azure function details campaign 
						
						
					 | 
					
						2017-06-30 16:31:22 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Shaun Walker
							
						 
					 | 
					
						
						
						
						
							
						
						
							a6cef8009c
							
						
					 | 
					
						
						
							
							replace main banner in SPA app
						
						
						
						
						
						
					 | 
					
						2017-06-23 12:04:40 -07: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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							847f145bc2
							
						
					 | 
					
						
						
							
							Update spa marketing campaign view
						
						
						
						
						
						
					 | 
					
						2017-06-19 10:21:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							9fee40e358
							
						
					 | 
					
						
						
							
							Created marketing campaigns view details
						
						
						
						
						
						
					 | 
					
						2017-06-19 09:46:48 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							249c7a5105
							
						
					 | 
					
						
						
							
							Display marketing campaign details SPA
						
						
						
						
						
						
					 | 
					
						2017-06-19 09:46:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							a9c185a41a
							
						
					 | 
					
						
						
							
							Updated number of products in catalog stock
						
						
						
						
						
						
						
						Orders list ordered
Refresh orders list periodically
Fix bug SPA basket not dropped after creating order 
						
						
					 | 
					
						2017-06-14 16:38:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							8c2af8c048
							
						
					 | 
					
						
						
							
							Clean Basket event is launched once basket is converted to order and before starting creating order.
						
						
						
						
						
						
						
						Change grace period time  to 1 minute
Remove unecessary clean basket methods on client 
						
						
					 | 
					
						2017-05-24 16:09:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							afc247da67
							
						
					 | 
					
						
						
							
							Change SPA app to call basket for order checkout
						
						
						
						
						
						
					 | 
					
						2017-05-16 09:23:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Arenas
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ae4d93a54
							
						
					 | 
					
						
						
							
							Add Order Description field
						
						
						
						
						
						
					 | 
					
						2017-05-11 16:04:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							fa048c22c1
							
						
					 | 
					
						
						
							
							Merge from Dev
						
						
						
						
						
						
					 | 
					
						2017-05-04 11:57:49 +02: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 | 
					
					
						
						
							
							
							
						
					 |