Cesar De la Torre
|
a3fad613bc
|
Fixed ZIP file that was corrupted
|
2017-08-14 15:41:38 -07:00 |
|
Eduard Tomàs
|
8b414ca7ec
|
Merge branch 'dev'
|
2017-08-11 09:15:17 +02:00 |
|
Eduard Tomàs
|
0c73b09406
|
Using MediatR behaviors instead of Autofac decorators. Solves #187
|
2017-08-10 16:05:42 +02:00 |
|
Eduard Tomàs
|
8683efcaf9
|
Merge branch 'dev'
# Conflicts:
# docs/Enterprise-Application-Patterns-using-XamarinForms.pdf
|
2017-08-10 09:07:33 +02:00 |
|
David Britch
|
666a9c8735
|
Implemented PKCE in the authentication flow in the Xamarin client. Fixes #214
|
2017-08-08 15:44:54 +01:00 |
|
Cesar De la Torre
|
5588515abf
|
Fix bug for Linux environment. Case sensitive. It has to be CatalogItems.zip
|
2017-08-06 15:50:23 -07:00 |
|
Cesar De la Torre
|
9b9db6b721
|
temp rename for file with wrong case letter. It will be CatalogItems.zip
|
2017-08-06 15:49:25 -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 |
|
Ramón Tomás
|
d289ec00cf
|
Add swagger authorization option in APIs
|
2017-07-12 12:10:10 +02:00 |
|
Christian Arenas
|
f0f88aee98
|
Add PicBaseUrl with a replaced parameter
|
2017-07-11 12:43:06 +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 |
|
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
|
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 |
|
Shaun Walker
|
632c023a3f
|
strip quotes, fix image transparency, format price and amount
|
2017-06-22 17:26:57 -07:00 |
|
Shaun Walker
|
9229a8d0fd
|
support for additional CatalogItem properties
|
2017-06-21 15:27:12 -07: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 |
|
Christian Arenas
|
c88ece26e6
|
Change condition in Campaign from and to
|
2017-06-16 12:09:48 +02:00 |
|