9 files changed, 24 insertions, 11 deletions
diff --git a/Juick/App.xaml.cs b/Juick/App.xaml.cs
index 1e91f38..bb8dddb 100644
--- a/Juick/App.xaml.cs
+++ b/Juick/App.xaml.cs
@@ -197,7 +197,7 @@ namespace Juick
 
 
                 // Keep track of Session Type 
-                if (e.Uri.ToString().Contains("DeepLink=true"))
+                if (e.Uri.ToString().Contains("ShareContent") || e.Uri.ToString().Contains("mid"))
                 {
                     _sessionType = SessionType.DeepLink;
                 }
diff --git a/Juick/Juick.csproj b/Juick/Juick.csproj
index dd4c351..40b2c5d 100644
--- a/Juick/Juick.csproj
+++ b/Juick/Juick.csproj
@@ -111,7 +111,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\RestSharp.104.4.0\lib\sl4-wp71\RestSharp.WindowsPhone.dll</HintPath>
     </Reference>
-    <Reference Include="System.Windows.Interactivity, Version=3.8.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Windows.Interactivity, Version=3.9.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Api\Message.cs" />
@@ -128,6 +128,7 @@
     <Compile Include="Classes\HttpsHelper.cs" />
     <Compile Include="Classes\InvokeDelegateCommandAction.cs" />
     <Compile Include="Classes\LowProfileImageLoader.cs" />
+    <Compile Include="Classes\MyUriMapper.cs" />
     <Compile Include="Classes\TileHelper.cs" />
     <Compile Include="Controls\HyperLinkRichTextBox.cs" />
     <Compile Include="Controls\MessageList.xaml.cs">
@@ -259,5 +260,4 @@
   </Target>
   -->
   <ProjectExtensions />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
 </Project>
 \ No newline at end of file
