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 |
|
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 |
|
Cesar De la Torre
|
3a64afa4ee
|
Minor update
|
2017-05-28 12:16:27 -07:00 |
|
Cesar De la Torre
|
8b697c3fef
|
Minor update
|
2017-05-28 12:16:27 -07: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 |
|
Christian Arenas
|
9549786003
|
Remove basket.data from docker-compose
|
2017-05-27 18:33:38 +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 |
|
Eduard Tomas
|
a9b49c9589
|
Merge branch 'compose-reorg' into dev
|
2017-05-25 13:03:26 +02:00 |
|
Eduard Tomas
|
22a098fd23
|
Merge branch 'compose-reorg' into dev
|
2017-05-25 13:03:26 +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 |
|