Merge pull request #207 from Chicago/dev

Release 1.1.0 Changes
Chicago · Jun 9, 2016 · 44322e0 · 44322e0
2 parents df7c549 + fe3f4a2
commit 44322e0
Show file tree

Hide file tree

Showing 285 changed files with 6,503 additions and 99 deletions.
diff --git a/docs/OpenGrid API.md b/docs/OpenGrid API.md
@@ -1,6 +1,6 @@
 <br>
 <h1 align="center">OpenGrid REST Service <br> Application Programming Interface (API)</h1>
-<h4 align="center">Version 1.0</h4>
+<h4 align="center">Version 1.1.0</h4>
 
 <!--
 ## Table of Contents
@@ -216,7 +216,8 @@ Create a new user. Returns object for newly created user, if successful.
 
 ## 1.1.4 /users/{user_id}
 **Methods**
-<p><b>GET</b>
+
+<p><b>GET</b></p>
 <br>
 Return a single user object given the user’s internal id.
 </p>
@@ -785,18 +786,25 @@ It is recommended that this value be URL encoded.
 <td><p>The maximum number of records to return; If this parameter is not specified, no records are returned (i.e. default value of 0)</p>
 </td>
 </tr>
+<tr>
+<td>opts</td>
+<td>JSON string</td>
+<td><p>Optional parameters that can be passed depending on service capabilities. This value needs to be encoded for the call to work as expected. "geoFilter" is an attribute supported as of Release 1.1.0 and should be a valid geoJson geometry value.</p>
+</td>
+</tr>
+
 </table>
 </html>
 
 <p><b>Sample Request</b><br>
 <code>
-&lt;Service URL&gt;/datasets/twitter/query?q={"$and":[{"text":{"$regex":"happy"}}]}&n=1
+&lt;Service URL&gt;/datasets/twitter/query?q={"$and":[{"text":{"$regex":"happy"}}]}&n=1&opts={"geoFilter":{"type":"MultiPolygon","coordinates":[[[[-87.63304710388184,41.89278978584501],[-87.61206150054932,41.89278978584501],[-87.61206150054932,41.88140002416609],[-87.63304710388184,41.88140002416609],[-87.63304710388184,41.89278978584501]]]]}}
 </code> 
 </p>
 
 <p><b><small>Or when URL encoded:</small></b><br>
 <code>
-&lt;Service URL&gt;/datasets/twitter/query?q=%7B%22$and%22:%5B%7B%22text%22:%7B%22$regex%22:%22happy%22%7D%7D%5D%7D&n=1
+&lt;Service URL&gt;/datasets/twitter/query?q=%7B%22$and%22:%5B%7B%22text%22:%7B%22$regex%22:%22happy%22%7D%7D%5D%7D&n=6000&opts=%7B%22geoFilter%22:%7B%22type%22:%22MultiPolygon%22,%22coordinates%22:%5B%5B%5B%5B-87.63304710388184,41.89278978584501%5D,%5B-87.61206150054932,41.89278978584501%5D,%5B-87.61206150054932,41.88140002416609%5D,%5B-87.63304710388184,41.88140002416609%5D,%5B-87.63304710388184,41.89278978584501%5D%5D%5D%5D%7D%7D
 </code>
 </p>
 
@@ -1101,6 +1109,26 @@ Delete a query given the query’s internal Id on the URL path.
 No response is returned when a query is deleted.
 </p>
 
+## 1.1.12 /capabilities
+New since Release 1.1.0<br>
+**Methods**
+<p><b>GET</b>
+<br>
+Return a json object with service's capabilities flags. As of Release 1.1.0, only 'geoSpatialFiltering' flag is available.
+</p>
+<p><b>Sample Request</b>
+<br>
+<code>
+&lt;Service URL&gt;/capabilities 
+</code> 
+</p>
+<p><b>Sample Response</b><br>
+<code>
+&nbsp; {
+<br> &nbsp; &nbsp; &nbsp; "geoSpatialFiltering" : true
+<br> &nbsp; }
+</code>
+</p>
 
 ## 1.2 HTTP Status Codes on Response
 
@@ -1114,6 +1142,18 @@ No response is returned when a query is deleted.
 </li></ul>
 
 <code>
