ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,199 Commits 36 Branches 19 Tags 655 MiB
Commit Graph

51 Commits

Author SHA1 Message Date
Ramón Tomás
42ce196270 Updated SF Linux manifests 2017-10-16 16:10:40 +02:00
Igor Sychev
7dfb2db7c3 packages update and clean up *.csproj files from useless content 2017-10-13 13:04:06 +01:00
Ramón Tomás
dc98e6a4c6 Added Appinsights Linux SF telemetry initializer 2017-10-13 11:35:26 +02:00
Cesar De la Torre
ebcabe2bbb Merge pull request #368 from SychevIgor/swagger 
swagger response types and code
 2017-10-12 18:00:03 -07:00
Igor Sychev
1b38589ff0 retry policy defined via config 2017-10-12 09:25:01 +01:00
Igor Sychev
9e535930ce swagge responce types and code https://github.com/dotnet-architecture/eShopOnContainers/issues/305 2017-10-12 08:45:33 +01:00
Ramón Tomás
c3e15969b9 Added Appinsights K8s telemetry initializer 2017-10-11 18:53:26 +02:00
Ramón Tomás
a04cef97ef Added AppInsights service 2017-10-11 16:26:44 +02:00
Ramón Tomás
480723e351 Merge branch 'dev' into eShopOnServiceFabric-Win 2017-09-15 14:21:23 +02:00
Ramón Tomás
cecdc40ac1 Fix Authentication issue in Locations.api 
Created input in user campaigns view to update the user's location
 2017-09-15 13:54:48 +02:00
Ramón Tomás
aeea739d1d Create polygons by continent in LocationsContextSeed db 2017-09-15 00:13:09 +02:00
Ramón Tomás
49c825d193 Added BasePath to swagger endpoint 
Override environment variables urls
 2017-09-13 16:19:27 +02:00
Eduard Tomàs
7321d5e5fc Base path fix and k8s config updated 2017-09-07 19:18:53 +02:00
Eduard Tomàs
6fd4f46058 Fix for rabbitMQ under windows containers. 
Also some config tweaking on windows
 2017-09-05 15:55:17 +02:00
Eduard Tomàs
8198126daf Use dotnet multi-architecture images. 
Removing docker-compose.windows.override (not needed as is identical to docker-compose.override)
 2017-09-04 19:07:53 +02:00
RamonTC
4ea8f6814e Merge pull request #299 from SychevIgor/SychevIgor/WindowsDockerFiles20 
windows docker files update to 2.0 base images
 2017-08-30 17:55:26 +02:00
Ramón Tomás
c9ff332b84 Fix merging duplicated ConfigureAuth method 2017-08-30 08:59:39 +02:00
Ramón Tomás
faea50f715 Merge 2017-08-30 08:08:01 +02:00
Igor Sychev
dc566ea2a1 nanowin 2017-08-30 08:48:06 +03:00
Ramón Tomás
9ed7325e0e Downgrade Identity.api version due to compatibility issues 
Updated Test project version
Fix issue Idsrv token
 2017-08-29 18:11:30 +02:00
Unai Zorrilla Castro
6ac34cbdaa Update functional tests 2017-08-29 12:48:04 +02:00
Unai Zorrilla Castro
360456f051 Migrated Marketing.API and Locations.API to .NETCoreApp2.0. Update Startup and Program to new .NETCoreApp2.0 templates 2017-08-29 11:01:27 +02:00
Ramón Tomás
01469da7d3 Fixed bug Swagger is not working for the services #290 2017-08-24 15:41:11 +02:00
Ramón Tomás
8288acf3a4 Update projects from netcore 2.0.0 preview to 2.0.0 
Fix netcore 2.0.0 breaking changes in authentication middleware
 2017-08-22 22:36:23 +02:00
