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 |
|
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
|
ce89241f65
|
fix merge error
|
2017-06-09 13:05:09 +02:00 |
|
Christian Arenas
|
76f0df6a0e
|
fix merge error
|
2017-06-09 13:05: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 |
|
Christian Arenas
|
bb5ad3182d
|
Add new location settings
|
2017-06-09 12:02:49 +02:00 |
|
Christian Arenas
|
efba36b02c
|
Add new location settings
|
2017-06-09 12:02:49 +02:00 |
|
Christian Arenas
|
6a1d37b84f
|
Add Location Setting objects to view and ViewModel
|
2017-06-09 12:02:39 +02:00 |
|
Christian Arenas
|
7effb99503
|
Add Location Setting objects to view and ViewModel
|
2017-06-09 12:02:39 +02:00 |
|
Christian Arenas
|
b96faa369d
|
Add LocationService to RegisterDependencies
|
2017-06-09 12:01:47 +02:00 |
|
Christian Arenas
|
c3b4a8e97e
|
Add LocationService to RegisterDependencies
|
2017-06-09 12:01:47 +02:00 |
|
Christian Arenas
|
cdd15117fb
|
Add locationService class
|
2017-06-09 11:59:56 +02:00 |
|
Christian Arenas
|
73ac99bc70
|
Add locationService class
|
2017-06-09 11:59:56 +02:00 |
|
Ramón Tomás
|
981f4e2730
|
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
|
2017-06-08 17:45:21 +02:00 |
|