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 |
|
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 |
|
Ramón Tomás
|
26a4701bf4
|
Fix Account Controller unittest
|
2017-08-22 19:47:22 +02:00 |
|
Ramón Tomás
|
2baedadc7a
|
Merge from Dev
|
2017-08-22 19:46:53 +02:00 |
|
PLAINCONCEPTS\lruiz
|
3d552b3219
|
Fix bug #263
|
2017-08-22 12:04:40 +02:00 |
|
Ramón Tomás
|
eb4396e659
|
Fix accountcontroller signin unit test
|
2017-08-21 17:57:53 +02:00 |
|
Christian Arenas
|
4e9524c9b0
|
Add new basket api url to test
|
2017-07-12 12:41:50 +02:00 |
|
Christian Arenas
|
0546040ebc
|
Modify the mvc client id to mvctest client
|
2017-07-11 12:43:29 +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
|
03f23eafa4
|
Merge branch 'load-testing' into dev
# Conflicts:
# eShopOnContainers-ServicesAndWebApps.sln
# src/Services/Identity/Identity.API/Configuration/Config.cs
# src/Web/WebMVC/appsettings.json
|
2017-07-10 14:40:26 +02:00 |
|
Christian Arenas
|
540f7510b9
|
Create a mvctest client, check when is the environment variable UseLoadTest in MVC project to true
|
2017-07-10 14:25:03 +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 |
|
Christian Arenas
|
595988779f
|
Add GetItems load test
|
2017-07-04 08:47:54 +02:00 |
|
Christian Arenas
|
1837bf2032
|
Add Ordering Api test and cleanup tests
|
2017-07-01 00:11:12 +02:00 |
|
Ramón Tomás
|
525040b9b6
|
Created Azure functions for details campaign
Adapt MVC app to azure function details campaign
Adapt SPA app to azure function details campaign
|
2017-06-30 16:31:22 +02:00 |
|
Christian Arenas
|
ee8da23999
|
Add basket test
|
2017-06-30 15:05:45 +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 |
|
Christian Arenas
|
bbcc23d053
|
Add GetBasket and GetUserCampaigns, and cleanup
|
2017-06-29 20:04:33 +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 |
|
Christian Arenas
|
aa813b7f8c
|
Add CatalogApi load test
|
2017-06-28 19:09:29 +02:00 |
|
Christian Arenas
|
ddcb665bcd
|
Edit the test assert
|
2017-06-28 18:06:16 +02:00 |
|
Christian Arenas
|
6a0001b9c6
|
Add new LoadTest project, add new Catalog integration test and add new webMVC load test
|
2017-06-28 17:59:59 +02:00 |
|
Christian Arenas
|
b918826a6c
|
remove userId parameter from GetCampaignsByUserId from functional test
|
2017-06-26 19:22:17 +02:00 |
|
Christian Arenas
|
b28c650e06
|
Remove userId setting from xamarin app and remove userId parameter from GetCampaignsByUserId in Campaign API
|
2017-06-26 18:29:51 +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 |
|
Ramón Tomás
|
9fee40e358
|
Created marketing campaigns view details
|
2017-06-19 09:46:48 +02:00 |
|
Christian Arenas
|
e80c5efdd3
|
Add details view and add marketing scope in mvc project and identity config
|
2017-06-16 01:20:03 +02:00 |
|
Christian Arenas
|
46db196633
|
Remove url from test
|
2017-06-15 19:23:33 +02:00 |
|
Christian Arenas
|
523d27a49f
|
Add GetLocationByCampaignAndLocationRuleId route name
|
2017-06-14 18:25:46 +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
|
4ba9d66423
|
Add new environment variables values to appsettings
|
2017-06-14 16:21:46 +02:00 |
|
Christian Arenas
|
0024a23801
|
Add functional test: Check The user has an location campaign
|
2017-06-14 15:12:40 +02:00 |
|
Christian Arenas
|
486ba1872a
|
Modify marketing functional test
|
2017-06-13 18:00:09 +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 |
|
Christian Arenas
|
31fd93dafe
|
Add Functional Test to marketing
|
2017-06-13 17:33:30 +02:00 |
|
Ramón Tomás
|
9bf5670020
|
Created Marketing read data model
|
2017-06-13 17:31:37 +02:00 |
|
Christian Arenas
|
e5a59a1bdf
|
Merge branch 'feature/track-user-location-mongodb' into dev
# Conflicts:
# src/Services/Ordering/Ordering.API/Infrastructure/AutofacModules/MediatorModule.cs
|
2017-06-13 11:26:47 +02:00 |
|
Christian Arenas
|
06f978bc97
|
Modify test. UserId is a Guid type
|
2017-06-12 20:18:11 +02:00 |
|
Ramón Tomás
|
4be61abdde
|
Merge new creation ordering workflow
|
2017-06-12 13:52:23 +02:00 |
|
Ramón Tomás
|
0337932697
|
Merge locations feature branch
|
2017-06-09 12:43:46 +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 |
|
Christian Arenas
|
6ff6864f91
|
Edit the integration test
|
2017-06-06 14:19:01 +02:00 |
|
Christian Arenas
|
ea8d893d4e
|
change the FakeCampaignDto private object to an GetFakeCampaignDto funtion
|
2017-06-05 19:36:09 +02:00 |
|
Christian Arenas
|
3e47c840d5
|
Add integration test
|
2017-06-02 16:33:01 +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 |
|
Christian Arenas
|
1ac1dae9d3
|
Add Marketing.API project
|
2017-06-01 10:10:00 +02:00 |
|
Ramón Tomás
|
9d5cde2057
|
#2412-Create Location Microservice
|
2017-05-30 15:01:58 +02:00 |
|