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 |
|
Ramón Tomás
|
e20223b6e2
|
Included Aspnetcore.all metapackage
|
2017-08-29 12:14:10 +02:00 |
|
Ramón Tomás
|
364c07a528
|
Included AspnetCore.all metapackage
|
2017-08-29 12:03:20 +02:00 |
|
Ramón Tomás
|
b44b347ea9
|
Merge branch 'dev' into netcore2
|
2017-08-23 16:43:02 +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 |
|
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 |
|
Eduard Tomàs
|
31d71d0f1f
|
update angular-cli
|
2017-08-10 12:11:21 +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
|
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 |
|
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 |
|
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
|
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 |
|
Eduard Tomas
|
0a1f14f1f1
|
WebSPA nuget update
|
2017-06-22 16:19:54 +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 |
|
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
|
4be61abdde
|
Merge new creation ordering workflow
|
2017-06-12 13:52:23 +02:00 |
|
Ramón Tomás
|
d018d00b68
|
Update settings
|
2017-06-09 12:33:59 +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 |
|
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 |
|
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 |
|
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
|
c5778a04f3
|
.NET core packages update
|
2017-05-19 08:11:18 +03:00 |
|
Ramón Tomás
|
87e57b9a44
|
Merge from Dev
|
2017-05-18 15:39:31 +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
|
83a33bc8fd
|
Merge from Dev
|
2017-05-10 15:07:54 +02:00 |
|
Ramón Tomás
|
afd3fe2fe5
|
Fix issue SPA HealthCheck Urls
|
2017-05-10 15:01:02 +02:00 |
|
Eduard Tomas
|
c33a6ecdf0
|
Commenting non-wanted task in csproj
|
2017-05-09 21:04:04 +02:00 |
|
Eduard Tomas
|
37cef95fec
|
Use good endpoints for healthcheck
|
2017-05-09 16:59:23 +02:00 |
|
Eduard Tomas
|
95af2d9a02
|
Autorefresh on healthchecks with config timeout
|
2017-05-09 13:54:45 +02:00 |
|
Cesar De la Torre
|
3917701e7a
|
eBook renamed
|
2017-05-08 12:26:07 -07:00 |
|
Cesar De la Torre
|
417a795f17
|
Updated the Microservices eBook
|
2017-05-08 12:05:33 -07:00 |
|