706423cc8
Marketing.API nuget updated by
2017-06-21 19:43:02 +0200
f34a4fee2
Add text message when gps system is enabled and change the name GpsUsage to AllowGpsLocation by
2017-06-21 19:39:49 +0200
4303cbae8
Locations.API nuget updated by
2017-06-21 19:39:47 +0200
4069a3a04
Catalog.API nuget updated by
2017-06-21 19:36:33 +0200
ea129609d
Basket.API nuget updated by
2017-06-21 19:33:24 +0200
5f4d42520
Add GeolocatorPlugin-1.0.3 to IOS and Windows project by
2017-06-21 19:26:06 +0200
7fd5647ba
EventBus.csproj nuget updated by
2017-06-21 19:19:58 +0200
b050ba5c9
DataProtection.csproj nuget updated by
2017-06-21 19:16:59 +0200
5d383dbaa
GracePeriodManager nuget updated by
2017-06-21 19:10:12 +0200
56902a554
[WIP] Projects & Dockerfile migrated to 2.0 by
2017-06-21 19:03:48 +0200
2fe1935e9
Merge branch 'dev' into feature/GPS-location-xamarin by
2017-06-21 17:30:42 +0200
5d124369a
Add Location permissions in ios by
2017-06-21 17:30:37 +0200
6a02eb31c
Add gps usage options by
2017-06-21 17:30:19 +0200
514142a3c
global.json set to 2.0.0-preview1-005977 dcproj update by
2017-06-21 12:58:55 +0200
0fe33b7f3
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev by
2017-06-21 12:38:30 +0200
cd42c17cd
Buildfiles to mitigate msbuild issue - https://github.com/Microsoft/msbuild/issues/2153 by
2017-06-21 12:38:21 +0200
6a4088d3b
Merge branch 'feature/GPS-location-xamarin' into dev by
2017-06-21 11:48:42 +0200
a65254e38
Merge branch 'feature/track-user-location-mongodb' into dev by
2017-06-21 11:48:38 +0200
123cd9e1c
Add point of union from the polygon by
2017-06-21 11:47:34 +0200
cae44bcbb
Add Barcelona location seed by
2017-06-21 11:06:33 +0200
d75f48035
Clean up and add location permissions in windows phone project by
2017-06-21 11:04:42 +0200
445101b37
data and UI customization enhancements by
2017-06-20 12:54:32 -0700
1d3cad9e6
Get gps location from core project. by
2017-06-20 18:47:23 +0200
75065026f
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev by
2017-06-20 18:41:29 +0200
fdf550e7c
Setting docker-compose files version all to '3' so it matches and you don't get the error 'Version mismatchdocker-compose.yml specifies version 3.0 but extension file docker-compose.override.yml uses version 2.0.' by
2017-06-20 09:15:41 -0700
8c9498c7a
Allow create or not ACR when creating k8s by
2017-06-20 17:17:13 +0200
11a5293fa
Merge branch 'k8s-update' into dev by
2017-06-20 16:50:03 +0200
f17e350fa
Refactor and allow option to NOT build netcore projects when creating docker images by
2017-06-20 16:47:42 +0200
71f1a6793
Merge branch 'feature/display-marketing-campaigns-on-xamarin' into dev by
2017-06-20 11:37:33 +0200
1fcf069c6
Merge branch 'feature/display-marketing-banner-mvc' into dev by
2017-06-20 11:37:26 +0200
08dcc320f
Fix marketing pagination display page number by
2017-06-20 11:37:01 +0200
33acdcf9d
Clean up by
2017-06-20 10:59:01 +0200
cdfe85bda
Add marketing unit test to project by
2017-06-20 10:58:47 +0200
30f7759fa
Unwanted file by
2017-06-19 19:07:22 +0200
5389b1548
unwanted file by
2017-06-19 19:04:12 +0200
018f6e934
Minor issues fixed Use current branch as tag by
2017-06-19 19:01:00 +0200
c9266e8fe
remove MoreDetailsCampaignButton.xaml from project by
2017-06-19 18:56:19 +0200
d9db0a65f
dev merge by
2017-06-19 18:50:43 +0200
85c9af690
Add serviceHelper and add campaingTemplate in campaing view by
2017-06-19 18:50:28 +0200
8a73ee4c5
Resolve big margin problem in fake location settings by
2017-06-19 18:49:03 +0200
ca46125c8
Add campaign view template by
2017-06-19 18:48:28 +0200
f0b2845a6
Add marketing scope to Xamarin client by
2017-06-19 18:47:48 +0200
bfb9eff00
Add CampaignDetail view and model view by
2017-06-19 18:47:14 +0200
9bdfddc49
Modify the campaign response of the marketing api by
2017-06-19 18:45:36 +0200
80c10a146
Add default fake location in settings by
2017-06-19 18:44:27 +0200
d8969aa60
Add fake_campaign_ images by
2017-06-19 18:43:30 +0200
a774e742f
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev by
2017-06-19 16:58:40 +0200
e1a007edf
Merge display marketing campaigns feature for SPA app by
2017-06-19 16:58:26 +0200
960097878
Update docker compose locations.api image name by
2017-06-19 16:55:41 +0200
8e20b8272
Update app services by
2017-06-19 16:45:52 +0200
94c9b0667
Merge from Dev by
2017-06-19 11:22:18 +0200
9e4e6799b
Added monoDb service Added graceperiodmanager service Added marketing service by
2017-06-19 11:19:01 +0200
847f145bc
Update spa marketing campaign view by
2017-06-19 10:21:29 +0200
9d76e79e5
Merge from marketing banner mvc by
2017-06-19 09:50:07 +0200
9fee40e35
Created marketing campaigns view details by
2017-06-19 09:46:48 +0200
249c7a510
Display marketing campaign details SPA by
2017-06-19 09:46:19 +0200
85b208550
Merge branch 'feature/display-marketing-banner-mvc' into dev by
2017-06-19 09:41:45 +0200
b36a05b64
Optimize query by
2017-06-19 09:41:24 +0200
d1708b494
Merge branch 'feature/display-marketing-banner-mvc' into dev by
2017-06-19 09:27:26 +0200
ed97efaf6
Check when the user doesn't have any location in database by
2017-06-19 00:34:00 +0200
703d02d59
Fixing YAML error by
2017-06-16 21:40:05 +0200
6d68e5fec
Unwanted spaces by
2017-06-16 21:01:15 +0200
19a87ebac
Merge branch 'k8s-update' of https://github.com/dotnet-architecture/eShopOnContainers into k8s-update by
2017-06-16 20:56:37 +0200
bd3d5072e
Deploy scripts updated: fixing some bugs by
2017-06-16 20:44:11 +0200
9cea92937
Deploy scripts updated: fixing some bugs by
2017-06-16 20:44:11 +0200
5dd1ce24f
Config files for k8s deployment of all services updated by
2017-06-16 17:40:27 +0200
18393c9a6
Config files for k8s deployment of all services updated by
2017-06-16 17:40:27 +0200
db4403b75
Add Pagination to Campaign View by
2017-06-16 16:50:15 +0200
fbb3b570b
Add new campaign tab and mocks services by
2017-06-16 16:50:53 +0200
86e405123
Add Pagination to Campaign View by
2017-06-16 16:50:15 +0200
9f6216b7a
Update to resources deployed: - SQL (marketingdb) - CosmosDb by
2017-06-16 13:14:14 +0200
a537e689f
Merge branch 'feature/display-marketing-banner-mvc' into dev by
2017-06-16 12:16:16 +0200
bc89bc1ec
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnAzure into dev by
2017-06-16 12:14:33 +0200
9979f1af9
Deploy storage by
2017-06-16 12:14:29 +0200
c88ece26e
Change condition in Campaign from and to by
2017-06-16 12:09:48 +0200
a146fd323
Remove campaign test images and add new two images and change the name campaign seed by
2017-06-16 11:44:51 +0200
278083ae8
Check when list is null and campaign details doesn't exist by
2017-06-16 10:13:26 +0200
ff790afe5
remove fake campaing test in CampaignsController by
2017-06-16 09:14:17 +0200
e80c5efdd
Add details view and add marketing scope in mvc project and identity config by
2017-06-16 01:20:03 +0200
91de99850
modify parameter type by
2017-06-15 19:26:38 +0200
cd1a091b6
Add polly to marketing api by
2017-06-15 19:26:24 +0200
ed7dfc7cb
Modify PictureUri name by
2017-06-15 19:25:08 +0200
08a45f2c3
Create Campaign view model and modify CampaignDTO by
2017-06-15 19:24:33 +0200
6a315764a
Create view for index campaing and his controller method by
2017-06-15 19:23:57 +0200
46db19663
Remove url from test by
2017-06-15 19:23:33 +0200
b764aebcd
Add campaign service methods by
2017-06-15 19:23:10 +0200
5208296b9
Add url to docker-compose by
2017-06-15 19:22:47 +0200
a894e22b7
Add Campaigns.components style by
2017-06-15 19:22:28 +0200
31423eebc
Add test pics (not demo pics) and PicController by
2017-06-15 19:16:26 +0200
08b4f9187
Add Name property and rename Url to PictureUri by
2017-06-15 19:14:16 +0200
2ad485015
Merge from Master by
2017-06-15 08:54:29 +0200
d6c6582b5
Merge from Master by
2017-06-15 08:54:29 +0200
6b9a51933
Add Campaigns items in header list by
2017-06-15 02:22:48 +0200
5d4023649
Create CampaignsController by
2017-06-15 02:22:24 +0200
b840ebd7f
Add campaignDTO by
2017-06-15 02:22:07 +0200
710e16455
Add get all campaigns by user id url by
2017-06-15 02:21:46 +0200
fdc15fb4f
Add index campaign view by
2017-06-15 02:21:03 +0200
870ac403a
Add Marketing endpoint by
2017-06-15 02:20:33 +0200
6168b52db
Add campaign Service by
2017-06-15 02:20:02 +0200
1d46ba3a1
Merge branch 'marketingcampaign' into dev by
2017-06-15 00:55:28 +0200