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

3088 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian Arenas
8494e77687 add version 1 to Campaigns web api 2017-06-01 22:19:07 +02:00
Christian Arenas
ac5daa6146 add version 1 to Campaigns web api 2017-06-01 22:19:07 +02:00
Christian Arenas
83b229f4a1 rename file name 2017-06-01 22:13:19 +02:00
Christian Arenas
314768b9ce rename file name 2017-06-01 22:13:19 +02:00
Christian Arenas
f993c8c33d Remove unused class 2017-06-01 20:26:10 +02:00
Christian Arenas
baab0d2a98 Remove unused class 2017-06-01 20:26:10 +02:00
Christian Arenas
37af8a0e82 Merge remote-tracking branch 'origin/dev' into marketingcampaing 
# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
 2017-06-01 20:19:33 +02:00
Christian Arenas
8d3ae671a8 Merge remote-tracking branch 'origin/dev' into marketingcampaing 
# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
 2017-06-01 20:19:33 +02:00
Ramón Tomás
bae10b07b8 Created UserLocationModel 
Map Position to Locations APi
Update current user location
 2017-06-01 20:16:19 +02:00
Ramón Tomás
13cfe43378 Created UserLocationModel 
Map Position to Locations APi
Update current user location
 2017-06-01 20:16:19 +02:00
Christian Arenas
32247c503d Add marketing api 2017-06-01 20:15:21 +02:00
Christian Arenas
9b95bd9762 Add marketing api 2017-06-01 20:15:21 +02:00
Eduard Tomas
b42fe3527a Resilience enhancements. 
MVC app now waits other containers
 2017-06-01 14:32:22 +02:00
Eduard Tomas
694253d4e9 Resilience enhancements. 
MVC app now waits other containers
 2017-06-01 14:32:22 +02:00
Christian Arenas
665733c40e Add marketing resource to identity 2017-06-01 10:10:37 +02:00
Christian Arenas
3a8481086c Add marketing resource to identity 2017-06-01 10:10:37 +02:00
Christian Arenas
6082359f08 Add docker support 2017-06-01 10:10:20 +02:00
Christian Arenas
4b86ca0a77 Add docker support 2017-06-01 10:10:20 +02:00
Christian Arenas
1ac1dae9d3 Add Marketing.API project 2017-06-01 10:10:00 +02:00
Christian Arenas
4dc8b65e8b Add Marketing.API project 2017-06-01 10:10:00 +02: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
5794e25d6e Merge branch 'azurestorage' into dev 2017-05-30 18:35:18 +02:00
Christian Arenas
4d07fecc3b fix merge error 2017-05-30 18:35:09 +02:00
Christian Arenas
ea02ecc160 Merge branch 'azureredis' into dev 
# Conflicts:
#	src/Services/Basket/Basket.API/Startup.cs
#	src/Services/Basket/Basket.API/appsettings.json
 2017-05-30 18:32:28 +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
7694602be2 Rename property PictureFile to PictureFileName in Migration Designer 2017-05-30 17:53:15 +02:00
Christian Arenas
2cad62d642 Add ESHOP_AZURE_REDIS variable from .env with default value 2017-05-30 17:30:01 +02:00
Christian Arenas
9866aae07c Change version of docker-compose from 2 to 2.1 for default values. 
I set "http://localhost:5101/api/v1/pic/" because docker-compose doesn't allow to declare another variable such as default value
 2017-05-30 17:24:46 +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
45ed8a60ad Add PictureFileName field for saving the name of the file. PictureUri will be the url of the image (api or azure storage) 2017-05-30 17:14:28 +02:00
Ramón Tomás
9d5cde2057 #2412-Create Location Microservice 2017-05-30 15:01:58 +02:00
Ramón Tomás
83166cde12 #2412-Create Location Microservice 2017-05-30 15:01:58 +02:00
Christian Arenas
6b480e3d41 Apply ConnectionString changes (remove condition) 2017-05-29 16:04:35 +02:00
Christian Arenas
e309d97d18 remove AzureRedisConnectionString variable from settings 2017-05-29 16:03:51 +02:00
Eduard Tomàs
d678052b4f Merge pull request #204 from frankibem/patch-1 
Update ProfileService.cs
 2017-05-29 15:44:52 +02:00
Eduard Tomàs
5a1eac2404 Merge pull request #204 from frankibem/patch-1 
Update ProfileService.cs
 2017-05-29 15:44:52 +02:00
Eduard Tomas
64b9ea6f79 Redis deploy ARM template and doc 2017-05-29 15:42:59 +02:00
Christian Arenas
2d4f9d3323 Add ESHOP_AZURE_SERVICE_BUS variable from .env with default value 2017-05-29 15:42:09 +02:00
Christian Arenas
0473a97225 change the "AzureRedisEnabled" condition to configure declaration 2017-05-29 12:42:51 +02:00
Eduard Tomas
ad1637e76b Merge branch 'servicebus' of https://github.com/dotnet-architecture/eShopOnAzure into servicebus 2017-05-29 11:51:45 +02:00
Eduard Tomas
bd03600aaa sql template updated 2017-05-29 11:51:34 +02:00
Christian Arenas
60c08ce9c5 Revert "Remove basket.data from docker-compose" 
This reverts commit 9549786003d723493d865ba83420ed127bc34d53.
 2017-05-29 11:06:22 +02:00
Christian Arenas
db7d2a3ff3 Add "AzureRedisConnectionString" environment variable and add a connectionString condition when "AzureRedisEnabled" environment variable is true 2017-05-29 11:01:56 +02:00
Christian Arenas
41a6814293 Add new connection string 2017-05-29 10:12:07 +02:00
Eduard Tomas
ec7a251839 Service Bus deploy template and doc 2017-05-29 09:21:27 +02:00
Ramón Tomás
af2d37bcc6 Changed Xamarin app authentication to Hybrid flow mode 2017-05-29 08:41:11 +02:00
Ramón Tomás
99890b9379 Changed Xamarin app authentication to Hybrid flow mode 2017-05-29 08:41:11 +02:00
Ramón Tomás
2a64d2245f Merge branch 'dev' into hybrid-flow-xamarin 2017-05-29 08:31:49 +02:00
Ramón Tomás
9d44a397b0 Merge branch 'dev' into hybrid-flow-xamarin 2017-05-29 08:31:49 +02:00