20 Commits

Author SHA1 Message Date
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
Ramón Tomás
a56f99f684 Fix merge 2017-06-26 18:05:02 +02:00
Shaun Walker
445101b376 data and UI customization enhancements 2017-06-20 12:54:32 -07:00
Christian Arenas
39e69ee4e0 Merge branch 'servicebus' into dev
# Conflicts:
#	docker-compose.override.yml
#	src/Services/Catalog/Catalog.API/CatalogSettings.cs
#	src/Services/Catalog/Catalog.API/settings.json
2017-05-30 18:47:34 +02:00
Christian Arenas
18167186c9 Apply EventBusConnectionChanges 2017-05-30 17:59:57 +02:00
Christian Arenas
83ae0d48fc remove ServiceBusConnectionString variable from appsettings.json 2017-05-30 17:56:36 +02:00
Christian Arenas
1a385a2179 Add AzureStorageEnabled environment variable to get the origin of the product image from PicBaseUrl environment variable 2017-05-30 17:16:17 +02:00
Christian Arenas
41a6814293 Add new connection string 2017-05-29 10:12:07 +02:00
Christian Arenas
e454940801 environment variable renaming 2017-05-24 19:23:14 +02:00
Christian Arenas
04b35492c3 Add SubscriptionClientName EnvironmentVariable 2017-05-24 16:25:41 +02:00
Christian Arenas
3acd556c5c - Declare new ServiceBus instance with "AzureServiceBus" boolean condition DI
- Add ServiceBusConnection and AzureServiceBus variables in settings
- Add EventBusServiceBus dependencies
2017-05-24 15:33:05 +02:00
PLAINCONCEPTS\ccanizares
93bbd6516b Catalog Seed: Dynamic host url for image pics 2017-01-09 10:33:43 +01:00
Carlos Cañizares Estévez
10f3e17b55 Add Swagger to Basket Api
SQL databases with the same prefix for services
Move application tier to api tier in ordering api
2016-12-19 10:20:02 +01:00
Carlos Cañizares Estévez
31753fc057 MVC: Finish Orders integration (detail), validations, some refactor ...
Orders: Detail Query, new field in OrderDetail..
Identity: Validations in Register View, ensure all claims are returned in user end point..
2016-12-17 14:41:16 +01:00
Carlos Cañizares Estévez
44f238f3fd same SQL for catalog and ordering 2016-12-14 21:08:42 +01:00
Unai
339ea43f49 Added functional Tests for catalog and ordering 2016-11-24 16:26:59 +01:00
Carlos Cañizares Estévez
414c728e7b Catalog service integration in SPA, start basket Component SPA .. 2016-11-23 09:11:09 +01:00
Unai
3e001b40f0 Remove unnecesary comments and review settings 2016-11-14 15:48:30 +01:00
Unai
34043afa6b Review project. Update packages. Fix Http api 2016-10-31 16:54:55 +01:00
glennc
9dd626360a some initial dockerfiles and catalog work. Proof of concept more than anything else. 2016-09-14 11:35:36 -07:00