725 Commits

Author SHA1 Message Date
Christian Arenas
bb167617bf change the FakeCampaignDto private object to an GetFakeCampaignDto funtion 2017-06-05 19:36:09 +02:00
Christian Arenas
7842194637 Create RuleType class to manage RuleTypeEnum 2017-06-03 01:00:55 +02:00
Christian Arenas
2111d56766 remove unused dbset 2017-06-03 00:59:58 +02:00
Christian Arenas
f058cfde21 fix error merge 2017-06-02 16:36:16 +02:00
Christian Arenas
345b71b50e cleanup 2017-06-02 16:35:21 +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
ae7f1e8e7a initialitze the list in constructor 2017-06-02 16:32:50 +02:00
Christian Arenas
a705127653 Add migration folder 2017-06-02 16:32:24 +02:00
Christian Arenas
59b8fed228 modify context 2017-06-02 16:31:48 +02:00
Christian Arenas
5f976e90d4 update inital migration 2017-06-02 16:31:35 +02:00
Christian Arenas
05fe4ccd6d Add exceptions filters 2017-06-02 16:31:03 +02:00
Christian Arenas
d4ab5b24d2 Add dtos 2017-06-02 16:30:39 +02:00
Christian Arenas
ac5daa6146 add version 1 to Campaigns web api 2017-06-01 22:19:07 +02:00
Christian Arenas
314768b9ce rename file name 2017-06-01 22:13:19 +02:00
Christian Arenas
baab0d2a98 Remove unused class 2017-06-01 20:26:10 +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
Christian Arenas
9b95bd9762 Add marketing api 2017-06-01 20:15:21 +02:00
Eduard Tomas
694253d4e9 Resilience enhancements.
MVC app now waits other containers
2017-06-01 14:32:22 +02:00
Christian Arenas
3a8481086c Add marketing resource to identity 2017-06-01 10:10:37 +02:00
Christian Arenas
4dc8b65e8b Add Marketing.API project 2017-06-01 10:10:00 +02:00
Ramón Tomás
9d44a397b0 Merge branch 'dev' into hybrid-flow-xamarin 2017-05-29 08:31:49 +02:00
Ramón Tomás
55271568e9 Changed Xamarin app authentication to Hybrid flow 2017-05-29 08:30:33 +02:00
Cesar De la Torre
ad4142b94f 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
2861898e6e 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
a5479ff7e7 Merge pull request #199 from SychevIgor/dev
Packages update to 1.1.* and Swagger update
2017-05-23 09:21:32 -07:00
igorsych
c211f9689d swagger/ui to swagger url fix 2017-05-23 16:39:22 +03:00
Cesar De la Torre
f2769c2b73 Update BasketController.cs 2017-05-22 15:56:22 -07:00
Cesar De la Torre
e7608f4b12 Update BasketController.cs 2017-05-22 15:54:18 -07:00
Ahmed Aderopo Alejo
835729035b Minor cold clean up to avoid unnecessary code execution 2017-05-20 19:58:14 -03:00
Cesar De la Torre
c3ca81b03c Added the WebStatus WatchDog to the Kubernetes cluster deployment 2017-05-19 17:19:29 -07:00
igorsych
ec07a68751 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
546f443d7f Forcing SDK version 2017-05-19 12:22:50 +02:00
igorsych
b13fce7043 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
b2d28218dc swagger update https://github.com/domaindrivendev/Swashbuckle.AspNetCore 2017-05-19 08:11:32 +03:00
igorsych
e4f5b5014b .NET core packages update 2017-05-19 08:11:18 +03:00
David Britch
c551d1fcf9 Added SkipValidatePackageReferences entry to the PropertyGroup 2017-05-15 13:22:18 +01:00
David Britch
82d32657e0 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
185faf7416 Merge from Dev 2017-05-10 15:07:54 +02:00
Ramón Tomás
9cff047cc2 Fix issue SPA HealthCheck Urls 2017-05-10 15:01:02 +02:00
Ramón Tomás
4182750aad Extract Policies to ResilientHttpClientFactory 2017-05-10 13:25:43 +02:00
Ramón Tomás
0a1897788f Remove hard-coded values from Identity srv configuration 2017-05-10 12:39:11 +02:00
Ramón Tomás
07744cf766 Fix issue WebMVC bootstrap lib not deployed to container in windows cli 2017-05-10 11:37:29 +02:00
Eduard Tomas
4dbb892bbc Commenting non-wanted task in csproj 2017-05-09 21:04:04 +02:00
Eduard Tomas
25bc324d9f ResilientHttp client policies fixed 2017-05-09 20:27:00 +02:00
Eduard Tomas
10b7be6d8f Merge remote-tracking branch 'origin/reissemberexecutionkey' into dev 2017-05-09 18:34:41 +02:00
Eduard Tomas
d17495cb99 FailingMiddleware is now IStartupFilter 2017-05-09 18:33:58 +02:00
Eduard Tomas
1983165cbe Use good endpoints for healthcheck 2017-05-09 16:59:23 +02:00
Eduard Tomas
5d098b1478 Autorefresh on healthchecks with config timeout 2017-05-09 13:54:45 +02:00
Unai Zorrilla Castro
bb2c1e1a6c Added ExecutionKey into PolicyWrap and remove COncurrentDictioanry 2017-05-09 09:19:27 +02:00
Cesar De la Torre
2a947d4ec2 eBook renamed 2017-05-08 12:26:07 -07:00