857 Commits

Author SHA1 Message Date
Ramón Tomás
31ca759662 Merge from Dev 2017-06-02 13:22:40 +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
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
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
4dc8b65e8b Add Marketing.API project 2017-06-01 10:10:00 +02:00
Ramón Tomás
83166cde12 #2412-Create Location Microservice 2017-05-30 15:01:58 +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
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
b8f8fe51f8 Rename grace period directory 2017-05-25 11:08:43 +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
Ramón Tomás
1218069eaf Removed Saga feature 2017-05-24 08:53:36 +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
ce2083d248 Minor refactoring 2017-05-20 12:35:16 -07:00
Cesar De la Torre
5a3a94bba6 Minor refactoring in method from ServiceBus to EventBus 2017-05-20 10:17:06 -07:00
Cesar De la Torre
c3ca81b03c Added the WebStatus WatchDog to the Kubernetes cluster deployment 2017-05-19 17:19:29 -07: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
546f443d7f Forcing SDK version 2017-05-19 12:22:50 +02:00
Christian Arenas
242c1daacf minor name change 2017-05-19 08:53:24 +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
Ramón Tomás
ea851bb8ce Merge from Dev 2017-05-18 15:39:31 +02:00
Christian Arenas
689096f4c8 - Remove unused IntegrationCommands folders
- minor name changes
2017-05-18 12:03:17 +02:00
Christian Arenas
f79e21f2f7 Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign
# Conflicts:
#	src/Services/Ordering/Ordering.API/Startup.cs
2017-05-18 11:51:12 +02:00
Christian Arenas
6b36972a7f - Change Integration Command to Integration Events
- Rename OrderStockNotConfirmedIntegrationEvent to OrderStockRejectedIntegrationEvent
2017-05-18 11:43:19 +02:00
Christian Arenas
2228ca3612 - Change Integration Command to Integration Events
- Refactor PublishThroughEventBusAsync methods from OrderingIntegrationEventService
- Add private empty Address constructor.
- Modify order aggregate methods.
- Remove GetWithDependenciesAsync methods and modify GetAsync with entity framework Explicit loading.
2017-05-18 11:42:22 +02:00
Christian Arenas
31bdcd0b2f Changing status item condition in order view 2017-05-18 11:37:50 +02:00
Christian Arenas
429d27b9ca Change variable parameter name 2017-05-18 09:43:37 +02:00
Ramón Tomás
58b3b6fada Fix merge 2017-05-18 09:14:38 +02:00
Ramón Tomás
c7e88d49f1 Merge 2017-05-18 09:14:21 +02:00
Ramón Tomás
d9d26bebd9 Adapt test cases to new order flow
Create new service test cases
2017-05-18 08:40:35 +02:00
Christian Arenas
cceca92cf9 Remove PaymentIntegrationEventService and remove integration command to integration event 2017-05-17 19:42:45 +02:00
Christian Arenas
511bc05cb4 Remove SagaManagerIntegrationEventService frrom SagaManager and remove GracePeriod from dockercompose 2017-05-17 19:41:49 +02:00
Christian Arenas
9b449461f2 naming changes 2017-05-17 11:57:02 +02:00
Christian Arenas
451a56ed2f Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign
# Conflicts:
#	src/Services/SagaManager/SagaManager/Program.cs
2017-05-17 09:53:14 +02:00
Christian Arenas
8b80eeae52 minor changes 2017-05-17 00:40:40 +02:00
Christian Arenas
587de20d85 revert the last changes 2017-05-16 18:57:36 +02:00
Christian Arenas
3556a5d126 Change SaveEntitiesAsync to SaveChangesAsync 2017-05-16 18:40:34 +02:00