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

1266 Commits

Author SHA1 Message Date
Ramón Tomás
d657428e78 Merge from Dev 2017-06-02 13:22:40 +02:00
Christian Arenas
8494e77687 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
f993c8c33d 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
Ramón Tomás
bae10b07b8 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
Eduard Tomas
b42fe3527a 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
1ac1dae9d3 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
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
5482ccdf0d 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
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
Christian Arenas
ed0e548e2d minor naming 2017-05-26 01:35:44 +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
565be77825 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
04b35492c3 Add SubscriptionClientName EnvironmentVariable 2017-05-24 16:25:41 +02:00
Ramón Tomás
8c2af8c048 Clean Basket event is launched once basket is converted to order and before starting creating order. 
Change grace period time  to 1 minute
Remove unecessary clean basket methods on client
 2017-05-24 16:09:03 +02:00
Christian Arenas
721a4fd02b - Declare new ServiceBus instance with "AzureServiceBus" boolean condition DI 
- Add ServiceBusConnection and AzureServiceBus variables in settings
- Add EventBusServiceBus dependencies
 2017-05-24 15:33:38 +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
Christian Arenas
7980c2679d - Declare new ServiceBus instance with "AzureServiceBus" boolean condition 
- Add ServiceBusConnection and AzureServiceBus variables in settings
- Add EventBusServiceBus dependencies
 2017-05-24 15:32:22 +02:00
Ramón Tomás
1ef6e0c060 Removed Saga feature 2017-05-24 08:53:36 +02:00
Cesar De la Torre
1f7dbac140 Merge pull request #199 from SychevIgor/dev 
Packages update to 1.1.* and Swagger update
 2017-05-23 09:21:32 -07:00
igorsych
4790981e80 swagger/ui to swagger url fix 2017-05-23 16:39:22 +03:00
Cesar De la Torre
e2b6580629 Update BasketController.cs 2017-05-22 15:56:22 -07:00
Cesar De la Torre
aee9ec768e Update BasketController.cs 2017-05-22 15:54:18 -07:00
Cesar De la Torre
2a7c1d740b Minor refactoring 2017-05-20 12:35:16 -07:00
Cesar De la Torre
df50d6cc08 Minor refactoring in method from ServiceBus to EventBus 2017-05-20 10:17:06 -07:00
igorsych
9e75504690 Newtonsoft.Json and MediatR with fixes of all based on MediatR classes 
also from csproj files excluded direct specification of runtime to make compile happy if on a system we have higher version.
 2017-05-19 18:03:05 +03:00