Ramón Tomás
|
395160e6d1
|
Merge from Dev
|
2017-06-12 11:06:17 +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
|
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 |
|
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
|
380cd0325c
|
Added location.api integration tests
|
2017-06-09 12:16:57 +02:00 |
|
Christian Arenas
|
5d3d27fce4
|
Merge branch 'marketingcampaign' into dev
# Conflicts:
# eShopOnContainers-ServicesAndWebApps.sln
|
2017-06-09 12:13:21 +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
|
efba36b02c
|
Add new location settings
|
2017-06-09 12:02:49 +02:00 |
|
Christian Arenas
|
7effb99503
|
Add Location Setting objects to view and ViewModel
|
2017-06-09 12:02:39 +02:00 |
|
Christian Arenas
|
c3b4a8e97e
|
Add LocationService to RegisterDependencies
|
2017-06-09 12:01:47 +02:00 |
|
Christian Arenas
|
73ac99bc70
|
Add locationService class
|
2017-06-09 11:59:56 +02:00 |
|
Ramón Tomás
|
3c6b4ad44e
|
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
|
2017-06-08 17:45:21 +02:00 |
|
Ramón Tomás
|
6c855e57c5
|
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
|
896ab5b4dc
|
Adapt Locations.api to nosql db
|
2017-06-08 17:33:55 +02:00 |
|
Ramón Tomás
|
6811797ae4
|
Merge from Dev
|
2017-06-07 17:54:53 +02:00 |
|
Ramón Tomás
|
d8b6d5ec8b
|
Fix issue Autofac IAsyncRequestHandler not registered with Mediatr 3.0
|
2017-06-06 19:20:42 +02:00 |
|
Christian Arenas
|
1900ee2b61
|
Edit the integration test
|
2017-06-06 14:19:01 +02:00 |
|
Christian Arenas
|
99685b3eae
|
Redesign marketing campaign api in two different controllers (campaigns/locations)
|
2017-06-06 14:18:46 +02:00 |
|
Christian Arenas
|
31b1c4a197
|
Edit campaigns controller
|
2017-06-06 10:26:11 +02:00 |
|
Christian Arenas
|
f62131f832
|
Edit mapper methods
|
2017-06-05 23:20:46 +02:00 |
|
Ramón Tomás
|
b7c5613238
|
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
|
2017-06-05 21:54:13 +02:00 |
|
Ramón Tomás
|
8d0ef809a8
|
Persist identity grant store to db
Persist machine Keys to Redis
|
2017-06-05 21:54:03 +02:00 |
|
Christian Arenas
|
bb167617bf
|
change the FakeCampaignDto private object to an GetFakeCampaignDto funtion
|
2017-06-05 19:36:09 +02:00 |
|
David Britch
|
c8b3010a0b
|
Corrected ASP.NET Web API to ASP.NET Core MVC.
|
2017-06-05 16:25:40 +01:00 |
|
David Britch
|
33fd78420f
|
Update README.md
|
2017-06-05 16:19:54 +01:00 |
|
David Britch
|
dd10decfb1
|
Added Xamarin eBook cover image.
|
2017-06-05 13:20:22 +01:00 |
|
David Britch
|
767f725f56
|
Deleted Xamarin eBook cover image.
|
2017-06-05 13:19:49 +01:00 |
|
David Britch
|
f56d283919
|
Final Xamarin eBook.
|
2017-06-05 13:14:58 +01:00 |
|
Christian Arenas
|
7842194637
|
Create RuleType class to manage RuleTypeEnum
|
2017-06-03 01:00:55 +02:00 |
|
Christian Arenas
|
2111d56766
|
remove unused dbset
|
2017-06-03 00:59:58 +02:00 |
|
Christian Arenas
|
f058cfde21
|
fix error merge
|
2017-06-02 16:36:16 +02:00 |
|
Christian Arenas
|
345b71b50e
|
cleanup
|
2017-06-02 16:35:21 +02:00 |
|
Christian Arenas
|
1e3fd13362
|
Merge branch 'marketingcampaign' of https://github.com/dotnet-architecture/eShopOnContainers into marketingcampaign
# Conflicts:
# src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs
|
2017-06-02 16:34:37 +02:00 |
|
Christian Arenas
|
21dc4e3772
|
Add integration test
|
2017-06-02 16:33:01 +02:00 |
|
Christian Arenas
|
ae7f1e8e7a
|
initialitze the list in constructor
|
2017-06-02 16:32:50 +02:00 |
|
Christian Arenas
|
a705127653
|
Add migration folder
|
2017-06-02 16:32:24 +02:00 |
|
Christian Arenas
|
59b8fed228
|
modify context
|
2017-06-02 16:31:48 +02:00 |
|
Christian Arenas
|
5f976e90d4
|
update inital migration
|
2017-06-02 16:31:35 +02:00 |
|
Christian Arenas
|
05fe4ccd6d
|
Add exceptions filters
|
2017-06-02 16:31:03 +02:00 |
|
Christian Arenas
|
d4ab5b24d2
|
Add dtos
|
2017-06-02 16:30:39 +02:00 |
|
Ramón Tomás
|
31ca759662
|
Merge from Dev
|
2017-06-02 13:22:40 +02:00 |
|
Christian Arenas
|
ac5daa6146
|
add version 1 to Campaigns web api
|
2017-06-01 22:19:07 +02:00 |
|
Christian Arenas
|
314768b9ce
|
rename file name
|
2017-06-01 22:13:19 +02:00 |
|
Christian Arenas
|
baab0d2a98
|
Remove unused class
|
2017-06-01 20:26:10 +02:00 |
|
Christian Arenas
|
8d3ae671a8
|
Merge remote-tracking branch 'origin/dev' into marketingcampaing
# Conflicts:
# eShopOnContainers-ServicesAndWebApps.sln
|
2017-06-01 20:19:33 +02:00 |
|
Ramón Tomás
|
13cfe43378
|
Created UserLocationModel
Map Position to Locations APi
Update current user location
|
2017-06-01 20:16:19 +02:00 |
|