ayan.poddar/eShopOnContainers

History

Eduard Tomas 10d03a68e3 Merge remote-tracking branch 'eShopOnAzure/dev' into dev

# Conflicts:
#	docker-compose.override.yml
#	src/Services/Catalog/Catalog.API/CatalogSettings.cs
#	src/Services/Catalog/Catalog.API/Controllers/CatalogController.cs
#	src/Services/Catalog/Catalog.API/Controllers/PicController.cs
#	src/Services/Catalog/Catalog.API/Infrastructure/CatalogContextSeed.cs
#	src/Services/Catalog/Catalog.API/settings.json
#	src/Services/Ordering/Ordering.API/Startup.cs

2017-06-28 12:40:21 +02:00

..

Merge remote-tracking branch 'eShopOnAzure/dev' into dev

2017-06-28 12:40:21 +02:00

data and UI customization enhancements

2017-06-20 12:54:32 -07:00

Merge remote-tracking branch 'eShopOnAzure/dev' into dev

2017-06-28 12:40:21 +02:00

IntegrationEvents

- Change Integration Command to Integration Events

2017-05-18 11:43:19 +02:00

Merge from eShopOnContainers Dev

2017-06-26 13:51:49 +02:00

More products and images in Catalog Seed

2016-12-29 15:25:36 +01:00

swagger/ui to swagger url fix

2017-05-23 16:39:22 +03:00

Merge remote-tracking branch 'origin/feature/data-and-ui-customization-v2' into dev

2017-06-28 12:20:20 +02:00

Add more web api methods on catalog.api. Implement pagination featue.

2016-11-03 12:09:44 +01:00

.dockerignore

Docker files ready for the Visual Studio Docker Tools

2017-02-14 18:11:51 +01:00

Catalog.API.csproj

Merge remote-tracking branch 'eShopOnAzure/dev' into dev

2017-06-28 12:40:21 +02:00

CatalogSettings.cs

Merge remote-tracking branch 'eShopOnAzure/dev' into dev

2017-06-28 12:40:21 +02:00

Dockerfile

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

Dockerfile.nanowin

Updates to dockerfile / docker-compose for windows containers

2017-03-24 13:15:40 +01:00

Program.cs

1st version of healthcheck & webstatus

2017-03-23 19:10:55 +01:00

README.md

Updates at multiple README.MD pointing to the Wiki setup procedures

2017-03-05 13:49:25 -08:00

settings.json

Merge remote-tracking branch 'eShopOnAzure/dev' into dev

2017-06-28 12:40:21 +02:00

Startup.cs

Merge remote-tracking branch 'eShopOnAzure/dev' into dev

2017-06-28 12:40:21 +02:00

web.config

some initial dockerfiles and catalog work. Proof of concept more than anything else.

2016-09-14 11:35:36 -07:00

README.md

Containerized eShop - Catalog Service

Sample reference containerized application, cross-platform and microservices architecture. Powered by Microsoft

Check procedures on how to get it started at the Wiki: https://github.com/dotnet/eShopOnContainers/wiki