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
27fae7c5d3
Fixed namespace copied/pasted from the Locations.API service into the Marketing service
2017-07-10 14:49:26 -07:00
Cesar De la Torre
260b2cdf2c
Added a comment about the simulated payment
2017-07-10 14:17:16 -07:00
Cesar De la Torre
6b18c36f26
Eliminated the GracePeriod Logger message when querying as it is not needed and is quite anoying.
2017-07-10 13:37:55 -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
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
Dexter Valkyrie
24ca050458
Update Startup.cs
...
The more general `builder.AddUserSecrets();` is deprecated and will not be available in ASP.NET Core 2.0. You must now qualify it with a type parameter.
2017-07-08 09:53:43 +01:00
dsanz
a8ad3edf30
Add Azure Storage Account Health Checks to Marketing.API
2017-07-07 14:05:52 +02:00
Christian Arenas
b74a1b6db5
Add 100 stock units to products
2017-07-07 12:36:26 +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
8051114da9
Add Azure Storage check in Catalog health checks.
2017-07-06 11:38:45 +02:00
Christian Arenas
b240357c3a
Check when CampaignDetailFunctionUri is not null and return DetailsUri
2017-07-06 08:44:46 +02:00
dsanz
eb7abbc984
Merge branch 'dev' into update-WebStatus
2017-07-05 11:08:59 +02:00
dsanz
a65e9c01eb
Add Healthchecks to Locations.API and MArketing.API
2017-07-04 13:51:05 +02:00
Christian Arenas
d6e140a49b
Add PictureFileName seed and add rename PictureUri column name to PictureFileName
2017-07-04 12:01:09 +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
10d03a68e3
Merge remote-tracking branch 'eShopOnAzure/dev' into dev
...
# Conflicts:
# docker-compose.override.yml
# src/Services/Catalog/Catalog.API/CatalogSettings.cs
# src/Services/Catalog/Catalog.API/Controllers/CatalogController.cs
# src/Services/Catalog/Catalog.API/Controllers/PicController.cs
# src/Services/Catalog/Catalog.API/Infrastructure/CatalogContextSeed.cs
# src/Services/Catalog/Catalog.API/settings.json
# src/Services/Ordering/Ordering.API/Startup.cs
2017-06-28 12:40:21 +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
699ec0001d
Create IdentityService in marketing API
2017-06-26 18:31:04 +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
a56f99f684
Fix merge
2017-06-26 18:05:02 +02:00
Ramón Tomás
a3e63c11aa
Merge from eShopOnContainers Dev
2017-06-26 13:51:49 +02:00
Shaun Walker
18b91ee5f1
minor fixes to data and UI customization
2017-06-23 11:49:25 -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
Eduard Tomas
c28b693db9
Dockerfile of Payment.API upgraded to v2
2017-06-23 10:55:48 +02:00
Shaun Walker
632c023a3f
strip quotes, fix image transparency, format price and amount
2017-06-22 17:26:57 -07:00
Eduard Tomas
6b466a2c66
Fixing NetStandard.Library versions
2017-06-22 16:15:58 +02:00
Shaun Walker
9229a8d0fd
support for additional CatalogItem properties
2017-06-21 15:27:12 -07:00
Eduard Tomas
286b8e4344
Unwanted fwk reference in GracePeriodManager
2017-06-21 19:57:36 +02:00
Eduard Tomas
17dc20077d
Payment.API nuget updated
2017-06-21 19:50:01 +02:00
Eduard Tomas
3c2ce4d7a7
Ordering.API nuget update
2017-06-21 19:48:13 +02:00
Eduard Tomas
706423cc8d
Marketing.API nuget updated
2017-06-21 19:43:02 +02:00
Eduard Tomas
4303cbae89
Locations.API nuget updated
2017-06-21 19:39:47 +02:00
Eduard Tomas
4069a3a048
Catalog.API nuget updated
2017-06-21 19:36:33 +02:00
Eduard Tomas
ea129609d5
Basket.API nuget updated
2017-06-21 19:33:24 +02:00
Eduard Tomas
5d383dbaad
GracePeriodManager nuget updated
2017-06-21 19:10:12 +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
Christian Arenas
a65254e385
Merge branch 'feature/track-user-location-mongodb' into dev
2017-06-21 11:48:38 +02:00
Christian Arenas
123cd9e1c1
Add point of union from the polygon
2017-06-21 11:47:34 +02:00
Christian Arenas
cae44bcbba
Add Barcelona location seed
2017-06-21 11:06:33 +02:00
Shaun Walker
445101b376
data and UI customization enhancements
2017-06-20 12:54:32 -07:00
Ramón Tomás
e1a007edfa
Merge display marketing campaigns feature for SPA app
2017-06-19 16:58:26 +02:00
Ramón Tomás
9d76e79e53
Merge from marketing banner mvc
2017-06-19 09:50:07 +02:00
Ramón Tomás
9fee40e358
Created marketing campaigns view details
2017-06-19 09:46:48 +02:00
Christian Arenas
b36a05b64b
Optimize query
2017-06-19 09:41:24 +02:00
Christian Arenas
ed97efaf61
Check when the user doesn't have any location in database
2017-06-19 00:34:00 +02:00
Christian Arenas
db4403b75c
Add Pagination to Campaign View
...
(cherry picked from commit 86e40512352a44021ea69ed948062d0b510141cf)
2017-06-16 16:51:35 +02:00
