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

2226 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian Arenas
1881ed14ef Add LocationId field to UserLocation and call GetAsync repository method from marketing controller 2017-06-13 18:01:24 +02:00
Christian Arenas
68dbc92172 Add LocationId field to UserLocation 2017-06-13 18:00:49 +02:00
Christian Arenas
251cfa0845 Add LocationId field to UserLocation 2017-06-13 18:00:49 +02:00
Christian Arenas
486ba1872a Modify marketing functional test 2017-06-13 18:00:09 +02:00
Christian Arenas
9c1edf8e08 Modify marketing functional test 2017-06-13 18:00:09 +02:00
Christian Arenas
794d366053 Merge branch 'feature/marketing-read-model-data' into marketingcampaign 
# Conflicts:
#	src/Services/Location/Locations.API/Infrastructure/Services/LocationsService.cs
#	src/Services/Location/Locations.API/Model/UserLocation.cs
 2017-06-13 17:38:07 +02:00
Christian Arenas
be5cfe7399 Merge branch 'feature/marketing-read-model-data' into marketingcampaign 
# Conflicts:
#	src/Services/Location/Locations.API/Infrastructure/Services/LocationsService.cs
#	src/Services/Location/Locations.API/Model/UserLocation.cs
 2017-06-13 17:38:07 +02:00
Christian Arenas
31fd93dafe Add Functional Test to marketing 2017-06-13 17:33:30 +02:00
Christian Arenas
dd8c6b5d0b Add Functional Test to marketing 2017-06-13 17:33:30 +02:00
Ramón Tomás
9bf5670020 Created Marketing read data model 2017-06-13 17:31:37 +02:00
Ramón Tomás
4b8723f723 Created Marketing read data model 2017-06-13 17:31:37 +02:00
Christian Arenas
432994d113 Create GetCampaignByUserId in CampaignsController 2017-06-13 14:33:16 +02:00
Christian Arenas
358227aa44 Create GetCampaignByUserId in CampaignsController 2017-06-13 14:33:16 +02:00
Christian Arenas
4a60d97d4d Add RuleType in MarketingContext 2017-06-13 14:32:53 +02:00
Christian Arenas
6613a9e1eb Add RuleType in MarketingContext 2017-06-13 14:32:53 +02:00
Christian Arenas
8d170fe83f Modify RuleType class 2017-06-13 14:32:08 +02:00
Christian Arenas
2ae6744c8e Modify RuleType class 2017-06-13 14:32:08 +02:00
Christian Arenas
e5a59a1bdf Merge branch 'feature/track-user-location-mongodb' into dev 
# Conflicts:
#	src/Services/Ordering/Ordering.API/Infrastructure/AutofacModules/MediatorModule.cs
 2017-06-13 11:26:47 +02:00
Christian Arenas
a56a795981 Merge branch 'feature/track-user-location-mongodb' into dev 
# Conflicts:
#	src/Services/Ordering/Ordering.API/Infrastructure/AutofacModules/MediatorModule.cs
 2017-06-13 11:26:47 +02:00
Christian Arenas
0b510994a4 Fix issue Autofac IAsyncRequestHandler not registered with Mediatr 3.0 2017-06-13 11:12:15 +02:00
Christian Arenas
d529c104b3 Fix issue Autofac IAsyncRequestHandler not registered with Mediatr 3.0 2017-06-13 11:12:15 +02:00
Cesar De la Torre
a60b1e55f5 Create README.md 2017-06-12 14:31:08 -07:00
Cesar De la Torre
9180b5ff86 Create README.md 2017-06-12 14:31:08 -07:00
Christian Arenas
19647d8b7d Add userIsLogged contiditon in view for fake location 2017-06-12 20:22:38 +02:00
Christian Arenas
2283a9d12b Add userIsLogged contiditon in view for fake location 2017-06-12 20:22:38 +02:00
Christian Arenas
dde8e686fc Add token when call location api 2017-06-12 20:21:45 +02:00
Christian Arenas
3b5d081086 Add token when call location api 2017-06-12 20:21:45 +02:00
Christian Arenas
c84b4707e3 Add locations to allow scopes to dictionary 2017-06-12 20:20:46 +02:00
Christian Arenas
ef8f14a212 Add locations to allow scopes to dictionary 2017-06-12 20:20:46 +02:00
Christian Arenas
a74c2942fc Add AllowAccessTokensViaBrowser in Identity server, we got an login error from xamarin 2017-06-12 20:19:23 +02:00
Christian Arenas
4458e57734 Add AllowAccessTokensViaBrowser in Identity server, we got an login error from xamarin 2017-06-12 20:19:23 +02:00
Christian Arenas
3a9093a741 Modify location.API change userId type from int to Guid 2017-06-12 20:18:52 +02:00
Christian Arenas
c9332396c5 Modify location.API change userId type from int to Guid 2017-06-12 20:18:52 +02:00
Christian Arenas
06f978bc97 Modify test. UserId is a Guid type 2017-06-12 20:18:11 +02:00
Christian Arenas
c9484a0834 Modify test. UserId is a Guid type 2017-06-12 20:18:11 +02:00
David Britch
7cafe9b34e Xamarin eBook updated to use the hybrid authentication flow. 2017-06-12 16:25:38 +01:00
David Britch
e89c8a926f Xamarin eBook updated to use the hybrid authentication flow. 2017-06-12 16:25:38 +01:00
David Britch
d3ea7ec853 Refactored TokenService into IdentityService. 2017-06-12 13:35:19 +01:00
David Britch
bfdac24771 Refactored TokenService into IdentityService. 2017-06-12 13:35:19 +01:00
Ramón Tomás
4be61abdde Merge new creation ordering workflow 2017-06-12 13:52:23 +02:00
Ramón Tomás
152bc9fd01 Merge new creation ordering workflow 2017-06-12 13:52:23 +02:00
David Britch
5db62c14b9 Merge pull request #211 from dotnet-architecture/xamarin 
Xamarin client hybrid authentication flow
 2017-06-12 11:14:20 +01:00
David Britch
96a1a55426 Merge pull request #211 from dotnet-architecture/xamarin 
Xamarin client hybrid authentication flow
 2017-06-12 11:14:20 +01:00
David Britch
7ee48876a7 LoginViewModel now stores the correct access token as an application setting. 2017-06-12 11:00:43 +01:00
David Britch
99bb40261d LoginViewModel now stores the correct access token as an application setting. 2017-06-12 11:00:43 +01:00
David Britch
a93cf0105c Updated Xamarin client to use the hybrid authentication flow. 2017-06-12 10:16:07 +01:00
David Britch
17974395a7 Updated Xamarin client to use the hybrid authentication flow. 2017-06-12 10:16:07 +01:00
Ramón Tomás
4ed070dbed Merge from Dev 2017-06-12 11:06:17 +02:00
Ramón Tomás
395160e6d1 Merge from Dev 2017-06-12 11:06:17 +02:00
David Britch
01ede6477f Merge branch 'master' into xamarin 2017-06-12 09:08:56 +01:00