diff --git a/Juick/Properties/AssemblyInfo.cs b/Juick/Properties/AssemblyInfo.cs
index 928036d..eee1c5c 100644
--- a/Juick/Properties/AssemblyInfo.cs
+++ b/Juick/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@ using System.Resources;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.0.0.1")]
-[assembly: AssemblyFileVersion("2.0.0.1")]
+[assembly: AssemblyVersion("2.1.0.*")]
+[assembly: AssemblyFileVersion("2.1.0.*")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
diff --git a/Juick/Properties/WMAppManifest.xml b/Juick/Properties/WMAppManifest.xml
index 802ffe8..4fea83c 100644
--- a/Juick/Properties/WMAppManifest.xml
+++ b/Juick/Properties/WMAppManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Deployment xmlns="http://schemas.microsoft.com/windowsphone/2012/deployment" AppPlatformVersion="8.0">
   <DefaultLanguage xmlns="" code="en-US" />
-  <App xmlns="" ProductID="{ba7895cf-3f11-4459-9f91-6fe7df26e202}" Title="Juick" RuntimeType="Silverlight" Version="2.0.0.1" Genre="apps.normal" Author="Juick author" Description="Sample description" Publisher="Juick" PublisherID="{bfbcb16e-c78a-4595-afc6-6ada592f1adc}">
+  <App xmlns="" ProductID="{ba7895cf-3f11-4459-9f91-6fe7df26e202}" Title="Juick" RuntimeType="Silverlight" Version="2.1.0" Genre="apps.normal" Author="Juick author" Description="Sample description" Publisher="Juick" PublisherID="{bfbcb16e-c78a-4595-afc6-6ada592f1adc}">
     <IconPath IsRelative="true" IsResource="false">ApplicationIcon.png</IconPath>
     <Capabilities>
       <Capability Name="ID_CAP_IDENTITY_DEVICE" />
@@ -22,7 +22,7 @@
       <Capability Name="ID_CAP_REMOVABLE_STORAGE" />
     </Capabilities>
     <Tasks>
-      <DefaultTask Name="_default" NavigationPage="MainPage.xaml" />
+      <DefaultTask Name="_default" NavigationPage="MainPage.xaml" ActivationPolicy="Resume" />
     </Tasks>
     <Tokens>
       <PrimaryToken TokenID="JuickToken" TaskName="_default">
diff --git a/Juick/SubmissionInfo/ManualTestResults.xml b/Juick/SubmissionInfo/ManualTestResults.xml
index 241b27c..ca4f7ca 100644
--- a/Juick/SubmissionInfo/ManualTestResults.xml
+++ b/Juick/SubmissionInfo/ManualTestResults.xml
@@ -1,4 +1,4 @@
-<ManualTestResults version="1.0.0.3">
+<ManualTestResults version="1.0.0.5">
   <ManualTestCases>
     <ManualTestCase Name="4.7.1">Pending</ManualTestCase>
     <ManualTestCase Name="5.1.1">Pending</ManualTestCase>
@@ -47,8 +47,19 @@
     <ManualTestCase Name="6.9.3">Pending</ManualTestCase>
     <ManualTestCase Name="6.9.4">Pending</ManualTestCase>
     <ManualTestCase Name="6.9.5">Pending</ManualTestCase>
-    <ManualTestCase Name="6.10.1">Pending</ManualTestCase>
     <ManualTestCase Name="6.10.2">Pending</ManualTestCase>
     <ManualTestCase Name="6.10.3">Pending</ManualTestCase>
+    <ManualTestCase Name="6.11.1">Pending</ManualTestCase>
+    <ManualTestCase Name="6.11.2">Pending</ManualTestCase>
+    <ManualTestCase Name="6.11.3">Pending</ManualTestCase>
+    <ManualTestCase Name="6.11.4">Pending</ManualTestCase>
+    <ManualTestCase Name="6.11.5">Pending</ManualTestCase>
+    <ManualTestCase Name="6.12.1">Pending</ManualTestCase>
+    <ManualTestCase Name="6.13.1">Pending</ManualTestCase>
+    <ManualTestCase Name="6.14.1">Pending</ManualTestCase>
+    <ManualTestCase Name="6.14.2">Pending</ManualTestCase>
+    <ManualTestCase Name="6.14.3">Pending</ManualTestCase>
+    <ManualTestCase Name="6.14.4">Pending</ManualTestCase>
+    <ManualTestCase Name="6.14.5">Pending</ManualTestCase>
   </ManualTestCases>
 </ManualTestResults>
 \ No newline at end of file
diff --git a/Juick/SubmissionInfo/Settings.xml b/Juick/SubmissionInfo/Settings.xml
index d425313..81fd2ca 100644
--- a/Juick/SubmissionInfo/Settings.xml
+++ b/Juick/SubmissionInfo/Settings.xml
@@ -1,4 +1,6 @@
 <MarketplaceDetails>
-  <PCAppTile>ApplicationTileMarket.png</PCAppTile>
-  <ScreenShots>scr1.png;scr2.png;scr3.png;;;;;;</ScreenShots>
+  <SmallAppTile>ApplicationTileMarket.png</SmallAppTile>
+  <ScreenShots>;;;;;;;;</ScreenShots>
+  <ScreenShotsWXGA>scrWXGA.png;;;;;;;;</ScreenShotsWXGA>
+  <ScreenShots720P>;;;;;;;;</ScreenShots720P>
 </MarketplaceDetails>
 \ No newline at end of file
diff --git a/Juick/SubmissionInfo/scr1.png b/Juick/SubmissionInfo/scr1.png
deleted file mode 100644
index 28d0713..0000000
--- a/Juick/SubmissionInfo/scr1.png
+++ /dev/null
diff --git a/Juick/SubmissionInfo/scr2.png b/Juick/SubmissionInfo/scr2.png
deleted file mode 100644
index 68ddd8d..0000000
--- a/Juick/SubmissionInfo/scr2.png
+++ /dev/null
diff --git a/Juick/SubmissionInfo/scr3.png b/Juick/SubmissionInfo/scr3.png
deleted file mode 100644
index 4bcf13c..0000000
--- a/Juick/SubmissionInfo/scr3.png
+++ /dev/null