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 |
|
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
|
2017-06-28 12:40:21 +02:00 |
|
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
|
2017-06-28 12:20:20 +02:00 |
|
Christian Arenas
|
b172fb29d6
|
Merge branch 'adapt-xamarin-new-order-workflow' into dev
|
2017-06-26 19:22:44 +02:00 |
|
Christian Arenas
|
b918826a6c
|
remove userId parameter from GetCampaignsByUserId from functional test
|
2017-06-26 19:22:17 +02:00 |
|
Christian Arenas
|
83e425da2b
|
Add Cancel button in order detail view when the status is submitted and add requestId guid to create a new order
|
2017-06-26 18:32:25 +02:00 |
|
Christian Arenas
|
699ec0001d
|
Create IdentityService in marketing API
|
2017-06-26 18:31:04 +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 |
|
Ramón Tomás
|
a56f99f684
|
Fix merge
|
2017-06-26 18:05:02 +02:00 |
|
Ramón Tomás
|
a3e63c11aa
|
Merge from eShopOnContainers Dev
|
2017-06-26 13:51:49 +02:00 |
|
Shaun Walker
|
a6cef8009c
|
replace main banner in SPA app
|
2017-06-23 12:04:40 -07:00 |
|
Shaun Walker
|
18b91ee5f1
|
minor fixes to data and UI customization
|
2017-06-23 11:49:25 -07:00 |
|
Eduard Tomas
|
65bcf48246
|
Dealing with auth and package versions issues between 1.1 and 2.0
|
2017-06-23 18:45:20 +02:00 |
|
Christian Arenas
|
4f198f179e
|
Add a shipped order mock
|
2017-06-23 13:01:57 +02:00 |
|
Christian Arenas
|
4f54dae03d
|
Rename OrderState property to OrderStatus and add new status items
|
2017-06-23 12:57:25 +02:00 |
|
Eduard Tomas
|
c28b693db9
|
Dockerfile of Payment.API upgraded to v2
|
2017-06-23 10:55:48 +02:00 |
|
Shaun Walker
|
632c023a3f
|
strip quotes, fix image transparency, format price and amount
|
2017-06-22 17:26:57 -07:00 |
|
Eduard Tomas
|
eba0a53562
|
fixed invalid WebMVC csproj entries
|
2017-06-22 20:13:12 +02:00 |
|
Eduard Tomas
|
636ec01415
|
fixed invalid WebMVC csproj entries
|
2017-06-22 20:11:36 +02:00 |
|
Christian Arenas
|
290057789b
|
Add styling
|
2017-06-22 19:05:34 +02:00 |
|
Eduard Tomas
|
d6a6416e19
|
Bad folder for Locations.API corrected
|
2017-06-22 16:56:27 +02:00 |
|
Eduard Tomas
|
340d50fddd
|
WebStatus Nuget updated
|
2017-06-22 16:56:10 +02:00 |
|
Eduard Tomas
|
fdd9a36719
|
MVC auth updated to 2.0.0
|
2017-06-22 16:55:57 +02:00 |
|
Eduard Tomas
|
bbc682d6a9
|
WebMVC nuget update
|
2017-06-22 16:22:41 +02:00 |
|
Eduard Tomas
|
0a1f14f1f1
|
WebSPA nuget update
|
2017-06-22 16:19:54 +02:00 |
|
Eduard Tomas
|
6b466a2c66
|
Fixing NetStandard.Library versions
|
2017-06-22 16:15:58 +02:00 |
|
Christian Arenas
|
55c2c666c0
|
clean up and style improving
|
2017-06-22 15:10:59 +02:00 |
|
Christian Arenas
|
56ec1d9ed9
|
clean up and style improving
|
2017-06-22 15:10:47 +02:00 |
|
IgorSychev
|
071716accb
|
we are not using banners and js in healthcheck
|
2017-06-22 14:14:07 +03:00 |
|
IgorSychev
|
450eee48cd
|
we don't need jquery.validate for such a simple page
|
2017-06-22 14:13:57 +03:00 |
|
Shaun Walker
|
514254818f
|
make Docker-Compose the Default Project in the solution
|
2017-06-21 15:27:42 -07:00 |
|
Shaun Walker
|
9229a8d0fd
|
support for additional CatalogItem properties
|
2017-06-21 15:27:12 -07:00 |
|
Eduard Tomas
|
286b8e4344
|
Unwanted fwk reference in GracePeriodManager
|
2017-06-21 19:57:36 +02:00 |
|
Eduard Tomas
|
17dc20077d
|
Payment.API nuget updated
|
2017-06-21 19:50:01 +02:00 |
|
Eduard Tomas
|
3c2ce4d7a7
|
Ordering.API nuget update
|
2017-06-21 19:48:13 +02:00 |
|
Eduard Tomas
|
706423cc8d
|
Marketing.API nuget updated
|
2017-06-21 19:43:02 +02:00 |
|
Christian Arenas
|
f34a4fee2a
|
Add text message when gps system is enabled and change the name GpsUsage to AllowGpsLocation
|
2017-06-21 19:39:49 +02:00 |
|
Eduard Tomas
|
4303cbae89
|
Locations.API nuget updated
|
2017-06-21 19:39:47 +02:00 |
|
Eduard Tomas
|
4069a3a048
|
Catalog.API nuget updated
|
2017-06-21 19:36:33 +02:00 |
|
Eduard Tomas
|
ea129609d5
|
Basket.API nuget updated
|
2017-06-21 19:33:24 +02:00 |
|
Christian Arenas
|
5f4d42520d
|
Add GeolocatorPlugin-1.0.3 to IOS and Windows project
|
2017-06-21 19:26:06 +02:00 |
|
Eduard Tomas
|
7fd5647bae
|
EventBus.csproj nuget updated
|
2017-06-21 19:19:58 +02:00 |
|
Eduard Tomas
|
b050ba5c94
|
DataProtection.csproj nuget updated
|
2017-06-21 19:16:59 +02:00 |
|
Eduard Tomas
|
5d383dbaad
|
GracePeriodManager nuget updated
|
2017-06-21 19:10:12 +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
|
2fe1935e95
|
Merge branch 'dev' into feature/GPS-location-xamarin
|
2017-06-21 17:30:42 +02:00 |
|
Christian Arenas
|
5d124369a1
|
Add Location permissions in ios
|
2017-06-21 17:30:37 +02:00 |
|
Christian Arenas
|
6a02eb31c9
|
Add gps usage options
|
2017-06-21 17:30:19 +02:00 |
|
Eduard Tomas
|
514142a3c7
|
global.json set to 2.0.0-preview1-005977
dcproj update
|
2017-06-21 12:58:55 +02:00 |
|
Eduard Tomas
|
0fe33b7f3d
|
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
|
2017-06-21 12:38:30 +02:00 |
|