Merge branch 'develop'

Author: eyedol

changelog.json

@@ -4,7 +4,9 @@
         "date": "November 11, 2014",
         "features": [
             "Updated website with demo code showing how to integrate the message result API",
-            "Updated failed notification icon."
+            "Updated failed notification icon.",
+            "Changed Message Results API query string from task=results to task=result",
+            "Changed Message Results API JSON property from message_uuid to uuid"
         ],
         "bugs": [
             "Fixed a bug with message result API.",

website-src/_root/configure.html

@@ -2,7 +2,7 @@
 title : Configure
 layout : default
 description : Configure SMSsync
-date : Jun 23, 2014
+date : Nov 11, 2014
 header : <h1>How To Configure SMSsync<small> This page documents how to configure SMSsync on your Android device.</small></h1>
 ---
 <script type="text/javascript">

website-src/_root/contributors.html

@@ -2,7 +2,7 @@
 title : Contributors
 layout : default
 description : SMSsync contributors
-date : Jun 23, 2014
+date : Nov 11, 2014
 header : <h3>Map of Contributors<small> These are people who have freely contributed their time towards making SMSsync better</small></h3>
 ---
 {{# stylesheets.load }}

website-src/_root/developers.html

@@ -2,7 +2,7 @@
 title : Developers
 layout : default
 description : SMSsync developer documentation
-date : Jun 23, 2014
+date : Nov 11, 2014
 header : <h1>Developers Documentation <small>This shows how to integrate SMSsync into your project.</small></h1>
 ---
 <div class="row">
@@ -205,10 +205,10 @@ <h2>Instructions</h2>
         "95df126b-ee80-4175-a6fb"
     ]
 }</pre>
-<p>To send SMS status delivery report back to the server, SMSsync will make a <code>GET ?task=results</code> to the server and should receive a list
+<p>To send SMS status delivery report back to the server, SMSsync will make a <code>GET ?task=result</code> to the server and should receive a list
 of message UUIDs that are waiting to receive delivery reports. The server should send the JSON response below</p>
 <pre class="prettyprint linenums">
-POST /smssync?task=results HTTP/1.1
+POST /smssync?task=result HTTP/1.1
 Host: testserver.local
 
 HTTP/1.1 200 OK
@@ -220,9 +220,9 @@ <h2>Instructions</h2>
         "95df126b-ee80-4175-a6fb"
     ]
 }</pre>
-<p>Then SMSsync will send delivery reports for the message uuids above as a POST request<code>POST ?task=results</code> with the JSON response below</p>
+<p>Then SMSsync will send delivery reports for the message uuids above as a POST request<code>POST ?task=result</code> with the JSON response below</p>
 <pre class="prettyprint linenums">
-POST /smssync?task=results HTTP/1.1
+POST /smssync?task=result HTTP/1.1
 Host: testserver.local
 Content-Type: application/json; charset=utf-8
 
@@ -527,7 +527,7 @@ <h2>A sample web service</h2>
 
 if($_SERVER['REQUEST_METHOD'] === 'POST')
 {
-    if($_SERVER['QUERY_STRING'] === 'task=results')
+    if($_SERVER['QUERY_STRING'] === 'task=result')
     {
         get_sms_delivery_report();
     }

website-src/_root/download.html

@@ -2,7 +2,7 @@
 title : Download
 layout : default
 description : Download SMSsync
-date : Jun 23, 2014
+date : Nov 11, 2014
 header : <h1>Downloads <small>Where to download the app.</small></h1>
 ---
 <div class="row">

website-src/_root/features.md

@@ -2,7 +2,7 @@
 title : Features
 layout : default
 description : SMSsync features
-date : Jun 23, 2014
+date : Nov 11, 2014
 header : <h1>Features <small>Highlights the important features of SMSsync.</small></h1>
 ---
 

website-src/_root/index.html

@@ -2,7 +2,7 @@
 title : Home
 layout : index
 description : SMSsync home page
-date : Jun 23, 2014
+date : Nov 11, 2014
 header : <h1>About</h1>
 ---
 {{# javascripts.load }}

website-src/_root/releases.html

@@ -2,7 +2,7 @@
 title : Releases
 layout : default
 description : SMSsync releases
-date : Jun 23, 2014
+date : Nov 11, 2014
 header : <h1>Releases History <small>This page is about release information for SMSsync. It provides changelogs and version numbers of old releases, and details of current stable and development branches.</small></h1>
 ---
 {{# javascripts.load }}

website-src/_root/screenshot.html

@@ -2,7 +2,7 @@
 title : Screenshots
 layout : default
 description : SMSsync screenshots
-date : Jun 23, 2014
+date : Nov 11, 2014
 header : <h1>Releases History <small>This page is about release information for SMSsync. It provides changelogs and version numbers of old releases, and details of current stable and development branches.</small></h1>
 ---
 {{# javascripts.load }}