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
|
7 years ago |
Eduard Tomas
|
62a14e1006
|
Upgrade IntegrationEventLogEF to netcore2
|
7 years ago |
Cesar De la Torre
|
96c55b8682
|
Minor change in docker-compose.prod
|
7 years ago |
Cesar De la Torre
|
27fae7c5d3
|
Fixed namespace copied/pasted from the Locations.API service into the Marketing service
|
7 years ago |
Cesar De la Torre
|
260b2cdf2c
|
Added a comment about the simulated payment
|
7 years ago |
Cesar De la Torre
|
ec78ef12c5
|
Separating menu options so it is clearer in the UI
|
7 years ago |
Cesar De la Torre
|
6b18c36f26
|
Eliminated the GracePeriod Logger message when querying as it is not needed and is quite anoying.
|
7 years ago |
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
|
7 years ago |
Ramón Tomás
|
cee8d6e9e5
|
Added documentation for deploying Marketing Azure functions
|
7 years ago |
Ramón Tomás
|
59c9b21420
|
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
|
7 years ago |
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
|
7 years ago |
Christian Arenas
|
540f7510b9
|
Create a mvctest client, check when is the environment variable UseLoadTest in MVC project to true
|
7 years ago |
Ramón Tomás
|
e1d8a8e23e
|
Fix UI styles MVCApp
|
7 years ago |
Christian Arenas
|
c367b01791
|
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
|
7 years ago |
Christian Arenas
|
d440198180
|
Add release/debug docker-compose file to project
|
7 years ago |
dsanz
|
ecf9933908
|
Add readme.md for the .env variables
|
7 years ago |
dsanz
|
a8ad3edf30
|
Add Azure Storage Account Health Checks to Marketing.API
|
7 years ago |
Christian Arenas
|
b74a1b6db5
|
Add 100 stock units to products
|
7 years ago |
Christian Arenas
|
4a3e2d4612
|
rename ESHOP_AZURE_STORAGE_ACCOUNT_NAME/KEY variable to ESHOP_AZURE_STORAGE_CATALOG_NAME/KEY
|
7 years ago |
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
|
7 years ago |
Christian Arenas
|
ee698ad483
|
Create a new solution named Azure Functions and remove the marketing azure function from ServiceAndWebApps
|
7 years ago |
Christian Arenas
|
bb377f0ff7
|
Add marketing storage ARM
|
7 years ago |
Christian Arenas
|
8cb861dab8
|
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
|
7 years ago |
Christian Arenas
|
32415615b9
|
Add azure function ACR
|
7 years ago |
dsanz
|
fd97ed8765
|
Fix issue
|
7 years ago |
dsanz
|
92dde7e49d
|
Merge branch 'update-WebStatus' into dev
|
7 years ago |
dsanz
|
8051114da9
|
Add Azure Storage check in Catalog health checks.
|
7 years ago |
Christian Arenas
|
b240357c3a
|
Check when CampaignDetailFunctionUri is not null and return DetailsUri
|
7 years ago |
Eduard Tomas
|
cc6c443216
|
Upfate catalog config on k8s
|
7 years ago |
Christian Arenas
|
3f560757a4
|
cleanup
|
7 years ago |
Christian Arenas
|
34e2e19269
|
Add DetailsUri property to CampaignItem and Add VIEW SITE button in campaign details when the DetailsUri exists
|
7 years ago |
Christian Arenas
|
ae8d38bdf6
|
Add StringNullOrEmptyBoolConverter to check when string value is null or empty
|
7 years ago |
Christian Arenas
|
66ee0039e5
|
Add StringNullOrEmptyBoolConverter to check when string value is null or empty
|
7 years ago |
dsanz
|
eb7abbc984
|
Merge branch 'dev' into update-WebStatus
|
7 years ago |
Christian Arenas
|
060cc48cf4
|
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
|
7 years ago |
Eduard Tomas
|
7258a58f5b
|
All docker compose to version 2.1 that seems to work in vsts hosted linux build agent
|
7 years ago |
dsanz
|
a65e9c01eb
|
Add Healthchecks to Locations.API and MArketing.API
|
7 years ago |
Eduard Tomas
|
e9b4235543
|
use version '2' for docker-compose.ci.build.yml
Higher versions seems to not be compatible with hosted linux build agent
|
7 years ago |
Christian Arenas
|
d6e140a49b
|
Add PictureFileName seed and add rename PictureUri column name to PictureFileName
|
7 years ago |
Christian Arenas
|
595988779f
|
Add GetItems load test
|
7 years ago |
Eduard Tomas
|
4fe02d9b44
|
k8s deployment
config moved from custom json to standard k8s yaml
|
7 years ago |
Christian Arenas
|
1837bf2032
|
Add Ordering Api test and cleanup tests
|
7 years ago |
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
|
7 years ago |
Eduard Tomas
|
c997fe0881
|
Add cloud.json reference config.file. It contains invalid values.
|
7 years ago |
Eduard Tomas
|
00e6ab58d8
|
Update k8s script and doc
|
7 years ago |
Christian Arenas
|
ee8da23999
|
Add basket test
|
7 years ago |
Ramón Tomás
|
f993463856
|
Implemented service bus for marketing.api locations.api graceperiodProcess payment.api
|
7 years ago |
Christian Arenas
|
bbcc23d053
|
Add GetBasket and GetUserCampaigns, and cleanup
|
7 years ago |
Eduard Tomas
|
d65a112535
|
References updated to preview-2
code adjustements to work with preview-2
|
7 years ago |
Christian Arenas
|
3a5f1b8232
|
Add Marketing, locations, payment and gracePeriod Subscription in servicebus ARM file
|
7 years ago |