Christian Arenas
|
6a02eb31c9
|
Add gps usage options
|
2017-06-21 17:30:19 +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
|
11a5293fa0
|
Merge branch 'k8s-update' into dev
# Conflicts:
# docker-compose.yml
|
2017-06-20 16:50:03 +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
|
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
|
e1a007edfa
|
Merge display marketing campaigns feature for SPA app
|
2017-06-19 16:58:26 +02:00 |
|
Ramón Tomás
|
847f145bc2
|
Update spa marketing campaign view
|
2017-06-19 10:21:29 +02:00 |
|
Ramón Tomás
|
9d76e79e53
|
Merge from marketing banner mvc
|
2017-06-19 09:50:07 +02:00 |
|
Ramón Tomás
|
9fee40e358
|
Created marketing campaigns view details
|
2017-06-19 09:46:48 +02:00 |
|
Ramón Tomás
|
249c7a5105
|
Display marketing campaign details SPA
|
2017-06-19 09:46:19 +02:00 |
|
Christian Arenas
|
85b2085504
|
Merge branch 'feature/display-marketing-banner-mvc' into dev
|
2017-06-19 09:41:45 +02:00 |
|
Christian Arenas
|
b36a05b64b
|
Optimize query
|
2017-06-19 09:41:24 +02:00 |
|
Christian Arenas
|
d1708b4945
|
Merge branch 'feature/display-marketing-banner-mvc' into dev
|
2017-06-19 09:27:26 +02:00 |
|
Christian Arenas
|
ed97efaf61
|
Check when the user doesn't have any location in database
|
2017-06-19 00:34:00 +02:00 |
|
Christian Arenas
|
db4403b75c
|
Add Pagination to Campaign View
(cherry picked from commit 86e40512352a44021ea69ed948062d0b510141cf)
|
2017-06-16 16:51:35 +02:00 |
|
Christian Arenas
|
fbb3b570b8
|
Add new campaign tab and mocks services
|
2017-06-16 16:50:53 +02:00 |
|
Christian Arenas
|
86e4051235
|
Add Pagination to Campaign View
|
2017-06-16 16:50:15 +02:00 |
|
Christian Arenas
|
a537e689f4
|
Merge branch 'feature/display-marketing-banner-mvc' into dev
|
2017-06-16 12:16:16 +02:00 |
|
Christian Arenas
|
c88ece26e6
|
Change condition in Campaign from and to
|
2017-06-16 12:09:48 +02:00 |
|
Christian Arenas
|
a146fd3239
|
Remove campaign test images and add new two images and change the name campaign seed
|
2017-06-16 11:44:51 +02:00 |
|
Christian Arenas
|
278083ae8e
|
Check when list is null and campaign details doesn't exist
|
2017-06-16 10:13:26 +02:00 |
|
Christian Arenas
|
ff790afe56
|
remove fake campaing test in CampaignsController
|
2017-06-16 09:14:17 +02:00 |
|
Christian Arenas
|
e80c5efdd3
|
Add details view and add marketing scope in mvc project and identity config
|
2017-06-16 01:20:03 +02:00 |
|
Christian Arenas
|
91de998506
|
modify parameter type
|
2017-06-15 19:26:38 +02:00 |
|
Christian Arenas
|
cd1a091b6f
|
Add polly to marketing api
|
2017-06-15 19:26:24 +02:00 |
|
Christian Arenas
|
ed7dfc7cb5
|
Modify PictureUri name
|
2017-06-15 19:25:08 +02:00 |
|
Christian Arenas
|
08a45f2c35
|
Create Campaign view model and modify CampaignDTO
|
2017-06-15 19:24:33 +02:00 |
|
Christian Arenas
|
6a315764a8
|
Create view for index campaing and his controller method
|
2017-06-15 19:23:57 +02:00 |
|
Christian Arenas
|
b764aebcd1
|
Add campaign service methods
|
2017-06-15 19:23:10 +02:00 |
|