Christian Arenas
|
4a60d97d4d
|
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
|
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
|
0b510994a4
|
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 |
|
Christian Arenas
|
19647d8b7d
|
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
|
c84b4707e3
|
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
|
3a9093a741
|
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 |
|
David Britch
|
7cafe9b34e
|
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 |
|
Ramón Tomás
|
4be61abdde
|
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
|
7ee48876a7
|
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 |
|
Ramón Tomás
|
4ed070dbed
|
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 |
|
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
|
ce89241f65
|
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
|
0586fe5abd
|
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
|
d018d00b68
|
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
|
ea6084db28
|
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
|
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
|
bb5ad3182d
|
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
|
b96faa369d
|
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 |
|
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 |
|
Ramón Tomás
|
3a10038d71
|
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
|
05bd964f2b
|
Adapt Locations.api to nosql db
|
2017-06-08 17:33:55 +02:00 |
|
Ramón Tomás
|
27fd97b92e
|
Merge from Dev
|
2017-06-07 17:54:53 +02:00 |
|
Ramón Tomás
|
8c0d41e4ad
|
Fix issue Autofac IAsyncRequestHandler not registered with Mediatr 3.0
|
2017-06-06 19:20:42 +02:00 |
|
Christian Arenas
|
6ff6864f91
|
Edit the integration test
|
2017-06-06 14:19:01 +02:00 |
|
Christian Arenas
|
ce56a42bd1
|
Redesign marketing campaign api in two different controllers (campaigns/locations)
|
2017-06-06 14:18:46 +02:00 |
|
Christian Arenas
|
56c07aaafa
|
Edit campaigns controller
|
2017-06-06 10:26:11 +02:00 |
|
Christian Arenas
|
3c81115603
|
Edit mapper methods
|
2017-06-05 23:20:46 +02:00 |
|
Ramón Tomás
|
375780e3a4
|
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
|
2017-06-05 21:54:13 +02:00 |
|
Ramón Tomás
|
41101164fa
|
Persist identity grant store to db
Persist machine Keys to Redis
|
2017-06-05 21:54:03 +02:00 |
|
Christian Arenas
|
ea8d893d4e
|
change the FakeCampaignDto private object to an GetFakeCampaignDto funtion
|
2017-06-05 19:36:09 +02:00 |
|
David Britch
|
55c3364f28
|
Corrected ASP.NET Web API to ASP.NET Core MVC.
|
2017-06-05 16:25:40 +01:00 |
|
David Britch
|
f406c55894
|
Update README.md
|
2017-06-05 16:19:54 +01:00 |
|
David Britch
|
6321e2d96b
|
Added Xamarin eBook cover image.
|
2017-06-05 13:20:22 +01:00 |
|
David Britch
|
fbf52f628c
|
Deleted Xamarin eBook cover image.
|
2017-06-05 13:19:49 +01:00 |
|
David Britch
|
8320a92eec
|
Final Xamarin eBook.
|
2017-06-05 13:14:58 +01:00 |
|