ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,782 Commits 36 Branches 19 Tags 655 MiB
Commit Graph

1782 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Eduard Tomas
9f6216b7a3 Update to resources deployed: 
- SQL (marketingdb)
- CosmosDb
 2017-06-16 13:14:14 +02:00
Christian Arenas
a537e689f4 Merge branch 'feature/display-marketing-banner-mvc' into dev 2017-06-16 12:16:16 +02:00
Eduard Tomas
bc89bc1ec4 Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnAzure into dev 2017-06-16 12:14:33 +02:00
Eduard Tomas
9979f1af96 Deploy storage 2017-06-16 12:14:29 +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