Shaun Walker
|
445101b376
|
data and UI customization enhancements
|
2017-06-20 12:54:32 -07:00 |
|
Ramón Tomás
|
d6c6582b51
|
Merge from Master
|
2017-06-15 08:54:29 +02:00 |
|
Christian Arenas
|
9c2df21ab0
|
Merge branch 'marketingcampaign' into dev
|
2017-06-15 00:55:28 +02:00 |
|
Christian Arenas
|
dd3237245d
|
Modify CreatedAtAction parameter, It has an error
|
2017-06-15 00:52:18 +02:00 |
|
Christian Arenas
|
523d27a49f
|
Add GetLocationByCampaignAndLocationRuleId route name
|
2017-06-14 18:25:46 +02:00 |
|
Ramón Tomás
|
a9c185a41a
|
Updated number of products in catalog stock
Orders list ordered
Refresh orders list periodically
Fix bug SPA basket not dropped after creating order
|
2017-06-14 16:38:27 +02:00 |
|
Christian Arenas
|
b3e5362865
|
Merge branch 'feature/marketing-read-model-data' into marketingcampaign
# Conflicts:
# src/Services/Location/Locations.API/Model/Locations.cs
|
2017-06-14 16:26:28 +02:00 |
|
Christian Arenas
|
4ba9d66423
|
Add new environment variables values to appsettings
|
2017-06-14 16:21:46 +02:00 |
|
Christian Arenas
|
ec59ace1ea
|
Add LocationId to Locations Model
|
2017-06-14 15:24:56 +02:00 |
|
Christian Arenas
|
0ffa9cb981
|
Create a LocationId in data read model and change the affected modification
|
2017-06-14 15:22:49 +02:00 |
|
Christian Arenas
|
13a201ba67
|
Implement GetCampaignsByUserId in CampaignsController calling a data read model from mongo repository
|
2017-06-14 15:14:37 +02:00 |
|
Christian Arenas
|
0024a23801
|
Add functional test: Check The user has an location campaign
|
2017-06-14 15:12:40 +02:00 |
|
Christian Arenas
|
9ae6fa8c64
|
Modify locationId in Marketing campaing seed
|
2017-06-14 15:10:49 +02:00 |
|
David Britch
|
6fd960d403
|
Added cover image.
|
2017-06-14 10:31:54 +01:00 |
|
David Britch
|
8300cee1e1
|
Deleted cover image.
|
2017-06-14 10:31:32 +01:00 |
|
David Britch
|
2dcb533fa4
|
Added cover image.
|
2017-06-14 10:30:22 +01:00 |
|
David Britch
|
4e25c12928
|
Deleted cover image.
|
2017-06-14 10:30:04 +01:00 |
|
David Britch
|
62cee77a65
|
Replaced cover image on Xamarin eBook.
|
2017-06-14 10:28:21 +01:00 |
|
Christian Arenas
|
41654878a7
|
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
|
486ba1872a
|
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
|
31fd93dafe
|
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 |
|
Christian Arenas
|
432994d113
|
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
|
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 |
|