+<<<<<<< HEAD
+&nbsp; {
+<br> &nbsp; &nbsp; “error”: {
+<br> &nbsp; &nbsp; &nbsp; &nbsp; “code”: “&lt;error code&gt;”
+<br> &nbsp; &nbsp; &nbsp; &nbsp; “message”: “&lt;error message&gt;”
+<br> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; }
+<br> &nbsp;&nbsp; }
+</code>
+
+{ 
+<p> “error”: {
+=======
 <p>&nbsp; { </p>
 <p>&nbsp; &nbsp; “error”: { 
 </p>
@@ -1122,6 +1162,7 @@ No response is returned when a query is deleted.
 <p>&nbsp; &nbsp; &nbsp; &nbsp; “message”: “&lt;error message&gt;”
 </p>
 <p>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; }
+>>>>>>> df7c549d50d1400ec04f15d3c747fc5f50c7951c
 </p>
 <p>&nbsp;&nbsp; }
 </p>

diff --git a/docs/User Documentation.md b/docs/User Documentation.md
@@ -1,6 +1,6 @@
 <br>
 
-![login](media/combine32.png)
+![login](media/combine32.jpg)
 
 
 ## Getting Started
@@ -49,7 +49,7 @@ The quick search help feature assist users in performing a valid search. Each se
 - between
 <br>
 
-![combine](media/combine21.png)
+![combine](media/combine21.jpg)
 
 ### Search around a parameter (Point)
 <p>To search with given point or boundaries the Geo spatial-filters will have to be applied.<br>
@@ -97,27 +97,27 @@ Tile Maps are small images, usually rectangular or isometric that acts like a pu
 <p>Search criteria that’s been entered and saved within the database are called Saved Queries. The saved queries are store in the Manage Queries section. To save a query, the user enters in the preferred name for a query; then clicks the saved button. The user will also be given an option to overwrite other queries and save it using an existing name.</p>
 <p>There are three icons for managing queries submit, share and delete. The submit function allows the user to run the query for the manage queries window. The share function gives the user the ability to share a query either to a group or to another user. The delete function gives the user the option to delete a query.</p>
 <br>
-![measure](media/combine31.png)
+![measure](media/combine31.jpg)
 
 ## Measure Distance and Area
 <p>Measuring distances and areas is a function within OpenGrid that allows the user to perform measurements between any given point to another. Once the measurement tool is selected the user will be prompt to start creating measurements by adding points on the map.</p>
 
 ## Measurement and Tools
 <p>Click the measurement tool icon.</p>  
 <br>
-![icoa](media/ombine1.png)
+![icoa](media/ombine1.jpg)
 
 <p>A measurement tool textbox will appear with an option to <b>create a new measurement</b>.</p>
 <br>
-![icob](media/ombine4.png)
+![icob](media/ombine4.jpg)
 
 <p>Once click <b>"create a new measurement"</b>... display points of origin and destination on the map by creating points.</p> 
 <br>
-![icoc](media/ombine3.png)
+![icoc](media/ombine3.jpg)
 
 <br>
 <p>After the measurement has been created the finish measurement textbox will appear. click <b>"Finish Measurement"</b>.</p>
-![icod](media/combine10.png)
+![icod](media/combine10.jpg)
 <br>
 <p>After clicking on finish measurement the <b>"Area Measurement"</b> textbox will appear providing information about the perimeter:</p>.
 <ul>
@@ -127,11 +127,11 @@ Tile Maps are small images, usually rectangular or isometric that acts like a pu
 </ul>
 <p>It also gives the user an option to center on the Area or to Delete the perimeter.</p>
 <br>
-![icoe](media/ombine5.png)
+![icoe](media/ombine5.jpg)
 
 <p></p>
 
-![icof](media/combine9.png)
+![icof](media/combine9.jpg)
 
 ## FREQUENTLY ASKED QUESTIONS
 

diff --git a/docs/media/2015-12-01_1211.jpg b/docs/media/2015-12-01_1211.jpg
diff --git a/docs/media/2015-12-01_1211.png b/docs/media/2015-12-01_1211.png
diff --git a/docs/media/Android OG 003.png → docs/media/Android OG 003.jpg b/docs/media/Android OG 003.png → docs/media/Android OG 003.jpg
diff --git a/docs/media/Android OG 005.jpg b/docs/media/Android OG 005.jpg
diff --git a/docs/media/Android OG 005.png b/docs/media/Android OG 005.png
diff --git a/docs/media/Android OG 006.jpg b/docs/media/Android OG 006.jpg
diff --git a/docs/media/Android OG 006.png b/docs/media/Android OG 006.png
diff --git a/docs/media/Android OG 007.jpg b/docs/media/Android OG 007.jpg
diff --git a/docs/media/Android OG 007.png b/docs/media/Android OG 007.png
diff --git a/docs/media/Android OG 008.jpg b/docs/media/Android OG 008.jpg
diff --git a/docs/media/Android OG 008.png b/docs/media/Android OG 008.png
diff --git a/docs/media/Android OG 009.jpg b/docs/media/Android OG 009.jpg
diff --git a/docs/media/Android OG 009.png b/docs/media/Android OG 009.png
diff --git a/docs/media/Android OG 010.jpg b/docs/media/Android OG 010.jpg
diff --git a/docs/media/Android OG 010.png b/docs/media/Android OG 010.png
diff --git a/docs/media/Android OG 013.jpg b/docs/media/Android OG 013.jpg
diff --git a/docs/media/Android OG 013.png b/docs/media/Android OG 013.png
diff --git a/docs/media/Android OG 014.jpg b/docs/media/Android OG 014.jpg
diff --git a/docs/media/Android OG 014.png b/docs/media/Android OG 014.png
diff --git a/docs/media/Android OG 015.jpg b/docs/media/Android OG 015.jpg
diff --git a/docs/media/Android OG 015.png b/docs/media/Android OG 015.png
diff --git a/docs/media/Android OG 016.jpg b/docs/media/Android OG 016.jpg
diff --git a/docs/media/Android OG 016.png b/docs/media/Android OG 016.png
diff --git a/docs/media/Android OG 017.jpg b/docs/media/Android OG 017.jpg
diff --git a/docs/media/Android OG 017.png b/docs/media/Android OG 017.png
diff --git a/docs/media/Android OG 018.jpg b/docs/media/Android OG 018.jpg
diff --git a/docs/media/Android OG 018.png b/docs/media/Android OG 018.png
diff --git a/docs/media/Android OG 019.jpg b/docs/media/Android OG 019.jpg
diff --git a/docs/media/Android OG 019.png b/docs/media/Android OG 019.png
diff --git a/docs/media/Android OG 020.jpg b/docs/media/Android OG 020.jpg
diff --git a/docs/media/Android OG 020.png b/docs/media/Android OG 020.png
diff --git a/docs/media/Android OG 021.jpg b/docs/media/Android OG 021.jpg
diff --git a/docs/media/Android OG 021.png b/docs/media/Android OG 021.png
diff --git a/docs/media/Android OG 022.jpg b/docs/media/Android OG 022.jpg
diff --git a/docs/media/Android OG 022.png b/docs/media/Android OG 022.png
diff --git a/docs/media/Android OG 023.jpg b/docs/media/Android OG 023.jpg
diff --git a/docs/media/Android OG 023.png b/docs/media/Android OG 023.png
diff --git a/docs/media/Android OG 024.jpg b/docs/media/Android OG 024.jpg
diff --git a/docs/media/Android OG 024.png b/docs/media/Android OG 024.png
diff --git a/docs/media/Android OG 025.jpg b/docs/media/Android OG 025.jpg
diff --git a/docs/media/Android OG 025.png b/docs/media/Android OG 025.png
diff --git a/docs/media/Android OG 026.jpg b/docs/media/Android OG 026.jpg
diff --git a/docs/media/Android OG 026.png b/docs/media/Android OG 026.png
diff --git a/docs/media/Android OG 027.jpg b/docs/media/Android OG 027.jpg
diff --git a/docs/media/Android OG 027.png b/docs/media/Android OG 027.png
diff --git a/docs/media/Android OG 028.jpg b/docs/media/Android OG 028.jpg
diff --git a/docs/media/Android OG 028.png b/docs/media/Android OG 028.png
diff --git a/docs/media/Android OG 029.jpg b/docs/media/Android OG 029.jpg
diff --git a/docs/media/Android OG 029.png b/docs/media/Android OG 029.png
diff --git a/docs/media/Android OG 030.jpg b/docs/media/Android OG 030.jpg
diff --git a/docs/media/Android OG 030.png b/docs/media/Android OG 030.png
diff --git a/docs/media/Android OG 031.jpg b/docs/media/Android OG 031.jpg
diff --git a/docs/media/Android OG 031.png b/docs/media/Android OG 031.png
diff --git a/docs/media/Android OG 032.jpg b/docs/media/Android OG 032.jpg
diff --git a/docs/media/Android OG 032.png b/docs/media/Android OG 032.png
diff --git a/docs/media/Iphone Mobile 013.PNG b/docs/media/Iphone Mobile 013.PNG
diff --git a/docs/media/Iphone Mobile 013.jpg b/docs/media/Iphone Mobile 013.jpg
diff --git a/docs/media/Iphone Mobile 014.PNG b/docs/media/Iphone Mobile 014.PNG
diff --git a/docs/media/Iphone Mobile 014.jpg b/docs/media/Iphone Mobile 014.jpg
diff --git a/docs/media/Iphone Mobile 015.PNG b/docs/media/Iphone Mobile 015.PNG
diff --git a/docs/media/Iphone Mobile 015.jpg b/docs/media/Iphone Mobile 015.jpg
diff --git a/docs/media/Iphone Mobile 016.PNG b/docs/media/Iphone Mobile 016.PNG
diff --git a/docs/media/Iphone Mobile 016.jpg b/docs/media/Iphone Mobile 016.jpg
diff --git a/docs/media/Iphone Mobile 017.PNG b/docs/media/Iphone Mobile 017.PNG
diff --git a/docs/media/Iphone Mobile 017.jpg b/docs/media/Iphone Mobile 017.jpg
diff --git a/docs/media/Iphone Mobile 018.PNG b/docs/media/Iphone Mobile 018.PNG
diff --git a/docs/media/Iphone Mobile 018.jpg b/docs/media/Iphone Mobile 018.jpg
diff --git a/docs/media/Iphone Mobile 019.PNG b/docs/media/Iphone Mobile 019.PNG
diff --git a/docs/media/Iphone Mobile 019.jpg b/docs/media/Iphone Mobile 019.jpg
diff --git a/docs/media/Iphone Mobile 020.PNG b/docs/media/Iphone Mobile 020.PNG
diff --git a/docs/media/Iphone Mobile 020.jpg b/docs/media/Iphone Mobile 020.jpg
diff --git a/docs/media/Iphone Mobile 021.PNG b/docs/media/Iphone Mobile 021.PNG
diff --git a/docs/media/Iphone Mobile 021.jpg b/docs/media/Iphone Mobile 021.jpg
diff --git a/docs/media/Iphone Mobile 022.PNG b/docs/media/Iphone Mobile 022.PNG
diff --git a/docs/media/Iphone Mobile 022.jpg b/docs/media/Iphone Mobile 022.jpg
diff --git a/docs/media/Iphone Mobile 023.PNG b/docs/media/Iphone Mobile 023.PNG
diff --git a/docs/media/Iphone Mobile 023.jpg b/docs/media/Iphone Mobile 023.jpg
diff --git a/docs/media/Iphone Mobile 024.PNG b/docs/media/Iphone Mobile 024.PNG
diff --git a/docs/media/Iphone Mobile 024.jpg b/docs/media/Iphone Mobile 024.jpg
diff --git a/docs/media/Iphone Mobile 025.PNG b/docs/media/Iphone Mobile 025.PNG
diff --git a/docs/media/Iphone Mobile 025.jpg b/docs/media/Iphone Mobile 025.jpg
diff --git a/docs/media/Iphone Mobile 026.PNG b/docs/media/Iphone Mobile 026.PNG
diff --git a/docs/media/Iphone Mobile 026.jpg b/docs/media/Iphone Mobile 026.jpg
diff --git a/docs/media/Iphone Mobile 027.PNG b/docs/media/Iphone Mobile 027.PNG
diff --git a/docs/media/Iphone Mobile 027.jpg b/docs/media/Iphone Mobile 027.jpg
diff --git a/docs/media/Iphone Mobile 028.PNG b/docs/media/Iphone Mobile 028.PNG
diff --git a/docs/media/Iphone Mobile 028.jpg b/docs/media/Iphone Mobile 028.jpg
diff --git a/docs/media/Iphone Mobile 029.PNG b/docs/media/Iphone Mobile 029.PNG
diff --git a/docs/media/Iphone Mobile 029.jpg b/docs/media/Iphone Mobile 029.jpg
diff --git a/docs/media/Iphone Mobile 030.PNG b/docs/media/Iphone Mobile 030.PNG
diff --git a/docs/media/Iphone Mobile 030.jpg b/docs/media/Iphone Mobile 030.jpg
diff --git a/docs/media/Iphone Mobile 031.PNG b/docs/media/Iphone Mobile 031.PNG
diff --git a/docs/media/Iphone Mobile 031.jpg b/docs/media/Iphone Mobile 031.jpg
diff --git a/docs/media/Iphone Mobile 032.PNG b/docs/media/Iphone Mobile 032.PNG
diff --git a/docs/media/Iphone Mobile 032.jpg b/docs/media/Iphone Mobile 032.jpg
diff --git a/docs/media/Iphone Mobile 033.PNG b/docs/media/Iphone Mobile 033.PNG
diff --git a/docs/media/Iphone Mobile 033.jpg b/docs/media/Iphone Mobile 033.jpg
diff --git a/docs/media/Iphone Mobile 034.PNG b/docs/media/Iphone Mobile 034.PNG
diff --git a/docs/media/Iphone Mobile 034.jpg b/docs/media/Iphone Mobile 034.jpg
diff --git a/docs/media/Iphone Mobile 035.PNG b/docs/media/Iphone Mobile 035.PNG
diff --git a/docs/media/Iphone Mobile 035.jpg b/docs/media/Iphone Mobile 035.jpg
diff --git a/docs/media/Iphone Mobile 036.PNG b/docs/media/Iphone Mobile 036.PNG
diff --git a/docs/media/Iphone Mobile 036.jpg b/docs/media/Iphone Mobile 036.jpg
diff --git a/docs/media/Iphone Mobile 037.PNG b/docs/media/Iphone Mobile 037.PNG
diff --git a/docs/media/Iphone Mobile 037.jpg b/docs/media/Iphone Mobile 037.jpg
diff --git a/docs/media/Iphone Mobile 038.PNG b/docs/media/Iphone Mobile 038.PNG
diff --git a/docs/media/Iphone Mobile 038.jpg b/docs/media/Iphone Mobile 038.jpg
diff --git a/docs/media/Iphone Mobile 039.PNG b/docs/media/Iphone Mobile 039.PNG
diff --git a/docs/media/Iphone Mobile 039.jpg b/docs/media/Iphone Mobile 039.jpg
diff --git a/docs/media/Iphone Mobile 040.PNG b/docs/media/Iphone Mobile 040.PNG
diff --git a/docs/media/Iphone Mobile 040.jpg b/docs/media/Iphone Mobile 040.jpg
diff --git a/docs/media/Iphone Mobile 041.PNG b/docs/media/Iphone Mobile 041.PNG
diff --git a/docs/media/Iphone Mobile 041.jpg b/docs/media/Iphone Mobile 041.jpg
diff --git a/docs/media/Iphone Mobile 042.PNG b/docs/media/Iphone Mobile 042.PNG
diff --git a/docs/media/Iphone Mobile 042.jpg b/docs/media/Iphone Mobile 042.jpg
diff --git a/docs/media/Iphone Mobile 043.PNG b/docs/media/Iphone Mobile 043.PNG
diff --git a/docs/media/Iphone Mobile 043.jpg b/docs/media/Iphone Mobile 043.jpg
diff --git a/docs/media/Iphone Mobile 045.PNG b/docs/media/Iphone Mobile 045.PNG
diff --git a/docs/media/Iphone Mobile 045.jpg b/docs/media/Iphone Mobile 045.jpg
diff --git a/docs/media/Iphone Mobile 046.PNG b/docs/media/Iphone Mobile 046.PNG
diff --git a/docs/media/Iphone Mobile 046.jpg b/docs/media/Iphone Mobile 046.jpg
diff --git a/docs/media/Iphone Mobile 047.PNG b/docs/media/Iphone Mobile 047.PNG
diff --git a/docs/media/Iphone Mobile 047.jpg b/docs/media/Iphone Mobile 047.jpg
diff --git a/docs/media/Iphone Mobile 048.PNG b/docs/media/Iphone Mobile 048.PNG
diff --git a/docs/media/Iphone Mobile 048.jpg b/docs/media/Iphone Mobile 048.jpg
diff --git a/docs/media/Iphone Mobile 049.PNG b/docs/media/Iphone Mobile 049.PNG
diff --git a/docs/media/Iphone Mobile 049.jpg b/docs/media/Iphone Mobile 049.jpg
diff --git a/docs/media/Iphone52.PNG b/docs/media/Iphone52.PNG
diff --git a/docs/media/Iphone52.jpg b/docs/media/Iphone52.jpg
diff --git a/docs/media/Thumbs.db b/docs/media/Thumbs.db
diff --git a/docs/media/coc.jpg b/docs/media/coc.jpg
diff --git a/docs/media/coc.png b/docs/media/coc.png
diff --git a/docs/media/combine10.png b/docs/media/combine10.png
diff --git a/docs/media/combine20.jpg b/docs/media/combine20.jpg
diff --git a/docs/media/combine20.png b/docs/media/combine20.png
diff --git a/docs/media/combine21.jpg b/docs/media/combine21.jpg
diff --git a/docs/media/combine21.png b/docs/media/combine21.png
diff --git a/docs/media/combine23.png → docs/media/combine23.jpg b/docs/media/combine23.png → docs/media/combine23.jpg
diff --git a/docs/media/combine25.jpg b/docs/media/combine25.jpg
diff --git a/docs/media/combine25.png b/docs/media/combine25.png
diff --git a/docs/media/combine30.jpg b/docs/media/combine30.jpg
diff --git a/docs/media/combine30.png b/docs/media/combine30.png
diff --git a/docs/media/combine31.jpg b/docs/media/combine31.jpg
diff --git a/docs/media/combine31.png b/docs/media/combine31.png
diff --git a/docs/media/combine32.jpg b/docs/media/combine32.jpg
diff --git a/docs/media/combine32.png b/docs/media/combine32.png
diff --git a/docs/media/combine33.png → docs/media/combine33.jpg b/docs/media/combine33.png → docs/media/combine33.jpg
diff --git a/docs/media/combine4.png → docs/media/combine4.jpg b/docs/media/combine4.png → docs/media/combine4.jpg
diff --git a/docs/media/combine5.png → docs/media/combine5.jpg b/docs/media/combine5.png → docs/media/combine5.jpg
diff --git a/docs/media/combine6.png → docs/media/combine6.jpg b/docs/media/combine6.png → docs/media/combine6.jpg
diff --git a/docs/media/combine7.png → docs/media/combine7.jpg b/docs/media/combine7.png → docs/media/combine7.jpg
diff --git a/docs/media/combine8.png → docs/media/combine8.jpg b/docs/media/combine8.png → docs/media/combine8.jpg
diff --git a/docs/media/combine9.png b/docs/media/combine9.png
diff --git a/docs/media/ekdi.jpg b/docs/media/ekdi.jpg
diff --git a/docs/media/ekdi.png b/docs/media/ekdi.png
diff --git a/docs/media/image1.png → docs/media/image1.jpg b/docs/media/image1.png → docs/media/image1.jpg
diff --git a/docs/media/image15.jpg b/docs/media/image15.jpg
diff --git a/docs/media/image15.png b/docs/media/image15.png
diff --git a/docs/media/image16.jpg b/docs/media/image16.jpg
diff --git a/docs/media/image16.png b/docs/media/image16.png
diff --git a/docs/media/image17.jpg b/docs/media/image17.jpg
diff --git a/docs/media/image17.png b/docs/media/image17.png
diff --git a/docs/media/image18.jpg b/docs/media/image18.jpg
diff --git a/docs/media/image18.png b/docs/media/image18.png
diff --git a/docs/media/image19.jpg b/docs/media/image19.jpg
diff --git a/docs/media/image19.png b/docs/media/image19.png
diff --git a/docs/media/image20.jpg b/docs/media/image20.jpg
diff --git a/docs/media/image20.png b/docs/media/image20.png
diff --git a/docs/media/image33.jpg b/docs/media/image33.jpg
diff --git a/docs/media/image33.png b/docs/media/image33.png
diff --git a/docs/media/image34.jpg b/docs/media/image34.jpg
diff --git a/docs/media/image34.png b/docs/media/image34.png
diff --git a/docs/media/image35.jpg b/docs/media/image35.jpg
diff --git a/docs/media/image35.png b/docs/media/image35.png
diff --git a/docs/media/image36.jpg b/docs/media/image36.jpg
diff --git a/docs/media/image36.png b/docs/media/image36.png
diff --git a/docs/media/image37.jpg b/docs/media/image37.jpg
diff --git a/docs/media/image37.png b/docs/media/image37.png
diff --git a/docs/media/image38.jpg b/docs/media/image38.jpg
diff --git a/docs/media/image38.png b/docs/media/image38.png
diff --git a/docs/media/image39.jpg b/docs/media/image39.jpg
diff --git a/docs/media/image39.png b/docs/media/image39.png
diff --git a/docs/media/image50.jpg b/docs/media/image50.jpg
diff --git a/docs/media/image50.png b/docs/media/image50.png
diff --git a/docs/media/image51.jpg b/docs/media/image51.jpg
diff --git a/docs/media/image51.png b/docs/media/image51.png
diff --git a/docs/media/image52.jpg b/docs/media/image52.jpg
diff --git a/docs/media/image52.png b/docs/media/image52.png
diff --git a/docs/media/image53.jpg b/docs/media/image53.jpg
diff --git a/docs/media/image53.png b/docs/media/image53.png
diff --git a/docs/media/image53a.jpg b/docs/media/image53a.jpg
diff --git a/docs/media/image53a.png b/docs/media/image53a.png
diff --git a/docs/media/image54.jpg b/docs/media/image54.jpg
diff --git a/docs/media/image54.png b/docs/media/image54.png
diff --git a/docs/media/image55.jpg b/docs/media/image55.jpg
diff --git a/docs/media/image55.png b/docs/media/image55.png
diff --git a/docs/media/image56.jpg b/docs/media/image56.jpg
diff --git a/docs/media/image56.png b/docs/media/image56.png
diff --git a/docs/media/image57.jpg b/docs/media/image57.jpg
diff --git a/docs/media/image57.png b/docs/media/image57.png
diff --git a/docs/media/image58.jpg b/docs/media/image58.jpg
diff --git a/docs/media/image58.png b/docs/media/image58.png
diff --git a/docs/media/image59.jpg b/docs/media/image59.jpg
diff --git a/docs/media/image59.png b/docs/media/image59.png
diff --git a/docs/media/image60.jpg b/docs/media/image60.jpg
diff --git a/docs/media/image60.png b/docs/media/image60.png
diff --git a/docs/media/image60_001.jpg b/docs/media/image60_001.jpg
diff --git a/docs/media/image60_001.png b/docs/media/image60_001.png
diff --git a/docs/media/image61.jpg b/docs/media/image61.jpg
diff --git a/docs/media/image61.png b/docs/media/image61.png
diff --git a/docs/media/image62.jpg b/docs/media/image62.jpg
diff --git a/docs/media/image62.png b/docs/media/image62.png
diff --git a/docs/media/image64.jpg b/docs/media/image64.jpg
diff --git a/docs/media/image64.png b/docs/media/image64.png
diff --git a/docs/media/image65.jpg b/docs/media/image65.jpg
diff --git a/docs/media/image65.png b/docs/media/image65.png
diff --git a/docs/media/image66.jpg b/docs/media/image66.jpg
diff --git a/docs/media/image66.png b/docs/media/image66.png
diff --git a/docs/media/image67.jpg b/docs/media/image67.jpg
diff --git a/docs/media/image67.png b/docs/media/image67.png
diff --git a/docs/media/image68.jpg b/docs/media/image68.jpg
diff --git a/docs/media/image68.png b/docs/media/image68.png
diff --git a/docs/media/image70.jpg b/docs/media/image70.jpg
diff --git a/docs/media/image70.png b/docs/media/image70.png
diff --git a/docs/media/image71.jpg b/docs/media/image71.jpg
diff --git a/docs/media/image71.png b/docs/media/image71.png
diff --git a/docs/media/image72.jpg b/docs/media/image72.jpg
diff --git a/docs/media/image72.png b/docs/media/image72.png
diff --git a/docs/media/image73.png b/docs/media/image73.png
diff --git a/docs/media/image75.jpg b/docs/media/image75.jpg
diff --git a/docs/media/image75.png b/docs/media/image75.png
diff --git a/docs/media/image76.png b/docs/media/image76.png
diff --git a/docs/media/image80.jpg b/docs/media/image80.jpg
diff --git a/docs/media/image80.png b/docs/media/image80.png
diff --git a/docs/media/image81.jpg b/docs/media/image81.jpg
diff --git a/docs/media/image81.png b/docs/media/image81.png
diff --git a/docs/media/image82.jpg b/docs/media/image82.jpg
diff --git a/docs/media/image82.png b/docs/media/image82.png
diff --git a/docs/media/image83.jpg b/docs/media/image83.jpg
diff --git a/docs/media/image83.png b/docs/media/image83.png
diff --git a/docs/media/image96.jpg b/docs/media/image96.jpg
diff --git a/docs/media/image96.png b/docs/media/image96.png
diff --git a/docs/media/image97.jpg b/docs/media/image97.jpg
diff --git a/docs/media/image97.png b/docs/media/image97.png
diff --git a/docs/media/image98.jpg b/docs/media/image98.jpg
diff --git a/docs/media/image98.png b/docs/media/image98.png
diff --git a/docs/media/image99.jpg b/docs/media/image99.jpg
diff --git a/docs/media/image99.png b/docs/media/image99.png
diff --git a/docs/media/images45.jpg b/docs/media/images45.jpg
diff --git a/docs/media/images45.png b/docs/media/images45.png
diff --git a/docs/media/images46.jpg b/docs/media/images46.jpg
diff --git a/docs/media/images46.png b/docs/media/images46.png
diff --git a/docs/media/manage.jpg b/docs/media/manage.jpg
diff --git a/docs/media/manage.png b/docs/media/manage.png
diff --git a/docs/media/manage1.jpg b/docs/media/manage1.jpg
diff --git a/docs/media/manage1.png b/docs/media/manage1.png
diff --git a/docs/media/ombine1.jpg b/docs/media/ombine1.jpg
diff --git a/docs/media/ombine1.png b/docs/media/ombine1.png
diff --git a/docs/media/ombine2.jpg b/docs/media/ombine2.jpg
diff --git a/docs/media/ombine2.png b/docs/media/ombine2.png
diff --git a/docs/media/ombine3.jpg b/docs/media/ombine3.jpg
diff --git a/docs/media/ombine3.png b/docs/media/ombine3.png
diff --git a/docs/media/ombine4.jpg b/docs/media/ombine4.jpg
diff --git a/docs/media/ombine4.png b/docs/media/ombine4.png
diff --git a/docs/media/ombine5.jpg b/docs/media/ombine5.jpg
diff --git a/docs/media/ombine5.png b/docs/media/ombine5.png
diff --git a/docs/media/rest.jpg b/docs/media/rest.jpg
diff --git a/docs/media/rest.png b/docs/media/rest.png
diff --git a/img/branding/Thumbs.db b/img/branding/Thumbs.db
diff --git a/lib/jquery-1.11.2/opengrid-query-builder.js b/lib/jquery-1.11.2/opengrid-query-builder.js
@@ -1276,18 +1276,18 @@
 
                             //'$now' is a system value representing current date/time
                             //OpenGrid extension
-                            if ( (value[i] == '$now' || '$today') ) {
+                            //OpenGrid extension
+                            if (this.isChronoValue(value[i])) {
                                 //do something
                                 //valid value
-                                //console.log('found $now');
                             } else {
                                 //original validation logic is below
                                 // we need MomentJS
                                 if (validation.format) {
                                     if (!('moment' in window)) {
                                         error('MomentJS is required for Date/Time validation. Get it here http://momentjs.com');
                                     }
-                                    var datetime = moment(value[i], validation.format);
+                                    /*var datetime = moment(value[i], validation.format);
                                     if (!datetime.isValid()) {
                                         result = ['datetime_invalid'];
                                         break;
@@ -1305,7 +1305,11 @@
                                                 break;
                                             }
                                         }
-                                    }
+                                    }*/
+                                    //we're now using chrono's validator as our main validator
+                                    //anything after this is a bad value
+                                    result = ['datetime_invalid'];
+                                    break;
                                 }
                             }
                             break;
@@ -1327,6 +1331,31 @@
         return result;
     };
 
+    //OpenGrid customization
+    QueryBuilder.prototype.isChronoValue = function(value) {
+        var dt = chrono.parseDate(value);
+        return (dt !=null);
+    };
+
+
+    QueryBuilder.prototype.isNaturalLangChronoValue = function(value) {
+        var o = chrono.parse(value);
+        if (o.length > 0) {
+            var v = o[0];
+            if (v.tags) {
+                //if (v.tags.ENCasualDateParser) {
+                //	console.log("Natural");
+                //} else
+                if (v.tags.ENSlashDateFormatParser) {
+                    return false;
+                } else
+                    return true;
+            }
+        }
+        return false;
+    };
+
+
     /**
      * Returns an incremented group ID
      * @return {string}
@@ -2671,7 +2700,7 @@
                                 valuesCopy = [].concat(rule.value);
                                 if (rule.type === 'date') {
                                     $.each(valuesCopy, function(i, v) {
-                                        valuesCopy[i] = that._getDateValue(v);
+                                        valuesCopy[i] = that._getArrayElementDateValue(i, v);
                                     });
                                 }
                             }
@@ -2699,28 +2728,41 @@
         _getRuleValue: function(rule) {
             //OpenGrid extension, translate system rule value
             if (rule.type === 'date') {
-                return this._getDateValue(rule.value);
+                //OpenGrid extension, translate system rule value
+                if (this.isNaturalLangChronoValue(rule.value) ) {
+                    //map to Mongo's current date time token
+                    //this does not work for datetime values stored as numeric
+                    //rule.value = '$currentDate';
+
+                    //assume: datetime on target is stored in Mongo as a numeric value representing Unix epoch in ms
+                    return moment(chrono.parseDate(rule.value)).startOf('day').valueOf();
+                } else
+                    return moment(rule.value, "MM/DD/YYYY hh:mm:ss a").valueOf();
             } else
                 return rule.value;
         },
 
-        _getDateValue: function(value) {
-            if (value === '$now') {
+        //assume only 'between' operator can be applied
+        _getArrayElementDateValue: function(i, value) {
+            if (this.isNaturalLangChronoValue(value) ) {
                 //map to Mongo's current date time token
-                //this does not work for datetime values stored as numeric
-                //rule.value = '$currentDate';
 
                 //assume: datetime on target is stored in Mongo as a numeric value representing Unix epoch in ms
-                return moment().valueOf();
-            } else if (value === '$today') {
-                return moment().startOf('day').valueOf();
+                if (i==1)
+                    value = moment(chrono.parseDate(value)).endOf('day').valueOf();
+                else
+                    value = moment(chrono.parseDate(value)).startOf('day').valueOf();
+                return value;
             } else {
                 //assume: datetime on target is stored in Mongo as a numeric value representing Unix epoch in ms
                 return moment(value, "MM/DD/YYYY hh:mm:ss a").valueOf();
             }
         },
 
 
+
+
+
         /**
          * Convert MongoDB object to rules
          * @param data {object} query object