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

1336 Commits

Author SHA1 Message Date
David Britch
eec4c899a3 Fixed iOS project so that it builds. Also fixed iOS test runner project. 2017-07-20 16:27:25 +01:00
Ramón Tomás
292f93ab24 Added geolocator plugin to TestRunner.Droid proj 2017-07-19 13:49:27 +02:00
Eduard Tomas
7b4d995448 Invalid reference 2017-07-18 19:09:24 +02:00
Ramón Tomás
3c39ec5092 Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev 2017-07-14 14:53:35 +02:00
Ramón Tomás
d42033a83b Added UI alert and circuit-breaker handlers for components that depend on Basket.api 2017-07-14 14:53:17 +02:00
Cesar De la Torre
c7c176c4c1 Changed HealthCheck Cache duration time (Zero == No Cache) configuration for the Basket microservice. This is better for demos and can be changed at any time. 2017-07-13 14:48:55 -07:00
Ramón Tomás
f39fdb92ca Fix Failing middleware and move it to Basket.api 2017-07-13 17:35:19 +02:00
Ramón Tomás
bf34bff8dd Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev 2017-07-12 12:43:29 +02:00
Ramón Tomás
485505a7be Adapt changed Basket.Api url to Mvc and SPA apps 2017-07-12 12:43:15 +02:00
Christian Arenas
a757a42217 Add new ApiUrlBase to BasketService in Xamarin App 2017-07-12 12:30:38 +02:00
Ramón Tomás
7bb14783b1 Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev 2017-07-12 12:10:25 +02:00
Ramón Tomás
d289ec00cf Add swagger authorization option in APIs 2017-07-12 12:10:10 +02:00
Christian Arenas
010f805a90 fix xamarin location values when saving the settings with double type 2017-07-12 11:34:07 +02:00
Ramón Tomás
38ade40862 Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev 2017-07-11 13:48:49 +02:00
Ramón Tomás
84a2d500a7 Added alert when error ocurrs listing catalog products, orders and campaigns in SPA app 2017-07-11 13:48:07 +02:00
Christian Arenas
f0f88aee98 Add PicBaseUrl with a replaced parameter 2017-07-11 12:43:06 +02:00
Cesar De la Torre
27fae7c5d3 Fixed namespace copied/pasted from the Locations.API service into the Marketing service 2017-07-10 14:49:26 -07:00
Cesar De la Torre
260b2cdf2c Added a comment about the simulated payment 2017-07-10 14:17:16 -07:00
Cesar De la Torre
ec78ef12c5 Separating menu options so it is clearer in the UI 2017-07-10 14:11:43 -07:00
Cesar De la Torre
6b18c36f26 Eliminated the GracePeriod Logger message when querying as it is not needed and is quite anoying. 2017-07-10 13:37:55 -07:00
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
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
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
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
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
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
dsanz
a65e9c01eb Add Healthchecks to Locations.API and MArketing.API 2017-07-04 13:51:05 +02:00
Christian Arenas
d6e140a49b Add PictureFileName seed and add rename PictureUri column name to PictureFileName 2017-07-04 12:01:09 +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
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
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
Christian Arenas
699ec0001d Create IdentityService in marketing API 2017-06-26 18:31:04 +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
a56f99f684 Fix merge 2017-06-26 18:05:02 +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
Shaun Walker
18b91ee5f1 minor fixes to data and UI customization 2017-06-23 11:49:25 -07:00