Merge branch 'private-dev'

nowfloats · Aug 28, 2017 · c1da73d · c1da73d
2 parents b290f20 + 71a057f
commit c1da73d
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 3 deletions.
diff --git a/ANAConversationPlatform/Models/Button.cs b/ANAConversationPlatform/Models/Button.cs
@@ -61,6 +61,22 @@ public enum ButtonTypeEnum
         GetAgent,
         ApiCall,
         ShowConfirmation,
-        FetchChatFlow
+        FetchChatFlow,
+        /// <summary>
+        /// Format: yyyy-MM-dd
+        /// </summary>
+        GetDate,
+        /// <summary>
+        /// Format: HH:mm:ss
+        /// </summary>
+        GetTime,
+        /// <summary>
+        /// Format: yyyy-MM-ddTHH:mm:ss
+        /// </summary>
+        GetDateTime,
+        /// <summary>
+        /// Format: [Latitude],[Longitude]
+        /// </summary>
+        GetLocation
     }
 }
diff --git a/ANAConversationSimulator/Models/Chat/Button.cs b/ANAConversationSimulator/Models/Chat/Button.cs
@@ -125,6 +125,22 @@ public enum ButtonTypeEnum
         GetAgent,
         ApiCall,
         ShowConfirmation,
-        FetchChatFlow
+        FetchChatFlow,
+        /// <summary>
+        /// Format: yyyy-MM-dd
+        /// </summary>
+        GetDate,
+        /// <summary>
+        /// Format: HH:mm:ss
+        /// </summary>
+        GetTime,
+        /// <summary>
+        /// Format: yyyy-MM-ddTHH:mm:ss
+        /// </summary>
+        GetDateTime,
+        /// <summary>
+        /// Format: [Latitude],[Longitude]
+        /// </summary>
+        GetLocation
     }
 }
diff --git a/ANAConversationSimulator/Package.appxmanifest b/ANAConversationSimulator/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="44cabbc3-0a2f-4255-b5bb-b099cd5762f9" Publisher="CN=ProjectANA" Version="2.1.0.0" />
+  <Identity Name="44cabbc3-0a2f-4255-b5bb-b099cd5762f9" Publisher="CN=ProjectANA" Version="2.1.1.0" />
   <mp:PhoneIdentity PhoneProductId="44cabbc3-0a2f-4255-b5bb-b099cd5762f9" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>ANA Conversation Simulator</DisplayName>