579 Commits

Author SHA1 Message Date
dsanz
f12f0c4ffa Fix merge issue 2017-03-15 15:18:06 +01:00
dsanz
d35cefb887 Fix merge issue. 2017-03-15 15:04:13 +01:00
DESKTOP-V1VLQ15\dsanz
6bd17ead80 Merge branch 'dev' of https://github.com/dotnet/eShopOnContainers into dev 2017-03-15 14:57:18 +01:00
DESKTOP-V1VLQ15\dsanz
0c4f8a49dd WebMVC and WebSPA show now a changed price in the basket list 2017-03-15 14:57:08 +01:00
Ramón Tomás
dbb4be8e47 Update ordering scenarios 2017-03-14 19:05:22 +01:00
Ramón Tomás
1e47a3378f Merge domain events to DEV 2017-03-14 19:04:59 +01:00
Ramón Tomás
9669d433a6 Added unit tests for entity domain events 2017-03-14 18:58:27 +01:00
Ramón Tomás
c8f0776f1f Added domain events in Ordering Api 2017-03-14 18:02:28 +01:00
DESKTOP-V1VLQ15\dsanz
f03cf0e8f1 Merge branch 'integration-events-rmq' into dev 2017-03-14 16:54:19 +01:00
DESKTOP-V1VLQ15\dsanz
8a9492e573 Add catalog test. 2017-03-14 16:52:33 +01:00
DESKTOP-V1VLQ15\dsanz
f6b2335518 Fix issue with tests and Authorize attribute 2017-03-14 14:15:34 +01:00
DESKTOP-V1VLQ15\dsanz
23fcfd0dc4 Fix merge issue. 2017-03-14 12:17:05 +01:00
DESKTOP-V1VLQ15\dsanz
f1ffb95abf Merge branch 'dev' into integration-events-rmq
# Conflicts:
#	docker-compose.override.yml
#	eShopOnContainers-ServicesAndWebApps.sln
2017-03-14 11:50:28 +01:00
dsanz
254d479582 Renaming. 2017-03-14 09:54:30 +01:00
dsanz
f502c2388f Add persistence of published integration events for Catalog (the only microservice publishing integration events by the moment). 2017-03-14 09:47:36 +01:00
Cesar De la Torre
b07677ae83 Updates for the docker-compose production env. 2017-03-13 16:43:40 -07:00
Cesar De la Torre
73a15629d8 Moving docker-compose.prod.yml under the docker-compose.yml node in the docker-compose.dcproj 2017-03-13 16:15:48 -07:00
Cesar De la Torre
1e34a39422 Updated image 2017-03-13 13:26:05 -07:00
Cesar De la Torre
73c4eb89b8 Updated README with image including Cloud infrastructure in the future 2017-03-13 13:15:19 -07:00
etomas
c3444287ec Fixes order checkout (#53) 2017-03-13 12:43:56 +01:00
dsanz
4e5e32c6aa Add old price property for the basket in the WebMVC 2017-03-13 12:15:41 +01:00
dsanz
6617981303 Fix for #80 2017-03-13 11:34:25 +01:00
dsanz
172367d9d1 Connect to the rabbitmq container using settings. 2017-03-13 11:03:35 +01:00
Cesar De la Torre
4818f68902 Merge pull request #114 from dotnet/revert-85-xamarin
Revert "ViewModelLocator now connects view models to views, rather than NavigationService."
2017-03-12 11:44:05 -07:00
Javier Suárez Ruiz
f185824d70 Revert "ViewModelLocator now connects view models to views, rather than NavigationService." 2017-03-12 12:10:50 +01:00
Cesar De la Torre
d7ab4d89d4 Added ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP to .env and docker-compose.prod.yml for production config so it does not impact to the localhost config. 2017-03-11 15:28:57 -08:00
Cesar De la Torre
69e5fe9f21 Using ${ESHOP_EXTERNAL_DNS_NAME_OR_IP} from docker-compose.override.yml, as well. Notice that when using "localhost" from the browser URL using the MVC app, you'd need to use the 10.0.75.1 IP in a "Docker for Windows" environment.
Other than that, update the .env file with your IP or DNS name, and use that from the brower and the ${ESHOP_EXTERNAL_DNS_NAME_OR_IP} in all the docker-compose files.
2017-03-11 14:49:55 -08:00
Cesar De la Torre
71987d03f7 Using the ".env" file for default environment variables like the ESHOP_EXTERNAL_DNS_NAME_OR_IP=192.168.88.248 2017-03-11 13:25:45 -08:00
etomas
12ecc78a18 Solves #112 2017-03-10 21:51:48 +01:00
dsanz
4d1269b8f2 Add handler logic for basket repository. Add Post to CatalogController (only for price update). 2017-03-10 18:34:58 +01:00
dsanz
5b38a49f11 Add Basket handler and subscription to events. Change in EventBus to use broker and one message queue per microservice http://www.rabbitmq.com/tutorials/tutorial-four-dotnet.html 2017-03-10 13:17:16 +01:00
Javier Suárez Ruiz
bf1ae4a814 Merge pull request #85 from dotnet/xamarin
ViewModelLocator now connects view models to views, rather than NavigationService.
2017-03-10 08:37:06 +01:00
Cesar De la Torre
f2999a46fb Added docker-compose.prod.yml for testing with Xamarin app in remote devices, like in a WiFi, of for running the Web Apps from remote Browsers.
Start the solution with:
docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d

Also, some clean-up.
2017-03-09 21:49:45 -08:00
Cesar De la Torre
0aaa85ee0c Merge pull request #104 from dotnet/xamarin-update
Changed project error message language
2017-03-09 13:04:40 -08:00
Cesar De la Torre
f97b984a4a Merge pull request #109 from dotnet/revert-108-revert-106-master
Revert "Revert "Removes Docker profile from launchSettings.json""
2017-03-09 12:54:12 -08:00
Cesar De la Torre
3e795ac3ce Revert "Revert "Removes Docker profile from launchSettings.json"" 2017-03-09 12:50:41 -08:00
Cesar De la Torre
1b1136aab6 Merge branch 'master' of https://github.com/dotnet/eShopOnContainers 2017-03-09 12:01:18 -08:00
Cesar De la Torre
378fb0d8ed README update 2017-03-09 12:01:12 -08:00
Cesar De la Torre
6bb24f6daf Merge pull request #108 from dotnet/revert-106-master
Revert "Removes Docker profile from launchSettings.json"
2017-03-09 12:00:35 -08:00
Cesar De la Torre
ee13198242 Revert "Removes Docker profile from launchSettings.json" 2017-03-09 11:59:29 -08:00
Cesar De la Torre
977d68b0dc Merge pull request #106 from dazhao-msft/master
Removes Docker profile from launchSettings.json
2017-03-09 11:50:33 -08:00
David Zhao (DEVDIV)
9edf68ba11 Removes Docker profile from launchSettings.json 2017-03-09 10:27:33 -08:00
dsanz
18a402044e Add basic first implementation of Event bus with rabbitMQ 2017-03-09 15:56:34 +01:00
Javier Suárez Ruiz
06d57fcbe5 Changed project error message language
Updated README
2017-03-09 09:36:54 +01:00
Cesar De la Torre
c792800b5c Merge pull request #100 from crowchirp/patch-1
corrected typo
2017-03-08 21:00:18 -08:00
Cesar De la Torre
4469a4b851 Raising the number of retries with exponential backoff so in potential slower machines there's time enough.
Related to issue:
https://github.com/dotnet/eShopOnContainers/issues/97
2017-03-08 17:10:34 -08:00
Chandan Rai
fc6c6e3a09 corrected typo 2017-03-08 22:29:50 +05:30
dsanz
9b26253c4a Add rabbitMQ container 2017-03-08 15:44:53 +01:00
David Britch
77b64d5370 Replaced async void methods with async Task methods, where appropriate.
Also removed AnimationExtensions as it’s not used.
2017-03-08 10:28:52 +00:00
Cesar De la Torre
ec7e63def2 Merge pull request #92 from henkmollema/patch-1
Remove references to 'MVC 6'
2017-03-07 17:00:36 -08:00