ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,000 Commits 36 Branches 19 Tags 655 MiB
Commit Graph

329 Commits

Author SHA1 Message Date
Christian Arenas
34badc79fe Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev 
# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
 2017-06-09 13:07:09 +02:00
Christian Arenas
0efe093b3f Merge branch 'marketingcampaign' into dev 2017-06-09 12:51:31 +02:00
Christian Arenas
1d80de4b09 add new migration 2017-06-09 12:50:26 +02:00
Ramón Tomás
a198b12117 Merge locations feature branch 2017-06-09 12:43:46 +02:00
Ramón Tomás
380cd0325c Added location.api integration tests 2017-06-09 12:16:57 +02:00
Christian Arenas
5d3d27fce4 Merge branch 'marketingcampaign' into dev 
# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
 2017-06-09 12:13:21 +02:00
Ramón Tomás
3c6b4ad44e Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev 2017-06-08 17:45:21 +02:00
Ramón Tomás
6c855e57c5 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
896ab5b4dc Adapt Locations.api to nosql db 2017-06-08 17:33:55 +02:00
Ramón Tomás
d8b6d5ec8b Fix issue Autofac IAsyncRequestHandler not registered with Mediatr 3.0 2017-06-06 19:20:42 +02:00
Christian Arenas
99685b3eae Redesign marketing campaign api in two different controllers (campaigns/locations) 2017-06-06 14:18:46 +02:00
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
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
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
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
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
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
Ramón Tomás
0a1897788f Remove hard-coded values from Identity srv configuration 2017-05-10 12:39:11 +02:00