Eduard Tomas
|
5dd1ce24f3
|
Config files for k8s deployment of all services updated
|
2017-06-16 17:40:27 +02:00 |
|
Ramón Tomás
|
2ad485015f
|
Merge from Master
|
2017-06-15 08:54:29 +02:00 |
|
Christian Arenas
|
1d46ba3a15
|
Merge branch 'marketingcampaign' into dev
|
2017-06-15 00:55:28 +02:00 |
|
Christian Arenas
|
a89918c581
|
Modify CreatedAtAction parameter, It has an error
|
2017-06-15 00:52:18 +02:00 |
|
Christian Arenas
|
0a2cd15d61
|
Add GetLocationByCampaignAndLocationRuleId route name
|
2017-06-14 18:25:46 +02:00 |
|
Ramón Tomás
|
5f28f8f710
|
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
|
aae16d095e
|
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
|
b7cce14734
|
Add new environment variables values to appsettings
|
2017-06-14 16:21:46 +02:00 |
|
Christian Arenas
|
6c354a2c3d
|
Add LocationId to Locations Model
|
2017-06-14 15:24:56 +02:00 |
|
Christian Arenas
|
f1ccc24c85
|
Create a LocationId in data read model and change the affected modification
|
2017-06-14 15:22:49 +02:00 |
|
Christian Arenas
|
d2b004a9a9
|
Implement GetCampaignsByUserId in CampaignsController calling a data read model from mongo repository
|
2017-06-14 15:14:37 +02:00 |
|
Christian Arenas
|
4e320f813a
|
Add functional test: Check The user has an location campaign
|
2017-06-14 15:12:40 +02:00 |
|
Christian Arenas
|
24c8e93888
|
Modify locationId in Marketing campaing seed
|
2017-06-14 15:10:49 +02:00 |
|
David Britch
|
846ea604cc
|
Added cover image.
|
2017-06-14 10:31:54 +01:00 |
|
David Britch
|
4ffe1cf35b
|
Deleted cover image.
|
2017-06-14 10:31:32 +01:00 |
|
David Britch
|
7e3b7730f4
|
Added cover image.
|
2017-06-14 10:30:22 +01:00 |
|
David Britch
|
c51d958145
|
Deleted cover image.
|
2017-06-14 10:30:04 +01:00 |
|
David Britch
|
c83c48d009
|
Replaced cover image on Xamarin eBook.
|
2017-06-14 10:28:21 +01:00 |
|
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
|
251cfa0845
|
Add LocationId field to UserLocation
|
2017-06-13 18:00:49 +02:00 |
|
Christian Arenas
|
9c1edf8e08
|
Modify marketing functional test
|
2017-06-13 18:00:09 +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
|
dd8c6b5d0b
|
Add Functional Test to marketing
|
2017-06-13 17:33:30 +02:00 |
|
Ramón Tomás
|
4b8723f723
|
Created Marketing read data model
|
2017-06-13 17:31:37 +02:00 |
|
Christian Arenas
|
358227aa44
|
Create GetCampaignByUserId in CampaignsController
|
2017-06-13 14:33:16 +02:00 |
|
Christian Arenas
|
6613a9e1eb
|
Add RuleType in MarketingContext
|
2017-06-13 14:32:53 +02:00 |
|
Christian Arenas
|
2ae6744c8e
|
Modify RuleType class
|
2017-06-13 14:32:08 +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
|
d529c104b3
|
Fix issue Autofac IAsyncRequestHandler not registered with Mediatr 3.0
|
2017-06-13 11:12:15 +02:00 |
|
Cesar De la Torre
|
9180b5ff86
|
Create README.md
|
2017-06-12 14:31:08 -07:00 |
|
Christian Arenas
|
2283a9d12b
|
Add userIsLogged contiditon in view for fake location
|
2017-06-12 20:22:38 +02:00 |
|
Christian Arenas
|
3b5d081086
|
Add token when call location api
|
2017-06-12 20:21:45 +02:00 |
|
Christian Arenas
|
ef8f14a212
|
Add locations to allow scopes to dictionary
|
2017-06-12 20:20:46 +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
|
c9332396c5
|
Modify location.API change userId type from int to Guid
|
2017-06-12 20:18:52 +02:00 |
|
Christian Arenas
|
c9484a0834
|
Modify test. UserId is a Guid type
|
2017-06-12 20:18:11 +02:00 |
|
David Britch
|
e89c8a926f
|
Xamarin eBook updated to use the hybrid authentication flow.
|
2017-06-12 16:25:38 +01:00 |
|
David Britch
|
bfdac24771
|
Refactored TokenService into IdentityService.
|
2017-06-12 13:35:19 +01:00 |
|
Ramón Tomás
|
152bc9fd01
|
Merge new creation ordering workflow
|
2017-06-12 13:52:23 +02: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
|
99bb40261d
|
LoginViewModel now stores the correct access token as an application setting.
|
2017-06-12 11:00:43 +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
|
395160e6d1
|
Merge from Dev
|
2017-06-12 11:06:17 +02:00 |
|
David Britch
|
6bff78a179
|
Merge branch 'master' into xamarin
|
2017-06-12 09:08:56 +01: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
|
76f0df6a0e
|
fix merge error
|
2017-06-09 13:05:09 +02:00 |
|
Christian Arenas
|
0efe093b3f
|
Merge branch 'marketingcampaign' into dev
|
2017-06-09 12:51:31 +02:00 |
|
Christian Arenas
|
1d80de4b09
|
add new migration
|
2017-06-09 12:50:26 +02:00 |
|
Ramón Tomás
|
a198b12117
|
Merge locations feature branch
|
2017-06-09 12:43:46 +02:00 |
|
Ramón Tomás
|
00ec2ce272
|
Update settings
|
2017-06-09 12:33:59 +02:00 |
|