Christian Arenas
|
6ff6864f91
|
Edit the integration test
|
2017-06-06 14:19:01 +02:00 |
|
Christian Arenas
|
ce56a42bd1
|
Redesign marketing campaign api in two different controllers (campaigns/locations)
|
2017-06-06 14:18:46 +02:00 |
|
Christian Arenas
|
56c07aaafa
|
Edit campaigns controller
|
2017-06-06 10:26:11 +02:00 |
|
Christian Arenas
|
3c81115603
|
Edit mapper methods
|
2017-06-05 23:20:46 +02:00 |
|
Christian Arenas
|
ea8d893d4e
|
change the FakeCampaignDto private object to an GetFakeCampaignDto funtion
|
2017-06-05 19:36:09 +02:00 |
|
Christian Arenas
|
b5f90cf7b4
|
Create RuleType class to manage RuleTypeEnum
|
2017-06-03 01:00:55 +02:00 |
|
Christian Arenas
|
a8178fbbb4
|
remove unused dbset
|
2017-06-03 00:59:58 +02:00 |
|
Christian Arenas
|
385f1f094a
|
fix error merge
|
2017-06-02 16:36:16 +02:00 |
|
Christian Arenas
|
82182e3184
|
cleanup
|
2017-06-02 16:35:21 +02:00 |
|
Christian Arenas
|
c349596ca7
|
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
|
3e47c840d5
|
Add integration test
|
2017-06-02 16:33:01 +02:00 |
|
Christian Arenas
|
6dcc6f84bc
|
initialitze the list in constructor
|
2017-06-02 16:32:50 +02:00 |
|
Christian Arenas
|
4c59c5ebe4
|
Add migration folder
|
2017-06-02 16:32:24 +02:00 |
|
Christian Arenas
|
3440427da3
|
modify context
|
2017-06-02 16:31:48 +02:00 |
|
Christian Arenas
|
c132d944d7
|
update inital migration
|
2017-06-02 16:31:35 +02:00 |
|
Christian Arenas
|
1bd13747f4
|
Add exceptions filters
|
2017-06-02 16:31:03 +02:00 |
|
Christian Arenas
|
a5aea54cc8
|
Add dtos
|
2017-06-02 16:30:39 +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 |
|
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
|
6082359f08
|
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 |
|
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
|
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 |
|
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 |
|
Eduard Tomas
|
a9b49c9589
|
Merge branch 'compose-reorg' into dev
|
2017-05-25 13:03:26 +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
|
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
|
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 |
|
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 |
|
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 |
|
Ahmed Aderopo Alejo
|
6950839d77
|
Minor cold clean up to avoid unnecessary code execution
|
2017-05-20 19:58:14 -03:00 |
|
Cesar De la Torre
|
7b63c8d409
|
Added the WebStatus WatchDog to the Kubernetes cluster deployment
|
2017-05-19 17:19:29 -07:00 |
|
Eduard Tomas
|
3e0aecadea
|
New docker compose files
|
2017-05-19 19:32:42 +02: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 |
|
Eduard Tomas
|
2f15364a61
|
Removing build action for webstatus
|
2017-05-19 12:55:25 +02:00 |
|
Eduard Tomas
|
134b7aacd1
|
Build compose file
|
2017-05-19 12:30:26 +02:00 |
|
Eduard Tomas
|
af09d0a8ee
|
Forcing SDK version
|
2017-05-19 12:22:50 +02:00 |
|
igorsych
|
85b61a2bfd
|
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
|
c1320f4445
|
swagger update https://github.com/domaindrivendev/Swashbuckle.AspNetCore
|
2017-05-19 08:11:32 +03:00 |
|
igorsych
|
c5778a04f3
|
.NET core packages update
|
2017-05-19 08:11:18 +03:00 |
|
Eduard Tomas
|
cd1193bd56
|
Merge remote-tracking branch 'origin/master' into dev
|
2017-05-18 15:11:43 +02:00 |
|