Ramón Tomás
2baedadc7a Merge from Dev 2017-08-22 19:46:53 +02:00
IgorSychev
d35dc2ea17 ApplicationInsights deleted from 3 projects. 2017-08-16 21:57:58 +03:00
Ramón Tomás
87ea62cc66 Updated docker compose files for windows 2017-08-03 12:59:38 +02:00
Ramón Tomás
d289ec00cf Add swagger authorization option in APIs 2017-07-12 12:10:10 +02:00
Eduard Tomas
d9b9578e48 Merge remote-tracking branch 'origin/dev' into netcore2 
# Conflicts:
#	docker-compose.dcproj
#	docker-compose.vs.debug.yml
#	docker-compose.vs.release.yml
#	src/BuildingBlocks/EventBus/EventBus/EventBus.csproj
#	src/Services/Marketing/Marketing.API/Startup.cs
#	src/Web/WebMVC/Startup.cs
#	src/Web/WebMVC/WebMVC.csproj
 2017-07-11 12:01:45 +02:00
Christian Arenas
06cbab4731 Merge branch 'feature/marketing-details-azure-function' into dev 
# Conflicts:
#	docker-compose.vs.debug.yml
#	docker-compose.vs.release.yml
#	eShopOnContainers-ServicesAndWebApps.sln
#	src/Services/Location/Locations.API/Startup.cs
#	src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs
#	src/Services/Marketing/Marketing.API/Marketing.API.csproj
#	src/Services/Marketing/Marketing.API/Startup.cs
#	src/Web/WebMVC/appsettings.json
#	src/Web/WebSPA/AppSettings.cs
#	test/Services/FunctionalTests/Services/Marketing/MarketingScenarios.cs
 2017-07-07 11:56:57 +02:00
dsanz
a65e9c01eb Add Healthchecks to Locations.API and MArketing.API 2017-07-04 13:51:05 +02:00
Ramón Tomás
f993463856 Implemented service bus for marketing.api locations.api graceperiodProcess payment.api 2017-06-30 08:59:26 +02:00
Eduard Tomas
d65a112535 References updated to preview-2 
code adjustements to work with preview-2
 2017-06-29 18:36:57 +02:00
Eduard Tomas
6b466a2c66 Fixing NetStandard.Library versions 2017-06-22 16:15:58 +02:00
Eduard Tomas
4303cbae89 Locations.API nuget updated 2017-06-21 19:39:47 +02:00
Eduard Tomas
56902a5549 [WIP] Projects & Dockerfile migrated to 2.0 
Lots of things to address yet, because nuget packages are still on 1.1
 2017-06-21 19:03:48 +02:00
Christian Arenas
a65254e385 Merge branch 'feature/track-user-location-mongodb' into dev 2017-06-21 11:48:38 +02:00
Christian Arenas
123cd9e1c1 Add point of union from the polygon 2017-06-21 11:47:34 +02:00
Christian Arenas
cae44bcbba Add Barcelona location seed 2017-06-21 11:06:33 +02:00
Christian Arenas
b3e5362865 Merge branch 'feature/marketing-read-model-data' into marketingcampaign 
# Conflicts:
#	src/Services/Location/Locations.API/Model/Locations.cs
 2017-06-14 16:26:28 +02:00
Christian Arenas
ec59ace1ea Add LocationId to Locations Model 2017-06-14 15:24:56 +02:00
Christian Arenas
0ffa9cb981 Create a LocationId in data read model and change the affected modification 2017-06-14 15:22:49 +02:00
Christian Arenas
41654878a7 Add LocationId field to UserLocation and call GetAsync repository method from marketing controller 2017-06-13 18:01:24 +02:00
Christian Arenas
68dbc92172 Add LocationId field to UserLocation 2017-06-13 18:00:49 +02:00
Christian Arenas
794d366053 Merge branch 'feature/marketing-read-model-data' into marketingcampaign 
# Conflicts:
#	src/Services/Location/Locations.API/Infrastructure/Services/LocationsService.cs
#	src/Services/Location/Locations.API/Model/UserLocation.cs
 2017-06-13 17:38:07 +02:00
Ramón Tomás
9bf5670020 Created Marketing read data model 2017-06-13 17:31:37 +02:00
Christian Arenas
3a9093a741 Modify location.API change userId type from int to Guid 2017-06-12 20:18:52 +02:00
Ramón Tomás
ea6084db28 Added location.api integration tests 2017-06-09 12:16:57 +02:00
Ramón Tomás
05bd964f2b Adapt Locations.api to nosql db 2017-06-08 17:33:55 +02:00
Ramón Tomás
bae10b07b8 Created UserLocationModel 
Map Position to Locations APi
Update current user location
 2017-06-01 20:16:19 +02:00