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 |
|
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 |
|
Eduard Tomas
|
703d02d590
|
Fixing YAML error
|
2017-06-16 21:40:05 +02:00 |
|
Eduard Tomas
|
6d68e5fec9
|
Unwanted spaces
|
2017-06-16 21:01:15 +02:00 |
|
Eduard Tomas
|
19a87ebacf
|
Merge branch 'k8s-update' of https://github.com/dotnet-architecture/eShopOnContainers into k8s-update
|
2017-06-16 20:56:37 +02:00 |
|
Eduard Tomas
|
bd3d5072ed
|
Deploy scripts updated: fixing some bugs
|
2017-06-16 20:44:11 +02:00 |
|
Eduard Tomas
|
9cea929372
|
Deploy scripts updated: fixing some bugs
|
2017-06-16 20:44:11 +02:00 |
|
Eduard Tomas
|
5dd1ce24f3
|
Config files for k8s deployment of all services updated
|
2017-06-16 17:40:27 +02:00 |
|
Eduard Tomas
|
18393c9a6a
|
Config files for k8s deployment of all services updated
|
2017-06-16 17:40:27 +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
|
46db196633
|
Remove url from test
|
2017-06-15 19:23:33 +02:00 |
|
Christian Arenas
|
b764aebcd1
|
Add campaign service methods
|
2017-06-15 19:23:10 +02:00 |
|
Christian Arenas
|
5208296b97
|
Add url to docker-compose
|
2017-06-15 19:22:47 +02:00 |
|
Christian Arenas
|
a894e22b74
|
Add Campaigns.components style
|
2017-06-15 19:22:28 +02:00 |
|
Christian Arenas
|
31423eebcb
|
Add test pics (not demo pics) and PicController
|
2017-06-15 19:16:26 +02:00 |
|
Christian Arenas
|
08b4f9187a
|
Add Name property and rename Url to PictureUri
|
2017-06-15 19:14:16 +02:00 |
|
Ramón Tomás
|
d6c6582b51
|
Merge from Master
|
2017-06-15 08:54:29 +02:00 |
|
Ramón Tomás
|
2ad485015f
|
Merge from Master
|
2017-06-15 08:54:29 +02:00 |
|
Christian Arenas
|
6b9a519332
|
Add Campaigns items in header list
|
2017-06-15 02:22:48 +02:00 |
|
Christian Arenas
|
5d4023649f
|
Create CampaignsController
|
2017-06-15 02:22:24 +02:00 |
|
Christian Arenas
|
b840ebd7f6
|
Add campaignDTO
|
2017-06-15 02:22:07 +02:00 |
|
Christian Arenas
|
710e16455a
|
Add get all campaigns by user id url
|
2017-06-15 02:21:46 +02:00 |
|
Christian Arenas
|
fdc15fb4f9
|
Add index campaign view
|
2017-06-15 02:21:03 +02:00 |
|
Christian Arenas
|
870ac403af
|
Add Marketing endpoint
|
2017-06-15 02:20:33 +02:00 |
|
Christian Arenas
|
6168b52db8
|
Add campaign Service
|
2017-06-15 02:20:02 +02:00 |
|
Christian Arenas
|
9c2df21ab0
|
Merge branch 'marketingcampaign' into dev
|
2017-06-15 00:55:28 +02:00 |
|
Christian Arenas
|
1d46ba3a15
|
Merge branch 'marketingcampaign' into dev
|
2017-06-15 00:55:28 +02:00 |
|