Getting ready for 4.0.1 release

* Added change log, starts at 4.0.0 release

Author: newmanw

CHANGELOG.md

@@ -0,0 +1,20 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+Adheres to [Semantic Versioning](http://semver.org/).
+
+---
+
+## 4.0.2 (TBD)
+
+* TBD
+
+## [4.0.1](https://github.com/ngageoint/mage-server/releases/tag/v4.0.1) (02-26-2016)
+
+* You can now add users directly to an event
+* Events can be marked as complete.  Complete events will not be returned for the default events route.
+
+## [4.0.0](https://github.com/ngageoint/mage-server/releases/tag/v4.0.0) (02-03-2016)
+
+* Google oauth support
+
+* Standard Format Overlay has tile to retrieve implementation

package.json

@@ -1,6 +1,6 @@
 {
   "name": "MAGE",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "Geospatial situation awareness application",
   "keywords": [
     "NGA",
@@ -27,8 +27,8 @@
     "express": "4.10.6",
     "fs-extra": "0.11.x",
     "gm": "1.17.x",
-    "jade": "^1.11.0",
-    "json2csv": "^2.2.1",
+    "jade": "1.11.0",
+    "json2csv": "2.2.1",
     "json2csv-stream": "0.1.2",
     "jszip": "2.5.0",
     "method-override": "1.0.x",
@@ -40,13 +40,13 @@
     "optimist": "0.3.x",
     "passport": "0.1.x",
     "passport-anonymous": "1.0.1",
-    "passport-google-oauth": "^0.2.0",
+    "passport-google-oauth": "0.2.0",
     "passport-http-bearer": "0.2.x",
     "passport-local": "1.0.0",
     "request": "2.51.x",
     "terraformer": "1.0.4",
     "terraformer-arcgis-parser": "1.0.4",
-    "togeojson": "~0.3.0",
+    "togeojson": "0.3.0",
     "walk": "2.3.4",
     "winston": "1.0.1",
     "xmldom": "0.1.19",
@@ -80,5 +80,5 @@
   },
   "bundleDependencies": [],
   "private": true,
-  "main": "mage.js"
+  "main": "app.js"
 }

public/app/admin/events/event.html

@@ -55,15 +55,15 @@ <h2>
                 <div class="card-content">
                   <strong class="text-primary">Complete event</strong>
                   <p class="text-primary">Marking an event as complete will remove it as a selectable event.  The event is not destroyed and can be changed back to an active state at any time.</p>
-                  <button class="btn btn-primary top-gap" ng-click="completeEvent(event)"> <i class="fa fa-check-square-o"></i> Complete</button>
+                  <button class="btn btn-primary top-gap" ng-click="completeEvent(event)">Complete</button>
                 </div>
               </div>
 
               <div class="card" ng-if="event.complete">
                 <div class="card-content">
                   <strong class="text-primary">Activate event</strong>
                   <p class="text-primary">Marking an event as active will show it as a selectable event on clients.  At that point users can contribute observations and locations to the event.</p>
-                  <button class="btn btn-primary top-gap" ng-click="activateEvent(event)"> <i class="fa fa-minus-square-o"></i> Activate</button>
+                  <button class="btn btn-primary top-gap" ng-click="activateEvent(event)">Activate</button>
                 </div>
               </div>