Merge branch 'master' into open1182

README.md

@@ -17,6 +17,7 @@ Differences between the two APIs include a move away from a declarative system o
 ## Building and Running Open MCT Locally
 
 Building and running Open MCT in your local dev environment is very easy. Be sure you have [Git](https://git-scm.com/downloads) and [Node.js](https://nodejs.org/) installed, then follow the directions below. Need additional information? Check out the [Getting Started](https://nasa.github.io/openmct/getting-started/) page on our website.
+(These instructions assume you are installing as a non-root user; developers have [reported issues](https://github.com/nasa/openmct/issues/1151) running these steps with root privileges.)
 
 1. Clone the source code
 

app.js

@@ -67,14 +67,10 @@
     });
 
     app.use('/proxyUrl', function proxyRequest(req, res, next) {
-        var targetUrl = req.query.url;
-        var queryParameters = req.query;
-        console.log('Proxying request to: ', targetUrl);
-        delete queryParameters['url'];
+        console.log('Proxying request to: ', req.query.url);
         req.pipe(request({
-            url: targetUrl,
-            strictSSL: false,
-            qs: queryParameters
+            url: req.query.url,
+            strictSSL: false
         }).on('error', next)).pipe(res);
     });
 

bower.json

@@ -13,7 +13,7 @@
     "moment-duration-format": "^1.3.0",
     "requirejs": "~2.1.22",
     "text": "requirejs-text#^2.0.14",
-    "es6-promise": "^3.0.2",
+    "es6-promise": "^3.3.0",
     "screenfull": "^3.0.0",
     "node-uuid": "^1.4.7",
     "comma-separated-values": "^3.6.4",

docs/src/guide/index.md

@@ -933,7 +933,7 @@ Note that `templateUrl` is not supported for `containers`.
 
 Controls provide options for the `mct-control` directive. 
  
-Six standard control types are included in the forms bundle:
+Ten standard control types are included in the forms bundle:
 
 * `textfield`: An area to enter plain text.
 * `select`: A drop-down list of options.
@@ -941,7 +941,13 @@ Six standard control types are included in the forms bundle:
 * `color`: A color picker.
 * `button`: A button.
 * `datetime`: An input for UTC date/time entry; gives result as a UNIX 
-timestamp, in milliseconds since start of 1970, UTC. 
+timestamp, in milliseconds since start of 1970, UTC.
+* `composite`: A control parenting an array of other controls.
+* `menu-button`: A drop-down list of items supporting custom behavior
+on click.
+* `dialog-button`: A button which opens a dialog allowing a single property
+to be edited.
+* `radio`: A radio button.
 
 New controls may be added as extensions of the controls category. Extensions of 
 this category have two properties: 

gulpfile.js

@@ -103,11 +103,6 @@ gulp.task('stylesheets', function () {
         .pipe(gulp.dest(__dirname));
 });
 
-gulp.task('nsp', function (done) {
-    var nsp = require('gulp-nsp');
-    nsp({package: __dirname + '/package.json'}, done);
-});
-
 gulp.task('lint', function () {
     var nonspecs = paths.specs.map(function (glob) {
             return "!" + glob;
@@ -157,6 +152,6 @@ gulp.task('develop', ['serve', 'stylesheets', 'watch']);
 
 gulp.task('install', [ 'static', 'scripts' ]);
 
-gulp.task('verify', [ 'lint', 'test', 'checkstyle', 'nsp' ]);
+gulp.task('verify', [ 'lint', 'test', 'checkstyle' ]);
 
 gulp.task('build', [ 'verify', 'install' ]);

main.js

@@ -27,8 +27,8 @@ requirejs.config({
         "angular": "bower_components/angular/angular.min",
         "angular-route": "bower_components/angular-route/angular-route.min",
         "csv": "bower_components/comma-separated-values/csv.min",
-        "es6-promise": "bower_components/es6-promise/promise.min",
         "EventEmitter": "bower_components/eventemitter3/index",
+        "es6-promise": "bower_components/es6-promise/es6-promise.min",
         "html2canvas": "bower_components/html2canvas/build/html2canvas.min",
         "jsPDF": "bower_components/jspdf/dist/jspdf.min",
         "moment": "bower_components/moment/moment",

package.json

@@ -15,7 +15,6 @@
     "gulp-jscs": "^3.0.2",
     "gulp-jshint": "^2.0.0",
     "gulp-jshint-html-reporter": "^0.1.3",
-    "gulp-nsp": "^2.4.2",
     "gulp-rename": "^1.2.2",
     "gulp-replace-task": "^0.11.0",
     "gulp-requirejs-optimize": "^0.3.1",

test-main.js

@@ -53,8 +53,8 @@ requirejs.config({
         "angular": "bower_components/angular/angular.min",
         "angular-route": "bower_components/angular-route/angular-route.min",
         "csv": "bower_components/comma-separated-values/csv.min",
-        "es6-promise": "bower_components/es6-promise/promise.min",
         "EventEmitter": "bower_components/eventemitter3/index",
+        "es6-promise": "bower_components/es6-promise/es6-promise.min",
         "html2canvas": "bower_components/html2canvas/build/html2canvas.min",
         "jsPDF": "bower_components/jspdf/dist/jspdf.min",
         "moment": "bower_components/moment/moment",