877 Commits

Author SHA1 Message Date
Christian Arenas
31b1c4a197 Edit campaigns controller 2017-06-06 10:26:11 +02:00
Christian Arenas
f62131f832 Edit mapper methods 2017-06-05 23:20:46 +02:00
Ramón Tomás
b7c5613238 Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev 2017-06-05 21:54:13 +02:00
Ramón Tomás
8d0ef809a8 Persist identity grant store to db
Persist machine Keys to Redis
2017-06-05 21:54:03 +02:00
Christian Arenas
bb167617bf change the FakeCampaignDto private object to an GetFakeCampaignDto funtion 2017-06-05 19:36:09 +02:00
David Britch
33fd78420f Update README.md 2017-06-05 16:19:54 +01: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
Ramón Tomás
31ca759662 Merge from Dev 2017-06-02 13:22:40 +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
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
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
83166cde12 #2412-Create Location Microservice 2017-05-30 15:01:58 +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
Frank Ibem
0567ff85b1 Update ProfileService.cs
Update check for LastName value in GetClaimsFromUser()
2017-05-26 20:35:56 -05: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
Ramón Tomás
51c25c985e Rename grace period service in docker-compose files 2017-05-25 11:37:24 +02:00
Ramón Tomás
b8f8fe51f8 Rename grace period directory 2017-05-25 11:08:43 +02:00
Ramón Tomás
889d3c86e7 Clean Basket event is launched once basket is converted to order and before starting creating order.
Change grace period time  to 1 minute
Remove unecessary clean basket methods on client
2017-05-24 16:09:03 +02:00
David Britch
8908cecd6e Ensure iOS project builds in VS Mac by adding SkipValidatePackageReferences entry to .csproj. 2017-05-24 14:17:37 +01:00
Ramón Tomás
1218069eaf Removed Saga feature 2017-05-24 08:53:36 +02: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
ce2083d248 Minor refactoring 2017-05-20 12:35:16 -07:00
Cesar De la Torre
5a3a94bba6 Minor refactoring in method from ServiceBus to EventBus 2017-05-20 10:17:06 -07: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
Christian Arenas
242c1daacf minor name change 2017-05-19 08:53:24 +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