Ramón Tomás
b44b347ea9
Merge branch 'dev' into netcore2
2017-08-23 16:43:02 +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
PLAINCONCEPTS\lruiz
8d14869ca0
Fix bug #259
2017-08-23 11:06:50 +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
PLAINCONCEPTS\lruiz
a6acdabf85
Fix bug #283
2017-08-22 20:03:48 +02:00
Ramón Tomás
2baedadc7a
Merge from Dev
2017-08-22 19:46:53 +02:00
PLAINCONCEPTS\lruiz
737bddadc2
Fix issue #259
2017-08-22 18:03:12 +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
Cesar De la Torre
6af0bd02de
Merge pull request #217 from SychevIgor/AIdeleted
...
ApplicationInsights deleted from 3 projects.
2017-08-16 13:20:23 -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
5075d5af98
ApplicationInsights deleted from 3 projects. 2
2017-08-16 21:57:58 +03:00
IgorSychev
d35dc2ea17
ApplicationInsights deleted from 3 projects.
2017-08-16 21:57:58 +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
Eduard Tomàs
82cc1f028f
Merge pull request #219 from SychevIgor/healthcheckcleanup
...
Healthcheckcleanup
2017-08-11 16:02:00 +02:00
Eduard Tomàs
31d71d0f1f
update angular-cli
2017-08-10 12:11:21 +02: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
87ea62cc66
Updated docker compose files for windows
2017-08-03 12:59:38 +02:00
Ramón Tomás
3c39ec5092
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
2017-07-14 14:53:35 +02: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
Cesar De la Torre
c7c176c4c1
Changed HealthCheck Cache duration time (Zero == No Cache) configuration for the Basket microservice. This is better for demos and can be changed at any time.
2017-07-13 14:48:55 -07: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
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
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
Cesar De la Torre
740caee4ae
Minor changes to the GracePeriodManager: Moved to the Ordering folder as it is part of the same BOUNDED CONTEXT or Ordering BUSINESS MICROSERVICE. Also, changed a log description when querying the database
2017-07-10 13:32:22 -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
Ramón Tomás
a3e63c11aa
Merge from eShopOnContainers Dev
2017-06-26 13:51:49 +02:00
Shaun Walker
a6cef8009c
replace main banner in SPA app
2017-06-23 12:04:40 -07: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
