Ramón Tomás
|
981f4e2730
|
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
|
2017-06-08 17:45:21 +02:00 |
|
Ramón Tomás
|
3a10038d71
|
Fix bug antiforgery decryption issue when deploying in a k8s cluster
Changed in-memory grant store in idsrv to persist in db
|
2017-06-08 17:45:07 +02:00 |
|
Ramón Tomás
|
05bd964f2b
|
Adapt Locations.api to nosql db
|
2017-06-08 17:33:55 +02:00 |
|
Ramón Tomás
|
27fd97b92e
|
Merge from Dev
|
2017-06-07 17:54:53 +02:00 |
|
Ramón Tomás
|
8c0d41e4ad
|
Fix issue Autofac IAsyncRequestHandler not registered with Mediatr 3.0
|
2017-06-06 19:20:42 +02:00 |
|
Christian Arenas
|
ce56a42bd1
|
Redesign marketing campaign api in two different controllers (campaigns/locations)
|
2017-06-06 14:18:46 +02:00 |
|
Christian Arenas
|
56c07aaafa
|
Edit campaigns controller
|
2017-06-06 10:26:11 +02:00 |
|
Christian Arenas
|
3c81115603
|
Edit mapper methods
|
2017-06-05 23:20:46 +02:00 |
|
Ramón Tomás
|
375780e3a4
|
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
|
2017-06-05 21:54:13 +02:00 |
|
Ramón Tomás
|
41101164fa
|
Persist identity grant store to db
Persist machine Keys to Redis
|
2017-06-05 21:54:03 +02:00 |
|
Christian Arenas
|
ea8d893d4e
|
change the FakeCampaignDto private object to an GetFakeCampaignDto funtion
|
2017-06-05 19:36:09 +02:00 |
|
Christian Arenas
|
b5f90cf7b4
|
Create RuleType class to manage RuleTypeEnum
|
2017-06-03 01:00:55 +02:00 |
|
Christian Arenas
|
a8178fbbb4
|
remove unused dbset
|
2017-06-03 00:59:58 +02:00 |
|
Christian Arenas
|
385f1f094a
|
fix error merge
|
2017-06-02 16:36:16 +02:00 |
|
Christian Arenas
|
82182e3184
|
cleanup
|
2017-06-02 16:35:21 +02:00 |
|
Christian Arenas
|
c349596ca7
|
Merge branch 'marketingcampaign' of https://github.com/dotnet-architecture/eShopOnContainers into marketingcampaign
# Conflicts:
# src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs
|
2017-06-02 16:34:37 +02:00 |
|
Christian Arenas
|
6dcc6f84bc
|
initialitze the list in constructor
|
2017-06-02 16:32:50 +02:00 |
|
Christian Arenas
|
4c59c5ebe4
|
Add migration folder
|
2017-06-02 16:32:24 +02:00 |
|
Christian Arenas
|
3440427da3
|
modify context
|
2017-06-02 16:31:48 +02:00 |
|
Christian Arenas
|
c132d944d7
|
update inital migration
|
2017-06-02 16:31:35 +02:00 |
|
Christian Arenas
|
1bd13747f4
|
Add exceptions filters
|
2017-06-02 16:31:03 +02:00 |
|
Christian Arenas
|
a5aea54cc8
|
Add dtos
|
2017-06-02 16:30:39 +02:00 |
|
Ramón Tomás
|
d657428e78
|
Merge from Dev
|
2017-06-02 13:22:40 +02:00 |
|
Christian Arenas
|
8494e77687
|
add version 1 to Campaigns web api
|
2017-06-01 22:19:07 +02:00 |
|
Christian Arenas
|
83b229f4a1
|
rename file name
|
2017-06-01 22:13:19 +02:00 |
|
Christian Arenas
|
f993c8c33d
|
Remove unused class
|
2017-06-01 20:26:10 +02:00 |
|
Christian Arenas
|
37af8a0e82
|
Merge remote-tracking branch 'origin/dev' into marketingcampaing
# Conflicts:
# eShopOnContainers-ServicesAndWebApps.sln
|
2017-06-01 20:19:33 +02:00 |
|
Ramón Tomás
|
bae10b07b8
|
Created UserLocationModel
Map Position to Locations APi
Update current user location
|
2017-06-01 20:16:19 +02:00 |
|
Christian Arenas
|
32247c503d
|
Add marketing api
|
2017-06-01 20:15:21 +02:00 |
|
Eduard Tomas
|
b42fe3527a
|
Resilience enhancements.
MVC app now waits other containers
|
2017-06-01 14:32:22 +02:00 |
|
Christian Arenas
|
665733c40e
|
Add marketing resource to identity
|
2017-06-01 10:10:37 +02:00 |
|
Christian Arenas
|
1ac1dae9d3
|
Add Marketing.API project
|
2017-06-01 10:10:00 +02:00 |
|
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
|
2017-05-30 18:47:34 +02:00 |
|
Christian Arenas
|
5794e25d6e
|
Merge branch 'azurestorage' into dev
|
2017-05-30 18:35:18 +02:00 |
|
Christian Arenas
|
4d07fecc3b
|
fix merge error
|
2017-05-30 18:35:09 +02:00 |
|
Christian Arenas
|
ea02ecc160
|
Merge branch 'azureredis' into dev
# Conflicts:
# src/Services/Basket/Basket.API/Startup.cs
# src/Services/Basket/Basket.API/appsettings.json
|
2017-05-30 18:32:28 +02:00 |
|
Christian Arenas
|
18167186c9
|
Apply EventBusConnectionChanges
|
2017-05-30 17:59:57 +02:00 |
|
Christian Arenas
|
83ae0d48fc
|
remove ServiceBusConnectionString variable from appsettings.json
|
2017-05-30 17:56:36 +02:00 |
|
Christian Arenas
|
7694602be2
|
Rename property PictureFile to PictureFileName in Migration Designer
|
2017-05-30 17:53:15 +02:00 |
|
Christian Arenas
|
1a385a2179
|
Add AzureStorageEnabled environment variable to get the origin of the product image from PicBaseUrl environment variable
|
2017-05-30 17:16:17 +02:00 |
|
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)
|
2017-05-30 17:14:28 +02:00 |
|
Ramón Tomás
|
9d5cde2057
|
#2412-Create Location Microservice
|
2017-05-30 15:01:58 +02:00 |
|
Christian Arenas
|
6b480e3d41
|
Apply ConnectionString changes (remove condition)
|
2017-05-29 16:04:35 +02:00 |
|
Christian Arenas
|
e309d97d18
|
remove AzureRedisConnectionString variable from settings
|
2017-05-29 16:03:51 +02:00 |
|
Christian Arenas
|
0473a97225
|
change the "AzureRedisEnabled" condition to configure declaration
|
2017-05-29 12:42:51 +02:00 |
|
Christian Arenas
|
db7d2a3ff3
|
Add "AzureRedisConnectionString" environment variable and add a connectionString condition when "AzureRedisEnabled" environment variable is true
|
2017-05-29 11:01:56 +02:00 |
|
Christian Arenas
|
41a6814293
|
Add new connection string
|
2017-05-29 10:12:07 +02:00 |
|
Ramón Tomás
|
2a64d2245f
|
Merge branch 'dev' into hybrid-flow-xamarin
|
2017-05-29 08:31:49 +02:00 |
|
Ramón Tomás
|
5482ccdf0d
|
Changed Xamarin app authentication to Hybrid flow
|
2017-05-29 08:30:33 +02:00 |
|
Christian Arenas
|
cd790f276f
|
Update StackExchange.Redis version
|
2017-05-27 18:35:44 +02:00 |
|