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

1834 Commits

Author SHA1 Message Date
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
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
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
David Britch
6bff78a179 Merge branch 'master' into xamarin 2017-06-12 09:08:56 +01:00
Christian Arenas
606f23e394 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
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
41fe6fc03f Merge branch 'marketingcampaign' into dev 2017-06-09 12:51:31 +02:00
Christian Arenas
0efe093b3f Merge branch 'marketingcampaign' into dev 2017-06-09 12:51:31 +02:00
Christian Arenas
0586fe5abd add new migration 2017-06-09 12:50:26 +02:00
Christian Arenas
1d80de4b09 add new migration 2017-06-09 12:50:26 +02:00
Ramón Tomás
0337932697 Merge locations feature branch 2017-06-09 12:43:46 +02:00
Ramón Tomás
a198b12117 Merge locations feature branch 2017-06-09 12:43:46 +02:00
Ramón Tomás
d018d00b68 Update settings 2017-06-09 12:33:59 +02:00
Ramón Tomás
00ec2ce272 Update settings 2017-06-09 12:33:59 +02:00
Ramón Tomás
f21747109b Merge branch 'feature/track-user-location-mongodb' of https://github.com/dotnet-architecture/eShopOnContainers into feature/track-user-location-mongodb 2017-06-09 12:17:12 +02:00
Ramón Tomás
f0cb13b96e Merge branch 'feature/track-user-location-mongodb' of https://github.com/dotnet-architecture/eShopOnContainers into feature/track-user-location-mongodb 2017-06-09 12:17:12 +02:00
Ramón Tomás
ea6084db28 Added location.api integration tests 2017-06-09 12:16:57 +02:00
Ramón Tomás
380cd0325c Added location.api integration tests 2017-06-09 12:16:57 +02:00
Christian Arenas
dfae447f68 Merge branch 'marketingcampaign' into dev 
# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
 2017-06-09 12:13:21 +02:00
Christian Arenas
5d3d27fce4 Merge branch 'marketingcampaign' into dev 
# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
 2017-06-09 12:13:21 +02:00
Christian Arenas
c82b5f3c41 Merge branch 'feature/track-user-location-mongodb' of https://github.com/dotnet-architecture/eShopOnContainers into LocationSettingsXamarin 2017-06-09 12:03:20 +02:00
Christian Arenas
9c3ad2b2d2 Merge branch 'feature/track-user-location-mongodb' of https://github.com/dotnet-architecture/eShopOnContainers into LocationSettingsXamarin 2017-06-09 12:03:20 +02:00