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

1761 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cesar De la Torre
740caee4ae Minor changes to the GracePeriodManager: Moved to the Ordering folder as it is part of the same BOUNDED CONTEXT or Ordering BUSINESS MICROSERVICE. Also, changed a log description when querying the database 2017-07-10 13:32:22 -07:00
Ramón Tomás
cee8d6e9e5 Added documentation for deploying Marketing Azure functions 2017-07-10 16:44:24 +02:00
Ramón Tomás
59c9b21420 Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev 2017-07-10 16:04:18 +02:00
Christian Arenas
03f23eafa4 Merge branch 'load-testing' into dev 
# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
#	src/Services/Identity/Identity.API/Configuration/Config.cs
#	src/Web/WebMVC/appsettings.json
 2017-07-10 14:40:26 +02:00
Christian Arenas
540f7510b9 Create a mvctest client, check when is the environment variable UseLoadTest in MVC project to true 2017-07-10 14:25:03 +02:00
Ramón Tomás
e1d8a8e23e Fix UI styles MVCApp 2017-07-10 14:24:01 +02:00
Christian Arenas
c367b01791 Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev 2017-07-10 12:10:20 +02:00
Christian Arenas
d440198180 Add release/debug docker-compose file to project 2017-07-10 12:10:13 +02:00
dsanz
ecf9933908 Add readme.md for the .env variables 2017-07-10 10:57:22 +02:00
dsanz
a8ad3edf30 Add Azure Storage Account Health Checks to Marketing.API 2017-07-07 14:05:52 +02:00
Christian Arenas
b74a1b6db5 Add 100 stock units to products 2017-07-07 12:36:26 +02:00
Christian Arenas
4a3e2d4612 rename ESHOP_AZURE_STORAGE_ACCOUNT_NAME/KEY variable to ESHOP_AZURE_STORAGE_CATALOG_NAME/KEY 2017-07-07 12:22:48 +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
Christian Arenas
ee698ad483 Create a new solution named Azure Functions and remove the marketing azure function from ServiceAndWebApps 2017-07-06 15:30:58 +02:00
Christian Arenas
bb377f0ff7 Add marketing storage ARM 2017-07-06 12:25:22 +02:00
Christian Arenas
8cb861dab8 Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev 2017-07-06 12:07:03 +02:00
Christian Arenas
32415615b9 Add azure function ACR 2017-07-06 12:06:38 +02:00
dsanz
fd97ed8765 Fix issue 2017-07-06 11:42:49 +02:00
dsanz
92dde7e49d Merge branch 'update-WebStatus' into dev 2017-07-06 11:40:29 +02:00
dsanz
8051114da9 Add Azure Storage check in Catalog health checks. 2017-07-06 11:38:45 +02:00
Christian Arenas
b240357c3a Check when CampaignDetailFunctionUri is not null and return DetailsUri 2017-07-06 08:44:46 +02:00
Eduard Tomas
cc6c443216 Upfate catalog config on k8s 2017-07-05 16:01:14 +02:00
Christian Arenas
3f560757a4 cleanup 2017-07-05 13:38:34 +02:00
Christian Arenas
34e2e19269 Add DetailsUri property to CampaignItem and Add VIEW SITE button in campaign details when the DetailsUri exists 2017-07-05 13:38:19 +02:00
Christian Arenas
ae8d38bdf6 Add StringNullOrEmptyBoolConverter to check when string value is null or empty 2017-07-05 13:37:18 +02:00
Christian Arenas
66ee0039e5 Add StringNullOrEmptyBoolConverter to check when string value is null or empty 2017-07-05 13:37:06 +02:00
dsanz
eb7abbc984 Merge branch 'dev' into update-WebStatus 2017-07-05 11:08:59 +02:00
Christian Arenas
060cc48cf4 Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev 2017-07-05 08:24:37 +02:00
Eduard Tomas
7258a58f5b All docker compose to version 2.1 that seems to work in vsts hosted linux build agent 2017-07-04 14:52:56 +02:00
dsanz
a65e9c01eb Add Healthchecks to Locations.API and MArketing.API 2017-07-04 13:51:05 +02:00
Eduard Tomas
e9b4235543 use version '2' for docker-compose.ci.build.yml 
Higher versions seems to not be compatible with hosted linux build agent
 2017-07-04 12:34:28 +02:00
Christian Arenas
d6e140a49b Add PictureFileName seed and add rename PictureUri column name to PictureFileName 2017-07-04 12:01:09 +02:00
Christian Arenas
595988779f Add GetItems load test 2017-07-04 08:47:54 +02:00
Eduard Tomas
4fe02d9b44 k8s deployment 
config moved from custom json to standard k8s yaml
 2017-07-03 16:57:10 +02:00
Christian Arenas
1837bf2032 Add Ordering Api test and cleanup tests 2017-07-01 00:11:12 +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
Eduard Tomas
c997fe0881 Add cloud.json reference config.file. It contains invalid values. 2017-06-30 16:20:43 +02:00
Eduard Tomas
00e6ab58d8 Update k8s script and doc 2017-06-30 16:16:00 +02:00
Christian Arenas
ee8da23999 Add basket test 2017-06-30 15:05:45 +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
Christian Arenas
bbcc23d053 Add GetBasket and GetUserCampaigns, and cleanup 2017-06-29 20:04:33 +02:00
Christian Arenas
3a5f1b8232 Add Marketing, locations, payment and gracePeriod Subscription in servicebus ARM file 2017-06-29 09:55:19 +02:00
Christian Arenas
aa813b7f8c Add CatalogApi load test 2017-06-28 19:09:29 +02:00
Christian Arenas
ddcb665bcd Edit the test assert 2017-06-28 18:06:16 +02:00
Christian Arenas
6a0001b9c6 Add new LoadTest project, add new Catalog integration test and add new webMVC load test 2017-06-28 17:59:59 +02:00
Eduard Tomas
10d03a68e3 Merge remote-tracking branch 'eShopOnAzure/dev' into dev 
# Conflicts:
#	docker-compose.override.yml
#	src/Services/Catalog/Catalog.API/CatalogSettings.cs
#	src/Services/Catalog/Catalog.API/Controllers/CatalogController.cs
#	src/Services/Catalog/Catalog.API/Controllers/PicController.cs
#	src/Services/Catalog/Catalog.API/Infrastructure/CatalogContextSeed.cs
#	src/Services/Catalog/Catalog.API/settings.json
#	src/Services/Ordering/Ordering.API/Startup.cs
 2017-06-28 12:40:21 +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
b918826a6c remove userId parameter from GetCampaignsByUserId from functional test 2017-06-26 19:22:17 +02:00
Christian Arenas
83e425da2b Add Cancel button in order detail view when the status is submitted and add requestId guid to create a new order 2017-06-26 18:32:25 +02:00