Skip to content

Commit

Permalink
Merge pull request #304 from Chicago/dev
Browse files Browse the repository at this point in the history
Milestone 1.4.0 changes
  • Loading branch information
rladines committed Jun 29, 2017
2 parents 95e289e + 9199dee commit d7cb301
Show file tree
Hide file tree
Showing 30 changed files with 37,203 additions and 4,606 deletions.
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
![OpenGrid](img/branding/OpenGrid_Logo_Horizontal_3Color.png)

[![Build status - Linux](https://img.shields.io/travis/Chicago/opengrid/master.svg?style=flat-square&label=Linux build)](https://travis-ci.org/Chicago/opengrid)[![Build status - Windows](https://img.shields.io/appveyor/ci/tomschenkjr/opengrid/master.svg?style=flat-square&label=Windows build)](https://ci.appveyor.com/project/tomschenkjr/opengrid)[![Node.js dependencies](https://img.shields.io/coveralls/Chicago/opengrid/master.svg?style=flat-square)](https://coveralls.io/github/Chicago/opengrid)[![Node.js](https://img.shields.io/node/v/gh-badges.svg?style=flat-square)](https://david-dm.org/Chicago/opengrid)[![Node.js dependencies](https://img.shields.io/david/Chicago/opengrid.svg?style=flat-square)](https://david-dm.org/Chicago/opengrid)[![Node.js devdependencies](https://img.shields.io/david/dev/chicago/opengrid.svg?style=flat-square)](https://david-dm.org/Chicago/opengrid#info=devDependencies&view=table)
[![Build status-Linux](https://img.shields.io/travis/Chicago/opengrid/master.svg?style=flat-square&label=Linux%20build)](https://travis-ci.org/Chicago/opengrid)[![Build status-Windows](https://img.shields.io/appveyor/ci/tomschenkjr/opengrid/master.svg?style=flat-square&label=Windows%20build)](https://ci.appveyor.com/project/tomschenkjr/opengrid)[![Node.js dependencies](https://img.shields.io/coveralls/Chicago/opengrid/master.svg?style=flat-square)](https://coveralls.io/github/Chicago/opengrid)[![Node.js](https://img.shields.io/node/v/gh-badges.svg?style=flat-square)](https://david-dm.org/Chicago/opengrid)[![Node.js dependencies](https://img.shields.io/david/Chicago/opengrid.svg?style=flat-square)](https://david-dm.org/Chicago/opengrid)[![Node.js devdependencies](https://img.shields.io/david/dev/chicago/opengrid.svg?style=flat-square)](https://david-dm.org/Chicago/opengrid#info=devDependencies&view=table)

OpenGrid an open-source, interactive map platform that allows users to explore multiple data sources in an easy-to-use interface. Developed to support situational awareness, incident monitoring and responses, historical data retrieval, and real-time advanced analytics. Users can perform advanced queries to filter data, search within custom boundaries, or based on the users location. Other GIS data, such as weather and Shapefiles can be overlaid on the map with other data. OpenGrid is natively compatible with desktops and mobile devices.

Expand All @@ -10,8 +10,7 @@ OpenGrid uses a service layer to retrieve data from an underlying data store.

* User Documentation: http://docs.opengrid.io
* Repository for User Interface: https://github.com/Chicago/opengrid
* Repository for
* Planning Documentation and Meeting Notes: https://github.com/Chicago/opengrid/wiki
* Repository for Planning Documentation and Meeting Notes: https://github.com/Chicago/opengrid/wiki
* Issues: https://github.com/Chicago/opengrid/issues
* Mailing List & Discussion: https://groups.google.com/forum/#!forum/opengrid-chicago

Expand Down
6 changes: 3 additions & 3 deletions docs/Administration.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#Administration
### Overview
<h1>Administration</h1>
<h3> Overview </h3>
<p>Administration has the authority to manage users’ responsibilities; as well as provide arrangements and tasks needed to control the users operation. They also allow access to specified functionalities.</p>

The Administration has the authority to:<br>
<p>The Administration has the authority to: </p><br>

- Add a new User
- Remove a User
Expand Down

0 comments on commit d7cb301

Please sign in to comment.