Christian Arenas
|
ce89241f65
|
fix merge error
|
7 years ago |
Christian Arenas
|
41fe6fc03f
|
Merge branch 'marketingcampaign' into dev
|
7 years ago |
Christian Arenas
|
0586fe5abd
|
add new migration
|
7 years ago |
Christian Arenas
|
dfae447f68
|
Merge branch 'marketingcampaign' into dev
# Conflicts:
# eShopOnContainers-ServicesAndWebApps.sln
|
7 years ago |
Ramón Tomás
|
981f4e2730
|
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
|
7 years ago |
Ramón Tomás
|
3a10038d71
|
Fix bug antiforgery decryption issue when deploying in a k8s cluster
Changed in-memory grant store in idsrv to persist in db
|
7 years ago |
Ramón Tomás
|
8c0d41e4ad
|
Fix issue Autofac IAsyncRequestHandler not registered with Mediatr 3.0
|
7 years ago |
Christian Arenas
|
6ff6864f91
|
Edit the integration test
|
7 years ago |
Christian Arenas
|
ce56a42bd1
|
Redesign marketing campaign api in two different controllers (campaigns/locations)
|
7 years ago |
Christian Arenas
|
56c07aaafa
|
Edit campaigns controller
|
7 years ago |
Christian Arenas
|
3c81115603
|
Edit mapper methods
|
7 years ago |
Ramón Tomás
|
375780e3a4
|
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
|
7 years ago |
Ramón Tomás
|
41101164fa
|
Persist identity grant store to db
Persist machine Keys to Redis
|
7 years ago |
Christian Arenas
|
ea8d893d4e
|
change the FakeCampaignDto private object to an GetFakeCampaignDto funtion
|
7 years ago |
Christian Arenas
|
b5f90cf7b4
|
Create RuleType class to manage RuleTypeEnum
|
7 years ago |
Christian Arenas
|
a8178fbbb4
|
remove unused dbset
|
7 years ago |
Christian Arenas
|
385f1f094a
|
fix error merge
|
7 years ago |
Christian Arenas
|
82182e3184
|
cleanup
|
7 years ago |
Christian Arenas
|
c349596ca7
|
Merge branch 'marketingcampaign' of https://github.com/dotnet-architecture/eShopOnContainers into marketingcampaign
# Conflicts:
# src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs
|
7 years ago |
Christian Arenas
|
3e47c840d5
|
Add integration test
|
7 years ago |
Christian Arenas
|
6dcc6f84bc
|
initialitze the list in constructor
|
7 years ago |
Christian Arenas
|
4c59c5ebe4
|
Add migration folder
|
7 years ago |
Christian Arenas
|
3440427da3
|
modify context
|
7 years ago |
Christian Arenas
|
c132d944d7
|
update inital migration
|
7 years ago |
Christian Arenas
|
1bd13747f4
|
Add exceptions filters
|
7 years ago |
Christian Arenas
|
a5aea54cc8
|
Add dtos
|
7 years ago |
Christian Arenas
|
8494e77687
|
add version 1 to Campaigns web api
|
7 years ago |
Christian Arenas
|
83b229f4a1
|
rename file name
|
7 years ago |
Christian Arenas
|
f993c8c33d
|
Remove unused class
|
7 years ago |
Christian Arenas
|
37af8a0e82
|
Merge remote-tracking branch 'origin/dev' into marketingcampaing
# Conflicts:
# eShopOnContainers-ServicesAndWebApps.sln
|
7 years ago |
Christian Arenas
|
32247c503d
|
Add marketing api
|
7 years ago |
Eduard Tomas
|
b42fe3527a
|
Resilience enhancements.
MVC app now waits other containers
|
7 years ago |
Christian Arenas
|
665733c40e
|
Add marketing resource to identity
|
7 years ago |
Christian Arenas
|
6082359f08
|
Add docker support
|
7 years ago |
Christian Arenas
|
1ac1dae9d3
|
Add Marketing.API project
|
7 years ago |
Ramón Tomás
|
af2d37bcc6
|
Changed Xamarin app authentication to Hybrid flow mode
|
7 years ago |
Ramón Tomás
|
2a64d2245f
|
Merge branch 'dev' into hybrid-flow-xamarin
|
7 years ago |
Ramón Tomás
|
5482ccdf0d
|
Changed Xamarin app authentication to Hybrid flow
|
7 years ago |
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.
|
7 years ago |
Eduard Tomas
|
a9b49c9589
|
Merge branch 'compose-reorg' into dev
|
7 years ago |
Ramón Tomás
|
cb546c9d3f
|
Fix errors when setting container images and rolling out deployments in deploy script
|
7 years ago |
Ramón Tomás
|
8b9456d210
|
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
|
7 years ago |
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
|
7 years ago |
Cesar De la Torre
|
733c7ee72b
|
Merge pull request #200 from ahmedalejo/patch-1
Minor cold clean up to avoid unnecessary code execution
|
7 years ago |
Cesar De la Torre
|
1f7dbac140
|
Merge pull request #199 from SychevIgor/dev
Packages update to 1.1.* and Swagger update
|
7 years ago |
igorsych
|
4790981e80
|
swagger/ui to swagger url fix
|
7 years ago |
Cesar De la Torre
|
e2b6580629
|
Update BasketController.cs
|
7 years ago |
Cesar De la Torre
|
aee9ec768e
|
Update BasketController.cs
|
7 years ago |
Ahmed Aderopo Alejo
|
6950839d77
|
Minor cold clean up to avoid unnecessary code execution
|
7 years ago |
Cesar De la Torre
|
7b63c8d409
|
Added the WebStatus WatchDog to the Kubernetes cluster deployment
|
7 years ago |