Commit Graph
-
9c2df21abMerge branch 'marketingcampaign' into dev by 2017-06-15 00:55:28 +0200 -
a89918c58Modify CreatedAtAction parameter, It has an error by 2017-06-15 00:52:18 +0200 -
dd3237245Modify CreatedAtAction parameter, It has an error by 2017-06-15 00:52:18 +0200 -
0a2cd15d6Add GetLocationByCampaignAndLocationRuleId route name by 2017-06-14 18:25:46 +0200 -
523d27a49Add GetLocationByCampaignAndLocationRuleId route name by 2017-06-14 18:25:46 +0200 -
5f28f8f71Updated number of products in catalog stock Orders list ordered Refresh orders list periodically Fix bug SPA basket not dropped after creating order by 2017-06-14 16:38:27 +0200 -
a9c185a41Updated number of products in catalog stock Orders list ordered Refresh orders list periodically Fix bug SPA basket not dropped after creating order by 2017-06-14 16:38:27 +0200 -
aae16d095Merge branch 'feature/marketing-read-model-data' into marketingcampaign by 2017-06-14 16:26:28 +0200 -
b3e536286Merge branch 'feature/marketing-read-model-data' into marketingcampaign by 2017-06-14 16:26:28 +0200 -
b7cce1473Add new environment variables values to appsettings by 2017-06-14 16:21:46 +0200 -
4ba9d6642Add new environment variables values to appsettings by 2017-06-14 16:21:46 +0200 -
6c354a2c3Add LocationId to Locations Model by 2017-06-14 15:24:56 +0200 -
ec59ace1eAdd LocationId to Locations Model by 2017-06-14 15:24:56 +0200 -
f1ccc24c8Create a LocationId in data read model and change the affected modification by 2017-06-14 15:17:54 +0200 -
0ffa9cb98Create a LocationId in data read model and change the affected modification by 2017-06-14 15:17:54 +0200 -
d2b004a9aImplement GetCampaignsByUserId in CampaignsController calling a data read model from mongo repository by 2017-06-14 15:14:37 +0200 -
13a201ba6Implement GetCampaignsByUserId in CampaignsController calling a data read model from mongo repository by 2017-06-14 15:14:37 +0200 -
4e320f813Add functional test: Check The user has an location campaign by 2017-06-14 15:12:40 +0200 -
0024a2380Add functional test: Check The user has an location campaign by 2017-06-14 15:12:40 +0200 -
24c8e9388Modify locationId in Marketing campaing seed by 2017-06-14 15:10:49 +0200 -
9ae6fa8c6Modify locationId in Marketing campaing seed by 2017-06-14 15:10:49 +0200 -
846ea604cAdded cover image. by 2017-06-14 10:31:54 +0100 -
6fd960d40Added cover image. by 2017-06-14 10:31:54 +0100 -
4ffe1cf35Deleted cover image. by 2017-06-14 10:31:32 +0100 -
8300cee1eDeleted cover image. by 2017-06-14 10:31:32 +0100 -
7e3b7730fAdded cover image. by 2017-06-14 10:30:22 +0100 -
2dcb533faAdded cover image. by 2017-06-14 10:30:22 +0100 -
c51d95814Deleted cover image. by 2017-06-14 10:30:04 +0100 -
4e25c1292Deleted cover image. by 2017-06-14 10:30:04 +0100 -
c83c48d00Replaced cover image on Xamarin eBook. by 2017-06-14 10:28:21 +0100 -
62cee77a6Replaced cover image on Xamarin eBook. by 2017-06-14 10:28:21 +0100 -
7530e8ffbCreated Service fabric xml config by 2017-06-13 19:41:48 +0200 -
1881ed14eAdd LocationId field to UserLocation and call GetAsync repository method from marketing controller by 2017-06-13 18:01:24 +0200 -
41654878aAdd LocationId field to UserLocation and call GetAsync repository method from marketing controller by 2017-06-13 18:01:24 +0200 -
251cfa084Add LocationId field to UserLocation by 2017-06-13 18:00:49 +0200 -
68dbc9217Add LocationId field to UserLocation by 2017-06-13 18:00:49 +0200 -
9c1edf8e0Modify marketing functional test by 2017-06-13 18:00:09 +0200 -
486ba1872Modify marketing functional test by 2017-06-13 18:00:09 +0200 -
be5cfe739Merge branch 'feature/marketing-read-model-data' into marketingcampaign by 2017-06-13 17:38:07 +0200 -
794d36605Merge branch 'feature/marketing-read-model-data' into marketingcampaign by 2017-06-13 17:38:07 +0200 -
dd8c6b5d0Add Functional Test to marketing by 2017-06-13 17:33:30 +0200 -
31fd93dafAdd Functional Test to marketing by 2017-06-13 17:33:30 +0200 -
4b8723f72Created Marketing read data model by 2017-06-13 17:31:37 +0200 -
9bf567002Created Marketing read data model by 2017-06-13 17:31:37 +0200 -
358227aa4Create GetCampaignByUserId in CampaignsController by 2017-06-13 14:33:16 +0200 -
432994d11Create GetCampaignByUserId in CampaignsController by 2017-06-13 14:33:16 +0200 -
6613a9e1eAdd RuleType in MarketingContext by 2017-06-13 14:32:53 +0200 -
4a60d97d4Add RuleType in MarketingContext by 2017-06-13 14:32:53 +0200 -
2ae6744c8Modify RuleType class by 2017-06-13 14:32:08 +0200 -
8d170fe83Modify RuleType class by 2017-06-13 14:32:08 +0200 -
a56a79598Merge branch 'feature/track-user-location-mongodb' into dev by 2017-06-13 11:26:47 +0200 -
e5a59a1bdMerge branch 'feature/track-user-location-mongodb' into dev by 2017-06-13 11:26:47 +0200 -
d529c104bFix issue Autofac IAsyncRequestHandler not registered with Mediatr 3.0 by 2017-06-13 11:12:15 +0200 -
0b510994aFix issue Autofac IAsyncRequestHandler not registered with Mediatr 3.0 by 2017-06-13 11:12:15 +0200 -
9180b5ff8Create README.md by 2017-06-12 14:31:08 -0700 -
a60b1e55fCreate README.md by 2017-06-12 14:31:08 -0700 -
2283a9d12Add userIsLogged contiditon in view for fake location by 2017-06-12 20:22:38 +0200 -
19647d8b7Add userIsLogged contiditon in view for fake location by 2017-06-12 20:22:38 +0200 -
3b5d08108Add token when call location api by 2017-06-12 20:21:45 +0200 -
dde8e686fAdd token when call location api by 2017-06-12 20:21:45 +0200 -
ef8f14a21Add locations to allow scopes to dictionary by 2017-06-12 20:20:46 +0200 -
c84b4707eAdd locations to allow scopes to dictionary by 2017-06-12 20:20:46 +0200 -
4458e5773Add AllowAccessTokensViaBrowser in Identity server, we got an login error from xamarin by 2017-06-12 20:19:23 +0200 -
a74c2942fAdd AllowAccessTokensViaBrowser in Identity server, we got an login error from xamarin by 2017-06-12 20:19:23 +0200 -
c9332396cModify location.API change userId type from int to Guid by 2017-06-12 20:18:52 +0200 -
3a9093a74Modify location.API change userId type from int to Guid by 2017-06-12 20:18:52 +0200 -
c9484a083Modify test. UserId is a Guid type by 2017-06-12 20:18:11 +0200 -
06f978bc9Modify test. UserId is a Guid type by 2017-06-12 20:18:11 +0200 -
1edecb511(refs/pull/213/merge) Merge2ba890bce8into7cafe9b34eby 2017-06-12 17:05:24 +0000 -
e89c8a926Xamarin eBook updated to use the hybrid authentication flow. by 2017-06-12 16:25:38 +0100 -
7cafe9b34Xamarin eBook updated to use the hybrid authentication flow. by 2017-06-12 16:25:38 +0100 -
bfdac2477Refactored TokenService into IdentityService. by 2017-06-12 13:35:19 +0100 -
d3ea7ec85Refactored TokenService into IdentityService. by 2017-06-12 13:35:19 +0100 -
152bc9fd0Merge new creation ordering workflow by 2017-06-12 13:52:23 +0200 -
4be61abddMerge new creation ordering workflow by 2017-06-12 13:52:23 +0200 -
96a1a5542Merge pull request #211 from dotnet-architecture/xamarin by 2017-06-12 11:14:20 +0100 -
5db62c14bMerge pull request #211 from dotnet-architecture/xamarin by 2017-06-12 11:14:20 +0100 -
99bb40261LoginViewModel now stores the correct access token as an application setting. by 2017-06-12 11:00:43 +0100 -
7ee48876a(refs/pull/211/head) LoginViewModel now stores the correct access token as an application setting. by 2017-06-12 11:00:43 +0100 -
17974395aUpdated Xamarin client to use the hybrid authentication flow. by 2017-06-12 10:16:07 +0100 -
a93cf0105Updated Xamarin client to use the hybrid authentication flow. by 2017-06-12 10:16:07 +0100 -
395160e6dMerge from Dev by 2017-06-12 11:06:17 +0200 -
4ed070dbeMerge from Dev by 2017-06-12 11:06:17 +0200 -
6bff78a17Merge branch 'master' into xamarin by 2017-06-12 09:08:56 +0100 -
01ede6477Merge branch 'master' into xamarin by 2017-06-12 09:08:56 +0100 -
34badc79fMerge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev by 2017-06-09 13:07:09 +0200 -
606f23e39Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev by 2017-06-09 13:07:09 +0200 -
76f0df6a0fix merge error by 2017-06-09 13:05:09 +0200 -
ce89241f6fix merge error by 2017-06-09 13:05:09 +0200 -
0efe093b3Merge branch 'marketingcampaign' into dev by 2017-06-09 12:51:31 +0200 -
41fe6fc03Merge branch 'marketingcampaign' into dev by 2017-06-09 12:51:31 +0200 -
1d80de4b0add new migration by 2017-06-09 12:50:26 +0200 -
0586fe5abadd new migration by 2017-06-09 12:50:26 +0200 -
a198b1211Merge locations feature branch by 2017-06-09 12:43:46 +0200 -
033793269Merge locations feature branch by 2017-06-09 12:43:46 +0200 -
00ec2ce27Update settings by 2017-06-09 12:33:59 +0200 -
d018d00b6Update settings by 2017-06-09 12:33:59 +0200 -
f0cb13b96Merge branch 'feature/track-user-location-mongodb' of https://github.com/dotnet-architecture/eShopOnContainers into feature/track-user-location-mongodb by 2017-06-09 12:17:12 +0200 -
f21747109Merge branch 'feature/track-user-location-mongodb' of https://github.com/dotnet-architecture/eShopOnContainers into feature/track-user-location-mongodb by 2017-06-09 12:17:12 +0200 -
380cd0325Added location.api integration tests by 2017-06-09 12:16:57 +0200