285 Commits

Author SHA1 Message Date
Ramón Tomás
ea851bb8ce Merge from Dev 2017-05-18 15:39:31 +02:00
Christian Arenas
e842cd81b3 Changing status item condition in order view 2017-05-18 11:37:50 +02:00
Christian Arenas
31bdcd0b2f Changing status item condition in order view 2017-05-18 11:37:50 +02:00
Ramón Tomás
afc247da67 Change SPA app to call basket for order checkout 2017-05-16 09:23:35 +02:00
Ramón Tomás
b2b01bae06 Change SPA app to call basket for order checkout 2017-05-16 09:23:35 +02:00
Ramón Tomás
f79806e899 Created Ship order process in WebMVC app
Create Ship order command and handler in Ordering.api
Create Order management page in WebMVC app
2017-05-14 14:48:37 +02:00
Ramón Tomás
e104da9f85 Created Ship order process in WebMVC app
Create Ship order command and handler in Ordering.api
Create Order management page in WebMVC app
2017-05-14 14:48:37 +02:00
Ramón Tomás
7f5687d91e Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign 2017-05-11 18:35:12 +02:00
Ramón Tomás
8045d6302b Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign 2017-05-11 18:35:12 +02:00
Ramón Tomás
00a0824bbd Fix issue identityService.getuseridentity fails when called from integration event 2017-05-11 18:34:07 +02:00
Ramón Tomás
f302316cb0 Fix issue identityService.getuseridentity fails when called from integration event 2017-05-11 18:34:07 +02:00
Christian Arenas
01211322f7 Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign
# Conflicts:
#	src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/UserCheckoutAcceptedIntegrationEventHandler.cs
2017-05-11 16:08:49 +02:00
Christian Arenas
09a2ab4058 Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign
# Conflicts:
#	src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/UserCheckoutAcceptedIntegrationEventHandler.cs
2017-05-11 16:08:49 +02:00
Christian Arenas
9ae4d93a54 Add Order Description field 2017-05-11 16:04:35 +02:00
Christian Arenas
38f86f2cd6 Add Order Description field 2017-05-11 16:04:35 +02:00
Ramón Tomás
21fe9b7be4 Create checkout call in webmvc
Created Cancel call in webmvc
2017-05-11 11:51:13 +02:00
Ramón Tomás
9e00dceeb1 Create checkout call in webmvc
Created Cancel call in webmvc
2017-05-11 11:51:13 +02:00
Ramón Tomás
564e2df93a Extract Policies to ResilientHttpClientFactory 2017-05-10 13:25:43 +02:00
Ramón Tomás
4182750aad Extract Policies to ResilientHttpClientFactory 2017-05-10 13:25:43 +02:00
Ramón Tomás
d2c950d94e Fix issue WebMVC bootstrap lib not deployed to container in windows cli 2017-05-10 11:37:29 +02:00
Ramón Tomás
07744cf766 Fix issue WebMVC bootstrap lib not deployed to container in windows cli 2017-05-10 11:37:29 +02:00
Eduard Tomas
efe496e156 ResilientHttp client policies fixed 2017-05-09 20:27:00 +02:00
Eduard Tomas
25bc324d9f ResilientHttp client policies fixed 2017-05-09 20:27:00 +02:00
Eduard Tomas
4ca7dfde09 Merge remote-tracking branch 'origin/reissemberexecutionkey' into dev 2017-05-09 18:34:41 +02:00
Eduard Tomas
10b7be6d8f Merge remote-tracking branch 'origin/reissemberexecutionkey' into dev 2017-05-09 18:34:41 +02:00
Eduard Tomas
37cef95fec Use good endpoints for healthcheck 2017-05-09 16:59:23 +02:00
Eduard Tomas
1983165cbe Use good endpoints for healthcheck 2017-05-09 16:59:23 +02:00
Eduard Tomas
95af2d9a02 Autorefresh on healthchecks with config timeout 2017-05-09 13:54:45 +02:00
Eduard Tomas
5d098b1478 Autorefresh on healthchecks with config timeout 2017-05-09 13:54:45 +02:00
Unai Zorrilla Castro
aa8e943ba9 Added ExecutionKey into PolicyWrap and remove COncurrentDictioanry 2017-05-09 09:19:27 +02:00
Unai Zorrilla Castro
bb2c1e1a6c Added ExecutionKey into PolicyWrap and remove COncurrentDictioanry 2017-05-09 09:19:27 +02:00
Cesar De la Torre
dbbcc95c5e Removing -all rights reserved- as this is Open Source. 2017-05-08 08:50:02 -07:00
Cesar De la Torre
f9e60c53a3 Removing -all rights reserved- as this is Open Source. 2017-05-08 08:50:02 -07:00
Eduard Tomas
2086399a1c Merge branch 'httpclientreview' into dev 2017-05-08 16:08:35 +02:00
Eduard Tomas
6f7ee11cd3 Merge branch 'httpclientreview' into dev 2017-05-08 16:08:35 +02:00
Eduard Tomas
aecb81aefa Fixed error on sharing policies between origins 2017-05-08 16:07:51 +02:00
Eduard Tomas
af6c942aac Fixed error on sharing policies between origins 2017-05-08 16:07:51 +02:00
Cesar De la Torre
4c0f0b01ad Removed NMP INSTALL from docker-compose.ci.build.yml. Shouldn't need to do that every time. 2017-05-06 23:28:38 -07:00
Cesar De la Torre
14cbbe6bcb Removed NMP INSTALL from docker-compose.ci.build.yml. Shouldn't need to do that every time. 2017-05-06 23:28:38 -07:00
Cesar De la Torre
99cbbe484e Minor description refactoring 2017-05-06 21:41:32 -07:00
Cesar De la Torre
53777d5105 Minor description refactoring 2017-05-06 21:41:32 -07:00
Unai Zorrilla Castro
9cc6adbd89 Remove reference to HttpClient from IHttpClient. Change methods to allow specify authorization token and requestid headers in each request. Added API to group uri definitions 2017-05-04 13:01:14 +02:00
Unai Zorrilla Castro
62126f5cf5 Remove reference to HttpClient from IHttpClient. Change methods to allow specify authorization token and requestid headers in each request. Added API to group uri definitions 2017-05-04 13:01:14 +02:00
Eduard Tomas
829f13aff0 Updated healthcheck lib 2017-05-02 10:29:24 +02:00
Eduard Tomas
22cc8daa65 Updated healthcheck lib 2017-05-02 10:29:24 +02:00
RamonTC
9c6b54a7fc Merge pull request #167 from andrelmp/dev
Upgrade to angular-cli and Angular 4
2017-04-25 10:29:31 +02:00
RamonTC
1ccc87e743 Merge pull request #167 from andrelmp/dev
Upgrade to angular-cli and Angular 4
2017-04-25 10:29:31 +02:00
Andre Passos
db1fa9fd5c update to angular-cli and angular 4 2017-04-13 13:06:22 -03:00
Andre Passos
7b1d11e4a8 update to angular-cli and angular 4 2017-04-13 13:06:22 -03:00
dsanz
97d0283db1 Merge branch 'master' into dev
# Conflicts:
#	src/Web/WebMVC/Views/Shared/Components/CartList/Default.cshtml
#	src/Web/WebSPA/Client/modules/basket/basket.component.html
2017-04-13 09:54:12 +02:00