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

627 Commits

Author SHA1 Message Date
Ramón Tomás
e1d8a8e23e Fix UI styles MVCApp 2017-07-10 14:24:01 +02:00
Christian Arenas
06cbab4731 Merge branch 'feature/marketing-details-azure-function' into dev 
# Conflicts:
#	docker-compose.vs.debug.yml
#	docker-compose.vs.release.yml
#	eShopOnContainers-ServicesAndWebApps.sln
#	src/Services/Location/Locations.API/Startup.cs
#	src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs
#	src/Services/Marketing/Marketing.API/Marketing.API.csproj
#	src/Services/Marketing/Marketing.API/Startup.cs
#	src/Web/WebMVC/appsettings.json
#	src/Web/WebSPA/AppSettings.cs
#	test/Services/FunctionalTests/Services/Marketing/MarketingScenarios.cs
 2017-07-07 11:56:57 +02:00
dsanz
a65e9c01eb Add Healthchecks to Locations.API and MArketing.API 2017-07-04 13:51:05 +02:00
Ramón Tomás
525040b9b6 Created Azure functions for details campaign 
Adapt MVC app to azure function details campaign
Adapt SPA app to azure function details campaign
 2017-06-30 16:31:22 +02:00
Ramón Tomás
f993463856 Implemented service bus for marketing.api locations.api graceperiodProcess payment.api 2017-06-30 08:59:26 +02:00
Eduard Tomas
d65a112535 References updated to preview-2 
code adjustements to work with preview-2
 2017-06-29 18:36:57 +02:00
Eduard Tomas
96c3f5c2bc Merge remote-tracking branch 'origin/feature/data-and-ui-customization-v2' into dev 
# Conflicts:
#	docker-compose.override.yml
#	src/Web/WebMVC/WebMVC.csproj
#	src/Web/WebMVC/wwwroot/css/shared/components/identity/identity.css
#	src/Web/WebMVC/wwwroot/css/site.min.css
#	src/Web/WebSPA/AppSettings.cs
 2017-06-28 12:20:20 +02:00
Christian Arenas
b172fb29d6 Merge branch 'adapt-xamarin-new-order-workflow' into dev 2017-06-26 19:22:44 +02:00
Christian Arenas
b28c650e06 Remove userId setting from xamarin app and remove userId parameter from GetCampaignsByUserId in Campaign API 2017-06-26 18:29:51 +02:00
Ramón Tomás
a3e63c11aa Merge from eShopOnContainers Dev 2017-06-26 13:51:49 +02:00
Shaun Walker
a6cef8009c replace main banner in SPA app 2017-06-23 12:04:40 -07:00
Eduard Tomas
65bcf48246 Dealing with auth and package versions issues between 1.1 and 2.0 2017-06-23 18:45:20 +02:00
Shaun Walker
632c023a3f strip quotes, fix image transparency, format price and amount 2017-06-22 17:26:57 -07:00
Eduard Tomas
eba0a53562 fixed invalid WebMVC csproj entries 2017-06-22 20:13:12 +02:00
Eduard Tomas
636ec01415 fixed invalid WebMVC csproj entries 2017-06-22 20:11:36 +02:00
Eduard Tomas
340d50fddd WebStatus Nuget updated 2017-06-22 16:56:10 +02:00
Eduard Tomas
fdd9a36719 MVC auth updated to 2.0.0 2017-06-22 16:55:57 +02:00
Eduard Tomas
bbc682d6a9 WebMVC nuget update 2017-06-22 16:22:41 +02:00
Eduard Tomas
0a1f14f1f1 WebSPA nuget update 2017-06-22 16:19:54 +02:00
IgorSychev
071716accb we are not using banners and js in healthcheck 2017-06-22 14:14:07 +03:00
IgorSychev
450eee48cd we don't need jquery.validate for such a simple page 2017-06-22 14:13:57 +03:00
Eduard Tomas
56902a5549 [WIP] Projects & Dockerfile migrated to 2.0 
Lots of things to address yet, because nuget packages are still on 1.1
 2017-06-21 19:03:48 +02:00
Shaun Walker
445101b376 data and UI customization enhancements 2017-06-20 12:54:32 -07: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
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
d9db0a65f2 dev merge 2017-06-19 18:50:43 +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
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
86e4051235 Add Pagination to Campaign View 2017-06-16 16:50:15 +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
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
Christian Arenas
a894e22b74 Add Campaigns.components style 2017-06-15 19:22:28 +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