ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,773 Commits 36 Branches 19 Tags 655 MiB
Commit Graph

229 Commits

Author SHA1 Message Date
Christian Arenas
010f805a90 fix xamarin location values when saving the settings with double type 2017-07-12 11:34:07 +02:00
Christian Arenas
3f560757a4 cleanup 2017-07-05 13:38:34 +02:00
Christian Arenas
34e2e19269 Add DetailsUri property to CampaignItem and Add VIEW SITE button in campaign details when the DetailsUri exists 2017-07-05 13:38:19 +02:00
Christian Arenas
ae8d38bdf6 Add StringNullOrEmptyBoolConverter to check when string value is null or empty 2017-07-05 13:37:18 +02:00
Christian Arenas
66ee0039e5 Add StringNullOrEmptyBoolConverter to check when string value is null or empty 2017-07-05 13:37:06 +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
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
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
a3e63c11aa Merge from eShopOnContainers Dev 2017-06-26 13:51:49 +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
Christian Arenas
290057789b Add styling 2017-06-22 19:05:34 +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
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
Christian Arenas
5f4d42520d Add GeolocatorPlugin-1.0.3 to IOS and Windows project 2017-06-21 19:26:06 +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
Christian Arenas
d75f48035f Clean up and add location permissions in windows phone project 2017-06-21 11:04:42 +02:00
Christian Arenas
1d3cad9e67 Get gps location from core project. 2017-06-20 18:47:23 +02:00
Christian Arenas
33acdcf9dc Clean up 2017-06-20 10:59:01 +02:00
Christian Arenas
cdfe85bdaf Add marketing unit test to project 2017-06-20 10:58:47 +02:00
Christian Arenas
c9266e8fea remove MoreDetailsCampaignButton.xaml from project 2017-06-19 18:56:19 +02:00
Christian Arenas
85c9af690f Add serviceHelper and add campaingTemplate in campaing view 2017-06-19 18:50:28 +02:00
Christian Arenas
8a73ee4c59 Resolve big margin problem in fake location settings 2017-06-19 18:49:03 +02:00
Christian Arenas
ca46125c83 Add campaign view template 2017-06-19 18:48:28 +02:00
Christian Arenas
f0b2845a6f Add marketing scope to Xamarin client 2017-06-19 18:47:48 +02:00
Christian Arenas
bfb9eff00a Add CampaignDetail view and model view 2017-06-19 18:47:14 +02:00
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