1716 Commits (10d03a68e3eb6ad78ef4896115266d31985db001)
 

Author SHA1 Message Date
  Eduard Tomas 10d03a68e3 Merge remote-tracking branch 'eShopOnAzure/dev' into dev 7 years ago
  Eduard Tomas 96c3f5c2bc Merge remote-tracking branch 'origin/feature/data-and-ui-customization-v2' into dev 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
  Christian Arenas 6a02eb31c9 Add gps usage options 7 years ago
  Eduard Tomas 0fe33b7f3d Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev 7 years ago
  Eduard Tomas cd42c17cd1 Buildfiles to mitigate msbuild issue - https://github.com/Microsoft/msbuild/issues/2153 7 years ago
  Christian Arenas 6a4088d3b5 Merge branch 'feature/GPS-location-xamarin' into dev 7 years ago
  Christian Arenas a65254e385 Merge branch 'feature/track-user-location-mongodb' into dev 7 years ago
  Christian Arenas 123cd9e1c1 Add point of union from the polygon 7 years ago
  Christian Arenas cae44bcbba Add Barcelona location seed 7 years ago
  Christian Arenas d75f48035f Clean up and add location permissions in windows phone project 7 years ago
  Shaun Walker 445101b376 data and UI customization enhancements 7 years ago
  Christian Arenas 1d3cad9e67 Get gps location from core project. 7 years ago
  Eduard Tomas 75065026fc Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev 7 years ago
  Cesar De la Torre fdf550e7c2 Setting docker-compose files version all to '3' so it matches and you don't get the error 'Version mismatchdocker-compose.yml specifies version 3.0 but extension file docker-compose.override.yml uses version 2.0.' 7 years ago
  Eduard Tomas 8c9498c7a1 Allow create or not ACR when creating k8s 7 years ago
  Eduard Tomas 11a5293fa0 Merge branch 'k8s-update' into dev 7 years ago
  Eduard Tomas f17e350fa0 Refactor and allow option to NOT build netcore projects when creating docker images 7 years ago
  Christian Arenas 71f1a67934 Merge branch 'feature/display-marketing-campaigns-on-xamarin' into dev 7 years ago
  Christian Arenas 1fcf069c64 Merge branch 'feature/display-marketing-banner-mvc' into dev 7 years ago
  Christian Arenas 08dcc320f6 Fix marketing pagination display page number 7 years ago
  Christian Arenas 33acdcf9dc Clean up 7 years ago
  Christian Arenas cdfe85bdaf Add marketing unit test to project 7 years ago
  Eduard Tomas 30f7759fa1 Unwanted file 7 years ago
  Eduard Tomas 5389b15483 unwanted file 7 years ago
  Eduard Tomas 018f6e9342 Minor issues fixed 7 years ago
  Christian Arenas c9266e8fea remove MoreDetailsCampaignButton.xaml from project 7 years ago
  Christian Arenas d9db0a65f2 dev merge 7 years ago
  Christian Arenas 85c9af690f Add serviceHelper and add campaingTemplate in campaing view 7 years ago