David Britch
|
f406c55894
|
Update README.md
|
2017-06-05 16:19:54 +01:00 |
|
David Britch
|
33fd78420f
|
Update README.md
|
2017-06-05 16:19:54 +01:00 |
|
Christian Arenas
|
b5f90cf7b4
|
Create RuleType class to manage RuleTypeEnum
|
2017-06-03 01:00:55 +02:00 |
|
Christian Arenas
|
7842194637
|
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
|
2111d56766
|
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
|
f058cfde21
|
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
|
345b71b50e
|
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
|
1e3fd13362
|
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
|
ae7f1e8e7a
|
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
|
a705127653
|
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
|
59b8fed228
|
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
|
5f976e90d4
|
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
|
05fe4ccd6d
|
Add exceptions filters
|
2017-06-02 16:31:03 +02:00 |
|
Christian Arenas
|
a5aea54cc8
|
Add dtos
|
2017-06-02 16:30:39 +02:00 |
|
Christian Arenas
|
d4ab5b24d2
|
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 |
|
Ramón Tomás
|
31ca759662
|
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
|
ac5daa6146
|
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
|
314768b9ce
|
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
|
baab0d2a98
|
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 |
|
Christian Arenas
|
8d3ae671a8
|
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 |
|
Ramón Tomás
|
13cfe43378
|
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 |
|
Christian Arenas
|
9b95bd9762
|
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 |
|
Eduard Tomas
|
694253d4e9
|
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
|
3a8481086c
|
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
|
4dc8b65e8b
|
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 |
|