Christian Arenas
|
f058cfde21
|
fix error merge
|
2017-06-02 16:36:16 +02:00 |
|
Christian Arenas
|
345b71b50e
|
cleanup
|
2017-06-02 16:35:21 +02:00 |
|
Christian Arenas
|
1e3fd13362
|
Merge branch 'marketingcampaign' of https://github.com/dotnet-architecture/eShopOnContainers into marketingcampaign
# Conflicts:
# src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs
|
2017-06-02 16:34:37 +02:00 |
|
Christian Arenas
|
21dc4e3772
|
Add integration test
|
2017-06-02 16:33:01 +02:00 |
|
Christian Arenas
|
ae7f1e8e7a
|
initialitze the list in constructor
|
2017-06-02 16:32:50 +02:00 |
|
Christian Arenas
|
a705127653
|
Add migration folder
|
2017-06-02 16:32:24 +02:00 |
|
Christian Arenas
|
59b8fed228
|
modify context
|
2017-06-02 16:31:48 +02:00 |
|
Christian Arenas
|
5f976e90d4
|
update inital migration
|
2017-06-02 16:31:35 +02:00 |
|
Christian Arenas
|
05fe4ccd6d
|
Add exceptions filters
|
2017-06-02 16:31:03 +02:00 |
|
Christian Arenas
|
d4ab5b24d2
|
Add dtos
|
2017-06-02 16:30:39 +02:00 |
|
Christian Arenas
|
ac5daa6146
|
add version 1 to Campaigns web api
|
2017-06-01 22:19:07 +02:00 |
|
Christian Arenas
|
314768b9ce
|
rename file name
|
2017-06-01 22:13:19 +02:00 |
|
Christian Arenas
|
baab0d2a98
|
Remove unused class
|
2017-06-01 20:26:10 +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 |
|
Christian Arenas
|
9b95bd9762
|
Add marketing api
|
2017-06-01 20:15:21 +02:00 |
|
Eduard Tomas
|
694253d4e9
|
Resilience enhancements.
MVC app now waits other containers
|
2017-06-01 14:32:22 +02:00 |
|
Christian Arenas
|
3a8481086c
|
Add marketing resource to identity
|
2017-06-01 10:10:37 +02:00 |
|
Christian Arenas
|
4b86ca0a77
|
Add docker support
|
2017-06-01 10:10:20 +02:00 |
|
Christian Arenas
|
4dc8b65e8b
|
Add Marketing.API project
|
2017-06-01 10:10:00 +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
|
9d44a397b0
|
Merge branch 'dev' into hybrid-flow-xamarin
|
2017-05-29 08:31:49 +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
|
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
|
22a098fd23
|
Merge branch 'compose-reorg' into dev
|
2017-05-25 13:03:26 +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
|
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
|
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 |
|
Cesar De la Torre
|
2861898e6e
|
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 |
|
Cesar De la Torre
|
a5479ff7e7
|
Merge pull request #199 from SychevIgor/dev
Packages update to 1.1.* and Swagger update
|
2017-05-23 09:21:32 -07:00 |
|
igorsych
|
c211f9689d
|
swagger/ui to swagger url fix
|
2017-05-23 16:39:22 +03:00 |
|
Cesar De la Torre
|
f2769c2b73
|
Update BasketController.cs
|
2017-05-22 15:56:22 -07:00 |
|
Cesar De la Torre
|
e7608f4b12
|
Update BasketController.cs
|
2017-05-22 15:54:18 -07:00 |
|
Ahmed Aderopo Alejo
|
835729035b
|
Minor cold clean up to avoid unnecessary code execution
|
2017-05-20 19:58:14 -03:00 |
|
Cesar De la Torre
|
c3ca81b03c
|
Added the WebStatus WatchDog to the Kubernetes cluster deployment
|
2017-05-19 17:19:29 -07:00 |
|
Eduard Tomas
|
9d42f6a3b7
|
New docker compose files
|
2017-05-19 19:32:42 +02:00 |
|
igorsych
|
ec07a68751
|
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 |
|
Eduard Tomas
|
5dac841d69
|
Removing build action for webstatus
|
2017-05-19 12:55:25 +02:00 |
|
Eduard Tomas
|
82cfad4210
|
Build compose file
|
2017-05-19 12:30:26 +02:00 |
|
Eduard Tomas
|
546f443d7f
|
Forcing SDK version
|
2017-05-19 12:22:50 +02:00 |
|
igorsych
|
b13fce7043
|
Test packages update to the latest version
Redis and RabbitMQ also updated
Identity server changes reflectiong ac59db6e16 commit
|
2017-05-19 09:02:05 +03:00 |
|
igorsych
|
b2d28218dc
|
swagger update https://github.com/domaindrivendev/Swashbuckle.AspNetCore
|
2017-05-19 08:11:32 +03:00 |
|
igorsych
|
e4f5b5014b
|
.NET core packages update
|
2017-05-19 08:11:18 +03:00 |
|
Eduard Tomas
|
b435d8d5c3
|
Merge remote-tracking branch 'origin/master' into dev
|
2017-05-18 15:11:43 +02:00 |
|
Eduard Tomas
|
f6fdd7269d
|
Android sln for VSTS build
|
2017-05-18 13:29:02 +02:00 |
|
Eduard Tomas
|
61b375ddd9
|
iOS solution for VSTS build
|
2017-05-18 12:54:22 +02:00 |
|
Eduard Tomas
|
540f64d848
|
Merge branch 'containers-on-80' into dev
|
2017-05-17 16:26:32 +02:00 |
|
Ramón Tomás
|
e3f438882b
|
Modify k8s deployment script to support CD/CI deployment
Create documentation
|
2017-05-16 12:13:49 +02:00 |
|
David Britch
|
c551d1fcf9
|
Added SkipValidatePackageReferences entry to the PropertyGroup
|
2017-05-15 13:22:18 +01:00 |
|
Eduard Tomas
|
85b7df6b31
|
Removed custom docker images for redis and rabbitmq
|
2017-05-12 11:06:39 +02:00 |
|
Eduard Tomas
|
248395a4a1
|
more config setups
|
2017-05-11 19:00:44 +02:00 |
|