Christian Arenas
|
8494e77687
|
add version 1 to Campaigns web api
|
7 years ago |
Christian Arenas
|
ac5daa6146
|
add version 1 to Campaigns web api
|
7 years ago |
Christian Arenas
|
83b229f4a1
|
rename file name
|
7 years ago |
Christian Arenas
|
314768b9ce
|
rename file name
|
7 years ago |
Christian Arenas
|
f993c8c33d
|
Remove unused class
|
7 years ago |
Christian Arenas
|
baab0d2a98
|
Remove unused class
|
7 years ago |
Christian Arenas
|
37af8a0e82
|
Merge remote-tracking branch 'origin/dev' into marketingcampaing
# Conflicts:
# eShopOnContainers-ServicesAndWebApps.sln
|
7 years ago |
Christian Arenas
|
8d3ae671a8
|
Merge remote-tracking branch 'origin/dev' into marketingcampaing
# Conflicts:
# eShopOnContainers-ServicesAndWebApps.sln
|
7 years ago |
Ramón Tomás
|
bae10b07b8
|
Created UserLocationModel
Map Position to Locations APi
Update current user location
|
7 years ago |
Ramón Tomás
|
13cfe43378
|
Created UserLocationModel
Map Position to Locations APi
Update current user location
|
7 years ago |
Christian Arenas
|
32247c503d
|
Add marketing api
|
7 years ago |
Christian Arenas
|
9b95bd9762
|
Add marketing api
|
7 years ago |
Eduard Tomas
|
b42fe3527a
|
Resilience enhancements.
MVC app now waits other containers
|
7 years ago |
Eduard Tomas
|
694253d4e9
|
Resilience enhancements.
MVC app now waits other containers
|
7 years ago |
Christian Arenas
|
665733c40e
|
Add marketing resource to identity
|
7 years ago |
Christian Arenas
|
3a8481086c
|
Add marketing resource to identity
|
7 years ago |
Christian Arenas
|
6082359f08
|
Add docker support
|
7 years ago |
Christian Arenas
|
4b86ca0a77
|
Add docker support
|
7 years ago |
Christian Arenas
|
1ac1dae9d3
|
Add Marketing.API project
|
7 years ago |
Christian Arenas
|
4dc8b65e8b
|
Add Marketing.API project
|
7 years ago |
Christian Arenas
|
39e69ee4e0
|
Merge branch 'servicebus' into dev
# Conflicts:
# docker-compose.override.yml
# src/Services/Catalog/Catalog.API/CatalogSettings.cs
# src/Services/Catalog/Catalog.API/settings.json
|
7 years ago |
Christian Arenas
|
5794e25d6e
|
Merge branch 'azurestorage' into dev
|
7 years ago |
Christian Arenas
|
4d07fecc3b
|
fix merge error
|
7 years ago |
Christian Arenas
|
ea02ecc160
|
Merge branch 'azureredis' into dev
# Conflicts:
# src/Services/Basket/Basket.API/Startup.cs
# src/Services/Basket/Basket.API/appsettings.json
|
7 years ago |
Christian Arenas
|
18167186c9
|
Apply EventBusConnectionChanges
|
7 years ago |
Christian Arenas
|
83ae0d48fc
|
remove ServiceBusConnectionString variable from appsettings.json
|
7 years ago |
Christian Arenas
|
7694602be2
|
Rename property PictureFile to PictureFileName in Migration Designer
|
7 years ago |
Christian Arenas
|
2cad62d642
|
Add ESHOP_AZURE_REDIS variable from .env with default value
|
7 years ago |
Christian Arenas
|
9866aae07c
|
Change version of docker-compose from 2 to 2.1 for default values.
I set "http://localhost:5101/api/v1/pic/" because docker-compose doesn't allow to declare another variable such as default value
|
7 years ago |
Christian Arenas
|
1a385a2179
|
Add AzureStorageEnabled environment variable to get the origin of the product image from PicBaseUrl environment variable
|
7 years ago |
Christian Arenas
|
45ed8a60ad
|
Add PictureFileName field for saving the name of the file. PictureUri will be the url of the image (api or azure storage)
|
7 years ago |
Ramón Tomás
|
9d5cde2057
|
#2412-Create Location Microservice
|
7 years ago |
Ramón Tomás
|
83166cde12
|
#2412-Create Location Microservice
|
7 years ago |
Christian Arenas
|
6b480e3d41
|
Apply ConnectionString changes (remove condition)
|
7 years ago |
Christian Arenas
|
e309d97d18
|
remove AzureRedisConnectionString variable from settings
|
7 years ago |
Eduard Tomàs
|
d678052b4f
|
Merge pull request #204 from frankibem/patch-1
Update ProfileService.cs
|
7 years ago |
Eduard Tomàs
|
5a1eac2404
|
Merge pull request #204 from frankibem/patch-1
Update ProfileService.cs
|
7 years ago |
Eduard Tomas
|
64b9ea6f79
|
Redis deploy ARM template and doc
|
7 years ago |
Christian Arenas
|
2d4f9d3323
|
Add ESHOP_AZURE_SERVICE_BUS variable from .env with default value
|
7 years ago |
Christian Arenas
|
0473a97225
|
change the "AzureRedisEnabled" condition to configure declaration
|
7 years ago |
Eduard Tomas
|
ad1637e76b
|
Merge branch 'servicebus' of https://github.com/dotnet-architecture/eShopOnAzure into servicebus
|
7 years ago |
Eduard Tomas
|
bd03600aaa
|
sql template updated
|
7 years ago |
Christian Arenas
|
60c08ce9c5
|
Revert "Remove basket.data from docker-compose"
This reverts commit 9549786003 .
|
7 years ago |
Christian Arenas
|
db7d2a3ff3
|
Add "AzureRedisConnectionString" environment variable and add a connectionString condition when "AzureRedisEnabled" environment variable is true
|
7 years ago |
Christian Arenas
|
41a6814293
|
Add new connection string
|
7 years ago |
Eduard Tomas
|
ec7a251839
|
Service Bus deploy template and doc
|
7 years ago |
Ramón Tomás
|
af2d37bcc6
|
Changed Xamarin app authentication to Hybrid flow mode
|
7 years ago |
Ramón Tomás
|
99890b9379
|
Changed Xamarin app authentication to Hybrid flow mode
|
7 years ago |
Ramón Tomás
|
2a64d2245f
|
Merge branch 'dev' into hybrid-flow-xamarin
|
7 years ago |
Ramón Tomás
|
9d44a397b0
|
Merge branch 'dev' into hybrid-flow-xamarin
|
7 years ago |