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
|
7 years ago |
Christian Arenas
|
ee698ad483
|
Create a new solution named Azure Functions and remove the marketing azure function from ServiceAndWebApps
|
7 years ago |
Christian Arenas
|
bb377f0ff7
|
Add marketing storage ARM
|
7 years ago |
Christian Arenas
|
8cb861dab8
|
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
|
7 years ago |
Christian Arenas
|
32415615b9
|
Add azure function ACR
|
7 years ago |
dsanz
|
fd97ed8765
|
Fix issue
|
7 years ago |
dsanz
|
92dde7e49d
|
Merge branch 'update-WebStatus' into dev
|
7 years ago |
dsanz
|
8051114da9
|
Add Azure Storage check in Catalog health checks.
|
7 years ago |
Christian Arenas
|
b240357c3a
|
Check when CampaignDetailFunctionUri is not null and return DetailsUri
|
7 years ago |
Eduard Tomas
|
cc6c443216
|
Upfate catalog config on k8s
|
7 years ago |
Christian Arenas
|
3f560757a4
|
cleanup
|
7 years ago |
Christian Arenas
|
34e2e19269
|
Add DetailsUri property to CampaignItem and Add VIEW SITE button in campaign details when the DetailsUri exists
|
7 years ago |
Christian Arenas
|
ae8d38bdf6
|
Add StringNullOrEmptyBoolConverter to check when string value is null or empty
|
7 years ago |
Christian Arenas
|
66ee0039e5
|
Add StringNullOrEmptyBoolConverter to check when string value is null or empty
|
7 years ago |
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 |
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 |
Eduard Tomas
|
4fe02d9b44
|
k8s deployment
config moved from custom json to standard k8s yaml
|
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 |
Ramón Tomás
|
f993463856
|
Implemented service bus for marketing.api locations.api graceperiodProcess payment.api
|
7 years ago |
Christian Arenas
|
3a5f1b8232
|
Add Marketing, locations, payment and gracePeriod Subscription in servicebus ARM file
|
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 |
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 |
Shaun Walker
|
632c023a3f
|
strip quotes, fix image transparency, format price and amount
|
7 years ago |
Eduard Tomas
|
636ec01415
|
fixed invalid WebMVC csproj entries
|
7 years ago |
Christian Arenas
|
290057789b
|
Add styling
|
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 |
Shaun Walker
|
514254818f
|
make Docker-Compose the Default Project in the solution
|
7 years ago |
Shaun Walker
|
9229a8d0fd
|
support for additional CatalogItem properties
|
7 years ago |
Christian Arenas
|
f34a4fee2a
|
Add text message when gps system is enabled and change the name GpsUsage to AllowGpsLocation
|
7 years ago |
Christian Arenas
|
5f4d42520d
|
Add GeolocatorPlugin-1.0.3 to IOS and Windows project
|
7 years ago |
Christian Arenas
|
2fe1935e95
|
Merge branch 'dev' into feature/GPS-location-xamarin
|
7 years ago |
Christian Arenas
|
5d124369a1
|
Add Location permissions in ios
|
7 years ago |