Shaun Walker
|
18b91ee5f1
|
minor fixes to data and UI customization
|
2017-06-23 11:49:25 -07:00 |
|
Christian Arenas
|
4f198f179e
|
Add a shipped order mock
|
2017-06-23 13:01:57 +02:00 |
|
Christian Arenas
|
4f54dae03d
|
Rename OrderState property to OrderStatus and add new status items
|
2017-06-23 12:57:25 +02:00 |
|
Shaun Walker
|
632c023a3f
|
strip quotes, fix image transparency, format price and amount
|
2017-06-22 17:26:57 -07:00 |
|
Eduard Tomas
|
636ec01415
|
fixed invalid WebMVC csproj entries
|
2017-06-22 20:11:36 +02:00 |
|
Christian Arenas
|
290057789b
|
Add styling
|
2017-06-22 19:05:34 +02:00 |
|
Christian Arenas
|
55c2c666c0
|
clean up and style improving
|
2017-06-22 15:10:59 +02:00 |
|
Christian Arenas
|
56ec1d9ed9
|
clean up and style improving
|
2017-06-22 15:10:47 +02:00 |
|
Shaun Walker
|
514254818f
|
make Docker-Compose the Default Project in the solution
|
2017-06-21 15:27:42 -07:00 |
|
Shaun Walker
|
9229a8d0fd
|
support for additional CatalogItem properties
|
2017-06-21 15:27:12 -07:00 |
|
Christian Arenas
|
f34a4fee2a
|
Add text message when gps system is enabled and change the name GpsUsage to AllowGpsLocation
|
2017-06-21 19:39:49 +02:00 |
|
Christian Arenas
|
5f4d42520d
|
Add GeolocatorPlugin-1.0.3 to IOS and Windows project
|
2017-06-21 19:26:06 +02:00 |
|
Christian Arenas
|
2fe1935e95
|
Merge branch 'dev' into feature/GPS-location-xamarin
|
2017-06-21 17:30:42 +02:00 |
|
Christian Arenas
|
5d124369a1
|
Add Location permissions in ios
|
2017-06-21 17:30:37 +02:00 |
|
Christian Arenas
|
6a02eb31c9
|
Add gps usage options
|
2017-06-21 17:30:19 +02:00 |
|
Eduard Tomas
|
0fe33b7f3d
|
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
|
2017-06-21 12:38:30 +02:00 |
|
Eduard Tomas
|
cd42c17cd1
|
Buildfiles to mitigate msbuild issue - https://github.com/Microsoft/msbuild/issues/2153
|
2017-06-21 12:38:21 +02:00 |
|
Christian Arenas
|
6a4088d3b5
|
Merge branch 'feature/GPS-location-xamarin' into dev
|
2017-06-21 11:48:42 +02:00 |
|
Christian Arenas
|
a65254e385
|
Merge branch 'feature/track-user-location-mongodb' into dev
|
2017-06-21 11:48:38 +02:00 |
|
Christian Arenas
|
123cd9e1c1
|
Add point of union from the polygon
|
2017-06-21 11:47:34 +02:00 |
|
Christian Arenas
|
cae44bcbba
|
Add Barcelona location seed
|
2017-06-21 11:06:33 +02:00 |
|
Christian Arenas
|
d75f48035f
|
Clean up and add location permissions in windows phone project
|
2017-06-21 11:04:42 +02:00 |
|
Shaun Walker
|
445101b376
|
data and UI customization enhancements
|
2017-06-20 12:54:32 -07:00 |
|
Christian Arenas
|
1d3cad9e67
|
Get gps location from core project.
|
2017-06-20 18:47:23 +02:00 |
|
Eduard Tomas
|
75065026fc
|
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
|
2017-06-20 18:41:29 +02:00 |
|
Cesar De la Torre
|
fdf550e7c2
|
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.'
|
2017-06-20 09:15:41 -07:00 |
|
Eduard Tomas
|
8c9498c7a1
|
Allow create or not ACR when creating k8s
|
2017-06-20 17:17:13 +02:00 |
|
Eduard Tomas
|
11a5293fa0
|
Merge branch 'k8s-update' into dev
# Conflicts:
# docker-compose.yml
|
2017-06-20 16:50:03 +02:00 |
|
Eduard Tomas
|
f17e350fa0
|
Refactor and allow option to NOT build netcore projects when creating docker images
|
2017-06-20 16:47:42 +02:00 |
|
Christian Arenas
|
71f1a67934
|
Merge branch 'feature/display-marketing-campaigns-on-xamarin' into dev
|
2017-06-20 11:37:33 +02:00 |
|
Christian Arenas
|
1fcf069c64
|
Merge branch 'feature/display-marketing-banner-mvc' into dev
|
2017-06-20 11:37:26 +02:00 |
|
Christian Arenas
|
08dcc320f6
|
Fix marketing pagination display page number
|
2017-06-20 11:37:01 +02:00 |
|
Christian Arenas
|
33acdcf9dc
|
Clean up
|
2017-06-20 10:59:01 +02:00 |
|
Christian Arenas
|
cdfe85bdaf
|
Add marketing unit test to project
|
2017-06-20 10:58:47 +02:00 |
|
Eduard Tomas
|
30f7759fa1
|
Unwanted file
|
2017-06-19 19:07:22 +02:00 |
|
Eduard Tomas
|
5389b15483
|
unwanted file
|
2017-06-19 19:04:12 +02:00 |
|
Eduard Tomas
|
018f6e9342
|
Minor issues fixed
Use current branch as tag
|
2017-06-19 19:01:00 +02:00 |
|
Christian Arenas
|
c9266e8fea
|
remove MoreDetailsCampaignButton.xaml from project
|
2017-06-19 18:56:19 +02:00 |
|
Christian Arenas
|
d9db0a65f2
|
dev merge
|
2017-06-19 18:50:43 +02:00 |
|
Christian Arenas
|
85c9af690f
|
Add serviceHelper and add campaingTemplate in campaing view
|
2017-06-19 18:50:28 +02:00 |
|
Christian Arenas
|
8a73ee4c59
|
Resolve big margin problem in fake location settings
|
2017-06-19 18:49:03 +02:00 |
|
Christian Arenas
|
ca46125c83
|
Add campaign view template
|
2017-06-19 18:48:28 +02:00 |
|
Christian Arenas
|
f0b2845a6f
|
Add marketing scope to Xamarin client
|
2017-06-19 18:47:48 +02:00 |
|
Christian Arenas
|
bfb9eff00a
|
Add CampaignDetail view and model view
|
2017-06-19 18:47:14 +02:00 |
|
Christian Arenas
|
9bdfddc496
|
Modify the campaign response of the marketing api
|
2017-06-19 18:45:36 +02:00 |
|
Christian Arenas
|
80c10a1465
|
Add default fake location in settings
|
2017-06-19 18:44:27 +02:00 |
|
Christian Arenas
|
d8969aa60a
|
Add fake_campaign_ images
|
2017-06-19 18:43:30 +02:00 |
|
Ramón Tomás
|
a774e742fa
|
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
|
2017-06-19 16:58:40 +02:00 |
|
Ramón Tomás
|
e1a007edfa
|
Merge display marketing campaigns feature for SPA app
|
2017-06-19 16:58:26 +02:00 |
|
Ramón Tomás
|
960097878c
|
Update docker compose locations.api image name
|
2017-06-19 16:55:41 +02:00 |
|