ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,234 Commits 36 Branches 19 Tags 655 MiB
Commit Graph

2054 Commits

Author SHA1 Message Date
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
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
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
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
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
05bd964f2b Adapt Locations.api to nosql db 2017-06-08 17:33:55 +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
27fd97b92e Merge from Dev 2017-06-07 17:54:53 +02:00
Ramón Tomás
6811797ae4 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
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
ce56a42bd1 Redesign marketing campaign api in two different controllers (campaigns/locations) 2017-06-06 14:18:46 +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
56c07aaafa Edit campaigns controller 2017-06-06 10:26:11 +02:00
Christian Arenas
31b1c4a197 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
Christian Arenas
f62131f832 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
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
41101164fa Persist identity grant store to db 
Persist machine Keys to Redis
 2017-06-05 21:54:03 +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
ea8d893d4e change the FakeCampaignDto private object to an GetFakeCampaignDto funtion 2017-06-05 19:36:09 +02:00
Christian Arenas
bb167617bf change the FakeCampaignDto private object to an GetFakeCampaignDto funtion 2017-06-05 19:36:09 +02:00