You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@senssoft.apache.org by rf...@apache.org on 2017/09/08 00:13:39 UTC

[5/7] incubator-senssoft-useralejs git commit: Merge branch 'master' into SENSSOFT-192

Merge branch 'master' into SENSSOFT-192


Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-useralejs/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-useralejs/commit/93e75618
Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-useralejs/tree/93e75618
Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-useralejs/diff/93e75618

Branch: refs/heads/SENSSOFT-192
Commit: 93e75618e7bd4b01d71c15b57e3b112b61103d0f
Parents: 961091d d68bb04
Author: Rob Foley <rg...@users.noreply.github.com>
Authored: Thu Sep 7 19:41:12 2017 -0400
Committer: Rob Foley <rg...@users.noreply.github.com>
Committed: Thu Sep 7 19:41:12 2017 -0400

----------------------------------------------------------------------
 .gitignore          |  1 +
 CHANGELOG.md        | 36 +++++++++++++++++++++++++++---
 DISCLAIMER          |  7 ++++++
 NOTICE              |  2 +-
 README.md           | 28 ++++++++++++++----------
 doap-userale.js.rdf | 57 ++++++++++++++++++++++++++++++++++++++++++++++++
 gulpfile.js         |  1 -
 package.json        |  4 ++--
 8 files changed, 118 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-senssoft-useralejs/blob/93e75618/gulpfile.js
----------------------------------------------------------------------
diff --cc gulpfile.js
index ebe5dab,0bfb454..9d2b730
--- a/gulpfile.js
+++ b/gulpfile.js
@@@ -24,15 -24,9 +24,14 @@@ var uglify = require('gulp-uglify')
  var rename = require('gulp-rename');
  var mocha = require('gulp-mocha');
  var babel = require('babel-register');
 -
 +var jsonModify = require('gulp-json-modify');
 +var filter = require('gulp-filter');
 +var uglifyHarmony = require('uglify-js-harmony');
 +var minifier = require('gulp-uglify/minifier');
 +var replace = require('gulp-replace');
- 
  var version = require('./package.json').version;
  var userale = 'userale-' + version;
 +var userAleWebExtDirName = 'UserAleWebExtension';
  
  // Clean build directory
  gulp.task('clean', function() {

http://git-wip-us.apache.org/repos/asf/incubator-senssoft-useralejs/blob/93e75618/package.json
----------------------------------------------------------------------