Eduard Tomas
|
eeda5bcb9d
|
Order.Address is a value object. It has no table and no ID
|
2017-07-13 13:42:29 +02:00 |
|
Eduard Tomas
|
2f1f1cd616
|
Address as EF Value object
|
2017-07-13 12:34:19 +02:00 |
|
Eduard Tomas
|
2e64a97b4c
|
Changes for retrieving all claims under netcore2
|
2017-07-12 17:28:04 +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 |
|
Eduard Tomas
|
62a14e1006
|
Upgrade IntegrationEventLogEF to netcore2
|
2017-07-11 10:12:32 +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
|
ec78ef12c5
|
Separating menu options so it is clearer in the UI
|
2017-07-10 14:11:43 -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 |
|
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 |
|
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
|
92dde7e49d
|
Merge branch 'update-WebStatus' into dev
|
2017-07-06 11:40:29 +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 |
|
Christian Arenas
|
3f560757a4
|
cleanup
|
2017-07-05 13:38:34 +02:00 |
|
Christian Arenas
|
34e2e19269
|
Add DetailsUri property to CampaignItem and Add VIEW SITE button in campaign details when the DetailsUri exists
|
2017-07-05 13:38:19 +02:00 |
|
Christian Arenas
|
ae8d38bdf6
|
Add StringNullOrEmptyBoolConverter to check when string value is null or empty
|
2017-07-05 13:37:18 +02:00 |
|
Christian Arenas
|
66ee0039e5
|
Add StringNullOrEmptyBoolConverter to check when string value is null or empty
|
2017-07-05 13:37:06 +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
|
b172fb29d6
|
Merge branch 'adapt-xamarin-new-order-workflow' into dev
|
2017-06-26 19:22:44 +02:00 |
|
Christian Arenas
|
83e425da2b
|
Add Cancel button in order detail view when the status is submitted and add requestId guid to create a new order
|
2017-06-26 18:32:25 +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
|
a6cef8009c
|
replace main banner in SPA app
|
2017-06-23 12:04:40 -07: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 |
|
Christian Arenas
|
4f198f179e
|
Add a shipped order mock
|
2017-06-23 13:01:57 +02:00 |
|
Christian Arenas
|
4f54dae03d
|
Rename OrderState property to OrderStatus and add new status items
|
2017-06-23 12:57:25 +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
|
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 |
|
Christian Arenas
|
290057789b
|
Add styling
|
2017-06-22 19:05:34 +02:00 |
|
Eduard Tomas
|
340d50fddd
|
WebStatus Nuget updated
|
2017-06-22 16:56:10 +02:00 |
|
Eduard Tomas
|
fdd9a36719
|
MVC auth updated to 2.0.0
|
2017-06-22 16:55:57 +02:00 |
|