726 Commits

Author SHA1 Message Date
Christian Arenas
3c81115603 Edit mapper methods 2017-06-05 23:20:46 +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
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
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
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
Cesar De la Torre
4410e455e0 Updates to target .NET Core 1.1.2 - Version changes at every .csproj file, dockerfile and the docker-compose.ci.build.yml file for building from the CLI. 2017-05-25 17:01:10 -07:00
Cesar De la Torre
733c7ee72b Merge pull request #200 from ahmedalejo/patch-1
Minor cold clean up to avoid unnecessary code execution
2017-05-23 10:15:31 -07:00
Cesar De la Torre
1f7dbac140 Merge pull request #199 from SychevIgor/dev
Packages update to 1.1.* and Swagger update
2017-05-23 09:21:32 -07:00
igorsych
4790981e80 swagger/ui to swagger url fix 2017-05-23 16:39:22 +03:00
Cesar De la Torre
e2b6580629 Update BasketController.cs 2017-05-22 15:56:22 -07:00
Cesar De la Torre
aee9ec768e Update BasketController.cs 2017-05-22 15:54:18 -07:00
Ahmed Aderopo Alejo
6950839d77 Minor cold clean up to avoid unnecessary code execution 2017-05-20 19:58:14 -03:00
Cesar De la Torre
7b63c8d409 Added the WebStatus WatchDog to the Kubernetes cluster deployment 2017-05-19 17:19:29 -07:00
igorsych
9e75504690 Newtonsoft.Json and MediatR with fixes of all based on MediatR classes
also from csproj files excluded direct specification of runtime to make compile happy if on a system we have higher version.
2017-05-19 18:03:05 +03:00
Eduard Tomas
af09d0a8ee Forcing SDK version 2017-05-19 12:22:50 +02:00
igorsych
85b61a2bfd Test packages update to the latest version
Redis and RabbitMQ also updated
Identity server changes reflectiong  ac59db6e16 commit
2017-05-19 09:02:05 +03:00
igorsych
c1320f4445 swagger update https://github.com/domaindrivendev/Swashbuckle.AspNetCore 2017-05-19 08:11:32 +03:00
igorsych
c5778a04f3 .NET core packages update 2017-05-19 08:11:18 +03:00
David Britch
4c53c0510a Added SkipValidatePackageReferences entry to the PropertyGroup 2017-05-15 13:22:18 +01:00
David Britch
92be019aae Modification to stop the UWP project producing a build error due to the lack of Microsoft.Bcl.Build. 2017-05-11 17:11:52 +01:00
Ramón Tomás
83a33bc8fd Merge from Dev 2017-05-10 15:07:54 +02:00
Ramón Tomás
afd3fe2fe5 Fix issue SPA HealthCheck Urls 2017-05-10 15:01:02 +02:00
Ramón Tomás
564e2df93a Extract Policies to ResilientHttpClientFactory 2017-05-10 13:25:43 +02:00
Ramón Tomás
d18b3581a6 Remove hard-coded values from Identity srv configuration 2017-05-10 12:39:11 +02:00
Ramón Tomás
d2c950d94e Fix issue WebMVC bootstrap lib not deployed to container in windows cli 2017-05-10 11:37:29 +02:00
Eduard Tomas
c33a6ecdf0 Commenting non-wanted task in csproj 2017-05-09 21:04:04 +02:00
Eduard Tomas
efe496e156 ResilientHttp client policies fixed 2017-05-09 20:27:00 +02:00
Eduard Tomas
4ca7dfde09 Merge remote-tracking branch 'origin/reissemberexecutionkey' into dev 2017-05-09 18:34:41 +02:00
Eduard Tomas
d23576b8ca FailingMiddleware is now IStartupFilter 2017-05-09 18:33:58 +02:00
Eduard Tomas
37cef95fec Use good endpoints for healthcheck 2017-05-09 16:59:23 +02:00
Eduard Tomas
95af2d9a02 Autorefresh on healthchecks with config timeout 2017-05-09 13:54:45 +02:00
Unai Zorrilla Castro
aa8e943ba9 Added ExecutionKey into PolicyWrap and remove COncurrentDictioanry 2017-05-09 09:19:27 +02:00