197 Commits

Author SHA1 Message Date
Christian Arenas
9bdfddc496 Modify the campaign response of the marketing api 2017-06-19 18:45:36 +02:00
Christian Arenas
80c10a1465 Add default fake location in settings 2017-06-19 18:44:27 +02:00
Christian Arenas
d8969aa60a Add fake_campaign_ images 2017-06-19 18:43:30 +02:00
Christian Arenas
fbb3b570b8 Add new campaign tab and mocks services 2017-06-16 16:50:53 +02:00
Ramón Tomás
d6c6582b51 Merge from Master 2017-06-15 08:54:29 +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
19647d8b7d Add userIsLogged contiditon in view for fake location 2017-06-12 20:22:38 +02:00
Christian Arenas
dde8e686fc Add token when call location api 2017-06-12 20:21:45 +02:00
Christian Arenas
c84b4707e3 Add locations to allow scopes to dictionary 2017-06-12 20:20:46 +02:00
David Britch
d3ea7ec853 Refactored TokenService into IdentityService. 2017-06-12 13:35:19 +01:00
Ramón Tomás
4be61abdde Merge new creation ordering workflow 2017-06-12 13:52:23 +02:00
David Britch
5db62c14b9 Merge pull request #211 from dotnet-architecture/xamarin
Xamarin client hybrid authentication flow
2017-06-12 11:14:20 +01:00
David Britch
7ee48876a7 LoginViewModel now stores the correct access token as an application setting. 2017-06-12 11:00:43 +01:00
David Britch
a93cf0105c Updated Xamarin client to use the hybrid authentication flow. 2017-06-12 10:16:07 +01:00
Ramón Tomás
4ed070dbed Merge from Dev 2017-06-12 11:06:17 +02:00
David Britch
01ede6477f Merge branch 'master' into xamarin 2017-06-12 09:08:56 +01:00
Christian Arenas
bb5ad3182d Add new location settings 2017-06-09 12:02:49 +02:00
Christian Arenas
6a1d37b84f Add Location Setting objects to view and ViewModel 2017-06-09 12:02:39 +02:00
Christian Arenas
b96faa369d Add LocationService to RegisterDependencies 2017-06-09 12:01:47 +02:00
Christian Arenas
cdd15117fb Add locationService class 2017-06-09 11:59:56 +02:00
Ramón Tomás
27fd97b92e Merge from Dev 2017-06-07 17:54:53 +02:00
David Britch
f406c55894 Update README.md 2017-06-05 16:19:54 +01:00
Ramón Tomás
2a64d2245f Merge branch 'dev' into hybrid-flow-xamarin 2017-05-29 08:31:49 +02:00
Ramón Tomás
5482ccdf0d Changed Xamarin app authentication to Hybrid flow 2017-05-29 08:30:33 +02:00
David Britch
784dc72573 Ensure iOS project builds in VS Mac by adding SkipValidatePackageReferences entry to .csproj. 2017-05-24 14:17:37 +01:00
Cesar De la Torre
733c7ee72b Merge pull request #200 from ahmedalejo/patch-1
Minor cold clean up to avoid unnecessary code execution
2017-05-23 10:15:31 -07:00
Ahmed Aderopo Alejo
6950839d77 Minor cold clean up to avoid unnecessary code execution 2017-05-20 19:58:14 -03:00
Eduard Tomas
af09d0a8ee Forcing SDK version 2017-05-19 12:22:50 +02:00
Ramón Tomás
87e57b9a44 Merge from Dev 2017-05-18 15:39:31 +02:00
Ramón Tomás
de76dd363c Change Xamarin app to call basket for order checkout 2017-05-16 15:32:44 +02:00
David Britch
4c53c0510a Added SkipValidatePackageReferences entry to the PropertyGroup 2017-05-15 13:22:18 +01:00
David Britch
92be019aae Modification to stop the UWP project producing a build error due to the lack of Microsoft.Bcl.Build. 2017-05-11 17:11:52 +01:00
David Britch
482f8d4bfb Added xUnit console test runner to unit test PCL. 2017-05-08 14:29:15 +01:00
David Britch
9472c7061b Fixed app crash when switching from mock to real services.
When the previous page is the MainView, switching from mock to real
services will force re-authentication by navigating to the LoginView.
2017-05-08 13:20:06 +01:00
David Britch
dc8df9e65b Fixed Windows unit test runner project. 2017-05-05 15:18:26 +01:00
David Britch
76aed028b9 NuGet package consolidation. 2017-05-04 17:02:21 +01:00
David Britch
a55822e934 Updated FFImageLoading to latest stable NuGet. 2017-05-04 15:53:58 +01:00
David Britch
a161a38403 Fixed iOS unit test runner project. 2017-05-04 15:19:58 +01:00
David Britch
b4affbf70b Fixed Droid unit test runner project. 2017-05-04 15:04:37 +01:00
David Britch
35a3d17a5d Fixed iOS unit test runner project. 2017-05-04 14:43:02 +01:00
David Britch
fd48d18e39 Update iOS unit test runner to use stable xUnit packages, and fixed the project. 2017-05-04 14:40:16 +01:00
David Britch
23c0103574 Moved to stable xUnit package for UnitTests project. 2017-05-04 14:27:37 +01:00
David Britch
b2fc036abd iOS app now targets iOS 10.2. 2017-05-04 10:50:56 +01:00
David Britch
e83b44e7c1 Replaced Forms 2.3.3 Device API usage with Forms 2.3.4 Device API usage (aside from XAML). 2017-05-04 10:42:11 +01:00
David Britch
5cbd00e63e Fixed crash when attempting to filter on only one item. 2017-05-04 10:36:05 +01:00
David Britch
8b02aef8d5 Fixed bug that disabled filtering when no products found. 2017-05-04 10:34:08 +01:00
David Britch
806cf8639d Replaced custom BindablePicker with the updated Xamarin.Forms Picker control. 2017-05-04 10:30:56 +01:00
David Britch
5b69b3cedc Bumped Forms version from 2.3.3 to 2.3.4.
Consolidated Json.NET to 9.0.1.
Updated Microsoft.NetCore.UniversalWindowsPlatform to 5.3.3.
Added Autofac to iOS and Droid app projects.
2017-05-03 17:42:37 +01:00
David Britch
6183fbcd60 Removed CommonServiceLocator package from app. 2017-05-03 13:45:27 +01:00
David Britch
e05e745b73 Removed CommonServiceLocator package from TestRunner projects. 2017-05-03 13:38:55 +01:00