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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Ramón Tomás
|
cb546c9d3f
|
Fix errors when setting container images and rolling out deployments in deploy script
|
2017-05-25 09:24:37 +02:00 |
|
Ramón Tomás
|
e3c6ee162b
|
Fix errors when setting container images and rolling out deployments in deploy script
|
2017-05-25 09:24:37 +02:00 |
|
Ramón Tomás
|
8b9456d210
|
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
|
2017-05-24 17:32:55 +02:00 |
|
Ramón Tomás
|
920f3956eb
|
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
|
2017-05-24 17:32:55 +02:00 |
|
Ramón Tomás
|
e250a8f8c5
|
Change k8s deployment config to deploy the redis service in another pod
Set internal urls in k8s config for pod communication
|
2017-05-24 17:32:39 +02:00 |
|
Ramón Tomás
|
42d7c1704a
|
Change k8s deployment config to deploy the redis service in another pod
Set internal urls in k8s config for pod communication
|
2017-05-24 17:32:39 +02:00 |
|
Ramón Tomás
|
b84498d8ec
|
Clean commented tests
|
2017-05-24 16:46:34 +02:00 |
|
Ramón Tomás
|
8d3041363a
|
Clean commented tests
|
2017-05-24 16:46:34 +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 |
|
Ramón Tomás
|
889d3c86e7
|
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 |
|
David Britch
|
784dc72573
|
Ensure iOS project builds in VS Mac by adding SkipValidatePackageReferences entry to .csproj.
|
2017-05-24 14:17:37 +01:00 |
|
David Britch
|
8908cecd6e
|
Ensure iOS project builds in VS Mac by adding SkipValidatePackageReferences entry to .csproj.
|
2017-05-24 14:17:37 +01:00 |
|
Ramón Tomás
|
1ef6e0c060
|
Removed Saga feature
|
2017-05-24 08:53:36 +02:00 |
|
Ramón Tomás
|
1218069eaf
|
Removed Saga feature
|
2017-05-24 08:53:36 +02:00 |
|
Cesar De la Torre
|
733c7ee72b
|
Merge pull request #200 from ahmedalejo/patch-1
Minor cold clean up to avoid unnecessary code execution
|
2017-05-23 10:15:31 -07:00 |
|