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

1522 Commits

Author SHA1 Message Date
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
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
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
Christian Arenas
0473a97225 change the "AzureRedisEnabled" condition to configure declaration 2017-05-29 12:42:51 +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
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
Ramón Tomás
5482ccdf0d Changed Xamarin app authentication to Hybrid flow 2017-05-29 08:30:33 +02:00
Ramón Tomás
55271568e9 Changed Xamarin app authentication to Hybrid flow 2017-05-29 08:30:33 +02:00
Christian Arenas
cd790f276f Update StackExchange.Redis version 2017-05-27 18:35:44 +02:00
Christian Arenas
c23d2551cd Add new redis connection getting data from environment variable 2017-05-27 18:35:28 +02:00
Christian Arenas
b30d09fbf5 Add Redis connectionString to environment variable 2017-05-27 18:34:36 +02:00
Frank Ibem
da582dac39 Update ProfileService.cs 
Update check for LastName value in GetClaimsFromUser()
 2017-05-26 20:35:56 -05:00
Frank Ibem
0567ff85b1 Update ProfileService.cs 
Update check for LastName value in GetClaimsFromUser()
 2017-05-26 20:35:56 -05:00
Cesar De la Torre
4410e455e0 Updates to target .NET Core 1.1.2 - Version changes at every .csproj file, dockerfile and the docker-compose.ci.build.yml file for building from the CLI. 2017-05-25 17:01:10 -07:00
Cesar De la Torre
ad4142b94f Updates to target .NET Core 1.1.2 - Version changes at every .csproj file, dockerfile and the docker-compose.ci.build.yml file for building from the CLI. 2017-05-25 17:01:10 -07:00
Christian Arenas
ed0e548e2d minor naming 2017-05-26 01:35:44 +02:00
Christian Arenas
4399d6a4f3 Remove "Default" rule when the class is Instantiated 2017-05-26 01:35:19 +02:00
Ramón Tomás
e8dbf0c160 Rename grace period service in docker-compose files 2017-05-25 11:37:24 +02:00
Ramón Tomás
51c25c985e Rename grace period service in docker-compose files 2017-05-25 11:37:24 +02:00
Ramón Tomás
565be77825 Rename grace period directory 2017-05-25 11:08:43 +02:00
Ramón Tomás
b8f8fe51f8 Rename grace period directory 2017-05-25 11:08:43 +02:00
Christian Arenas
e454940801 environment variable renaming 2017-05-24 19:23:14 +02:00
Christian Arenas
9a100c9a27 Remove retry policy from DefaultServiceBusPersisterConnection parameter 2017-05-24 18:59:29 +02:00
Christian Arenas
390654a885 Remove old ServiceBusConnection declaration 2017-05-24 16:26:56 +02:00
Christian Arenas
d3bd0fabfd change log leve 2017-05-24 16:26:40 +02:00
Christian Arenas
64430618d7 remove declaration from interface 2017-05-24 16:26:21 +02:00