ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,278 Commits 36 Branches 19 Tags 655 MiB
Commit Graph

443 Commits

Author SHA1 Message Date
Ramón Tomás
480723e351 Merge branch 'dev' into eShopOnServiceFabric-Win 2017-09-15 14:21:23 +02:00
Ramón Tomás
cecdc40ac1 Fix Authentication issue in Locations.api 
Created input in user campaigns view to update the user's location
 2017-09-15 13:54:48 +02:00
Ramón Tomás
2cad76c134 Merge from Dev 2017-09-08 12:17:14 +02:00
Eduard Tomàs
7321d5e5fc Base path fix and k8s config updated 2017-09-07 19:18:53 +02:00
Ramón Tomás
89cbbb43f7 Test base_path 2017-09-07 15:46:08 +02:00
Ramón Tomás
17395497e5 Added PathBase WebMVC 2017-09-07 13:39:13 +02:00
Ramón Tomás
9fc4bfea7b Merge branch 'netcore2' into eShopOnServiceFabric-Win 2017-09-06 15:27:07 +02:00
Ramón Tomás
03e4559b30 Created last services added to eShop 
Updated with latest configurations
 2017-09-06 15:23:14 +02:00
Unai Zorrilla Castro
7be5cb933d Update BundlerMinimifier.Core version to netcoreapp2 2017-09-05 20:24:58 +02:00
Eduard Tomàs
8198126daf Use dotnet multi-architecture images. 
Removing docker-compose.windows.override (not needed as is identical to docker-compose.override)
 2017-09-04 19:07:53 +02:00
RamonTC
4ea8f6814e Merge pull request #299 from SychevIgor/SychevIgor/WindowsDockerFiles20 
windows docker files update to 2.0 base images
 2017-08-30 17:55:26 +02:00
Igor Sychev
dc566ea2a1 nanowin 2017-08-30 08:48:06 +03: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
Unai Zorrilla Castro
cd78d98436 Updated Identity.API to preview version of IdentityServer4, Fix breaking changes. Not well tested 2017-08-29 12:12:45 +02:00
Unai Zorrilla Castro
acefa64465 Updated Program and Startup to new .NETCoreApp2.0 templates. Minor refactorings 2017-08-29 11:40:23 +02:00
Ramón Tomás
4161efdd70 Update authentication middleware 
Update global to sdk 2.0.0
 2017-08-23 16:40:28 +02:00
Ramón Tomás
8288acf3a4 Update projects from netcore 2.0.0 preview to 2.0.0 
Fix netcore 2.0.0 breaking changes in authentication middleware
 2017-08-22 22:36:23 +02:00
Ramón Tomás
2baedadc7a Merge from Dev 2017-08-22 19:46:53 +02:00
Ramón Tomás
eb4396e659 Fix accountcontroller signin unit test 2017-08-21 17:57:53 +02:00
Cesar De la Torre
4876dd562d Merge pull request #222 from SychevIgor/IdentityInMVCFix 
Identity in mvc fix
 2017-08-16 14:11:15 -07:00
Cesar De la Torre
dca1b5eedd Updated UserSecrets() obsolete API to AddUserSecrets<Startup>() update heading NET Core 2.0. See: https://github.com/aspnet/Announcements/issues/223 2017-08-16 13:47:07 -07:00
Cesar De la Torre
ca4fb143dd Merge pull request #218 from SychevIgor/bootstrapversionfix 
bootstrap version consolidated across all ui based apps. latest stabl…
 2017-08-16 13:27:54 -07:00
IgorSychev
f16d0ddffe 2 Views survived after identity redesign. 
In AccountController we don't have view for index action it's also looks like a some rudement
 2017-08-16 22:00:44 +03:00
IgorSychev
dd100f643c we are not using identityparser in AccountController. we can drop it from a constructor 2017-08-16 22:00:44 +03:00
IgorSychev
e624150866 bootstrap version consolidated across all ui based apps. latest stable version is 3.3.7 
bootstrap version was inconsistent in WebMVC app. js was from 3.3.6, but css from 4.0.0-alpha.5. 4.0.0-alpha.5 was introduced in a commit
	Author:		Quique Fernandez <e.fernandez@plainconcepts.com>#mailto:e.fernandez@plainconcepts.com
	Date:		6 months ago (2016-12-29 7:16:26 PM)
	Commit hash:	35ef9740db30e7e50f00b432a54b2597cac73e72
	Parent(s):	f1a662e3e0
 2017-08-16 21:59:24 +03:00
IgorSychev
c43d1922a1 Error action extracted from CatalogController, because otherwise was violated Single Responsibility Principal, when even to generate an Error we will create Transient ICatalogService for each error. 2017-08-16 21:55:40 +03:00
Cesar De la Torre
e017008c85 Setting docker-compose.ci.build.yml to restore and build the bits directly with the .sln instead of the Linux Script. 2017-08-06 16:35:23 -07:00
Ramón Tomás
d42033a83b Added UI alert and circuit-breaker handlers for components that depend on Basket.api 2017-07-14 14:53:17 +02:00
Ramón Tomás
f39fdb92ca Fix Failing middleware and move it to Basket.api 2017-07-13 17:35:19 +02:00
Eduard Tomas
2e64a97b4c Changes for retrieving all claims under netcore2 2017-07-12 17:28:04 +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
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
Cesar De la Torre
ec78ef12c5 Separating menu options so it is clearer in the UI 2017-07-10 14:11:43 -07:00
Ramón Tomás
59c9b21420 Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev 2017-07-10 16:04:18 +02:00
Christian Arenas
03f23eafa4 Merge branch 'load-testing' into dev 
# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
#	src/Services/Identity/Identity.API/Configuration/Config.cs
#	src/Web/WebMVC/appsettings.json
 2017-07-10 14:40:26 +02:00
Christian Arenas
540f7510b9 Create a mvctest client, check when is the environment variable UseLoadTest in MVC project to true 2017-07-10 14:25:03 +02:00
Ramón Tomás
e1d8a8e23e Fix UI styles MVCApp 2017-07-10 14:24:01 +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
dsanz
a65e9c01eb Add Healthchecks to Locations.API and MArketing.API 2017-07-04 13:51:05 +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
Ramón Tomás
f993463856 Implemented service bus for marketing.api locations.api graceperiodProcess payment.api 2017-06-30 08:59:26 +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
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
b172fb29d6 Merge branch 'adapt-xamarin-new-order-workflow' into dev 2017-06-26 19:22:44 +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
Eduard Tomas
65bcf48246 Dealing with auth and package versions issues between 1.1 and 2.0 2017-06-23 18:45:20 +02:00
Shaun Walker
632c023a3f strip quotes, fix image transparency, format price and amount 2017-06-22 17:26:57 -07:00
Eduard Tomas
eba0a53562 fixed invalid WebMVC csproj entries 2017-06-22 20:13:12 +02:00
Eduard Tomas
636ec01415 fixed invalid WebMVC csproj entries 2017-06-22 20:11:36 +02:00
Eduard Tomas
fdd9a36719 MVC auth updated to 2.0.0 2017-06-22 16:55:57 +02:00