dsanz
|
eb7abbc984
|
Merge branch 'dev' into update-WebStatus
|
7 years ago |
Christian Arenas
|
060cc48cf4
|
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
|
7 years ago |
Matthew Dennis
|
70c4936e14
|
StandardHttpClient setting Authentication Header incorrectly in a couple of places.
|
7 years ago |
Eduard Tomas
|
7258a58f5b
|
All docker compose to version 2.1 that seems to work in vsts hosted linux build agent
|
7 years ago |
dsanz
|
a65e9c01eb
|
Add Healthchecks to Locations.API and MArketing.API
|
7 years ago |
Eduard Tomas
|
e9b4235543
|
use version '2' for docker-compose.ci.build.yml
Higher versions seems to not be compatible with hosted linux build agent
|
7 years ago |
Christian Arenas
|
d6e140a49b
|
Add PictureFileName seed and add rename PictureUri column name to PictureFileName
|
7 years ago |
Christian Arenas
|
595988779f
|
Add GetItems load test
|
7 years ago |
Eduard Tomas
|
4fe02d9b44
|
k8s deployment
config moved from custom json to standard k8s yaml
|
7 years ago |
Christian Arenas
|
1837bf2032
|
Add Ordering Api test and cleanup tests
|
7 years ago |
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
|
7 years ago |
Eduard Tomas
|
c997fe0881
|
Add cloud.json reference config.file. It contains invalid values.
|
7 years ago |
Eduard Tomas
|
00e6ab58d8
|
Update k8s script and doc
|
7 years ago |
Christian Arenas
|
ee8da23999
|
Add basket test
|
7 years ago |
Ramón Tomás
|
f993463856
|
Implemented service bus for marketing.api locations.api graceperiodProcess payment.api
|
7 years ago |
Christian Arenas
|
bbcc23d053
|
Add GetBasket and GetUserCampaigns, and cleanup
|
7 years ago |
Eduard Tomas
|
d65a112535
|
References updated to preview-2
code adjustements to work with preview-2
|
7 years ago |
Christian Arenas
|
3a5f1b8232
|
Add Marketing, locations, payment and gracePeriod Subscription in servicebus ARM file
|
7 years ago |
Christian Arenas
|
aa813b7f8c
|
Add CatalogApi load test
|
7 years ago |
Christian Arenas
|
ddcb665bcd
|
Edit the test assert
|
7 years ago |
Christian Arenas
|
6a0001b9c6
|
Add new LoadTest project, add new Catalog integration test and add new webMVC load test
|
7 years ago |
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
|
7 years ago |
Eduard Tomas
|
96c3f5c2bc
|
Merge remote-tracking branch 'origin/feature/data-and-ui-customization-v2' into dev
# Conflicts:
# docker-compose.override.yml
# src/Web/WebMVC/WebMVC.csproj
# src/Web/WebMVC/wwwroot/css/shared/components/identity/identity.css
# src/Web/WebMVC/wwwroot/css/site.min.css
# src/Web/WebSPA/AppSettings.cs
|
7 years ago |
Christian Arenas
|
b172fb29d6
|
Merge branch 'adapt-xamarin-new-order-workflow' into dev
|
7 years ago |
Christian Arenas
|
b918826a6c
|
remove userId parameter from GetCampaignsByUserId from functional test
|
7 years ago |
Christian Arenas
|
83e425da2b
|
Add Cancel button in order detail view when the status is submitted and add requestId guid to create a new order
|
7 years ago |
Christian Arenas
|
699ec0001d
|
Create IdentityService in marketing API
|
7 years ago |
Christian Arenas
|
b28c650e06
|
Remove userId setting from xamarin app and remove userId parameter from GetCampaignsByUserId in Campaign API
|
7 years ago |
Ramón Tomás
|
a56f99f684
|
Fix merge
|
7 years ago |
Ramón Tomás
|
a3e63c11aa
|
Merge from eShopOnContainers Dev
|
7 years ago |
Shaun Walker
|
a6cef8009c
|
replace main banner in SPA app
|
7 years ago |
Shaun Walker
|
18b91ee5f1
|
minor fixes to data and UI customization
|
7 years ago |
Eduard Tomas
|
65bcf48246
|
Dealing with auth and package versions issues between 1.1 and 2.0
|
7 years ago |
Christian Arenas
|
4f198f179e
|
Add a shipped order mock
|
7 years ago |
Christian Arenas
|
4f54dae03d
|
Rename OrderState property to OrderStatus and add new status items
|
7 years ago |
Eduard Tomas
|
c28b693db9
|
Dockerfile of Payment.API upgraded to v2
|
7 years ago |
Shaun Walker
|
632c023a3f
|
strip quotes, fix image transparency, format price and amount
|
7 years ago |
Eduard Tomas
|
eba0a53562
|
fixed invalid WebMVC csproj entries
|
7 years ago |
Eduard Tomas
|
636ec01415
|
fixed invalid WebMVC csproj entries
|
7 years ago |
Christian Arenas
|
290057789b
|
Add styling
|
7 years ago |
Eduard Tomas
|
d6a6416e19
|
Bad folder for Locations.API corrected
|
7 years ago |
Eduard Tomas
|
340d50fddd
|
WebStatus Nuget updated
|
7 years ago |
Eduard Tomas
|
fdd9a36719
|
MVC auth updated to 2.0.0
|
7 years ago |
Eduard Tomas
|
bbc682d6a9
|
WebMVC nuget update
|
7 years ago |
Eduard Tomas
|
0a1f14f1f1
|
WebSPA nuget update
|
7 years ago |
Eduard Tomas
|
6b466a2c66
|
Fixing NetStandard.Library versions
|
7 years ago |
Christian Arenas
|
55c2c666c0
|
clean up and style improving
|
7 years ago |
Christian Arenas
|
56ec1d9ed9
|
clean up and style improving
|
7 years ago |
IgorSychev
|
071716accb
|
we are not using banners and js in healthcheck
|
7 years ago |
IgorSychev
|
450eee48cd
|
we don't need jquery.validate for such a simple page
|
7 years ago |