From f0064fd91ff7928445fdaa6856b83ca671367bf5 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Mon, 29 Aug 2016 10:58:02 -0700 Subject: [PATCH 1/5] [README] Warn about root installation issues Mitigates #1151. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index cce52a99218..3bdb9835d22 100644 --- a/README.md +++ b/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 From 37cf56a2b3233fe617115dd5b0c76e42537eaa2c Mon Sep 17 00:00:00 2001 From: Alex M Date: Tue, 13 Sep 2016 00:53:50 +0300 Subject: [PATCH 2/5] [Documentation] Add extra controls --- docs/src/guide/index.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/src/guide/index.md b/docs/src/guide/index.md index 308ca6d2c15..1d8a4222990 100644 --- a/docs/src/guide/index.md +++ b/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: From d490693bad9deebfca6a1e8922b9c093e0d8d5f8 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Tue, 13 Sep 2016 10:33:32 -0700 Subject: [PATCH 3/5] [Build] Update to es6-promise 3.3.0 ...including changes to filename associated with that version. Fixes #1183 --- bower.json | 2 +- main.js | 2 +- test-main.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bower.json b/bower.json index 670cbd4b70c..922eb905f34 100644 --- a/bower.json +++ b/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", diff --git a/main.js b/main.js index 58ea2b1756e..3fc2c4da36c 100644 --- a/main.js +++ b/main.js @@ -27,7 +27,7 @@ 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", + "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", diff --git a/test-main.js b/test-main.js index 0e28eb56619..43142766b9b 100644 --- a/test-main.js +++ b/test-main.js @@ -53,7 +53,7 @@ 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", + "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", From c1afc34cfcd7a2753f9e70b9432e773d49577e50 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Wed, 14 Sep 2016 10:16:33 -0700 Subject: [PATCH 4/5] Revert "[Build] Check dependencies for vulnerabilities" --- gulpfile.js | 7 +------ package.json | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index bf522248635..ff994c6a2c0 100644 --- a/gulpfile.js +++ b/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' ]); diff --git a/package.json b/package.json index 5563f65c82a..555375007ea 100644 --- a/package.json +++ b/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", From 49d2d5500fb6668ddafe49792b552c8873248a85 Mon Sep 17 00:00:00 2001 From: Pete Richards Date: Thu, 15 Sep 2016 09:37:11 -0700 Subject: [PATCH 5/5] Revert "[proxyUrl] pass URL parameters to proxied URL" --- app.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/app.js b/app.js index 20429a3a5f4..6b7b1bb6350 100644 --- a/app.js +++ b/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); });