Merge pull request #18 from polonel/develop

Release 0.1.8 Merge

.eslintrc.json

@@ -0,0 +1,22 @@
+{
+  "plugins": ["node"],
+  "extends": ["eslint:recommended", "plugin:node/recommended"],
+  "root": true,
+  "env": {
+    "browser": true,
+    "node": true
+  },
+  "rules": {
+    "node/exports-style": ["error", "module.exports"],
+    "no-console": "off"
+  },
+  "globals": {
+    "angular": 1,
+    "define": 1,
+    "requirejs": 1,
+    "MG": 1,
+    "Snackbar": 1,
+    "ROLES": 1,
+    "io": 1
+  }
+}

.gitignore

@@ -31,17 +31,18 @@ node_modules
 #custom
 config.json
 import.csv
-src/mailer/templates/promo/
+/src/mailer/templates/promo/
 *.pem
-public/uploads/tickets/
-public/uploads/users/
+/public/uploads/tickets/
+/public/uploads/users/
 coverage.html
 *.bk
 apidocs
-docs
-public/js/*
-public/css/app.css.map
+/docs/*.html
+/public/js/
+app.css.map
 *.diff
 private/
 .sass-cache/
-coverage/
+/coverage/
+/plugins/

.npmrc

@@ -0,0 +1 @@
+save-exact = true

.travis.yml

@@ -3,8 +3,8 @@ language: node_js
 env:
   - CXX=g++-4.8
 node_js:
-  - 4
   - 6
+  - 7
 services:
   - mongodb
 addons:

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## [0.1.8](https://github.com/polonel/trudesk/tree/HEAD)
+
+[Full Changelog](https://github.com/polonel/trudesk/compare/0.1.7...HEAD)
+
+**Fixed bugs:**
+
+- \*UNSTABLE\* - Unable to run install script [\#17](https://github.com/polonel/trudesk/issues/17)
+
 ## [0.1.7](https://github.com/polonel/trudesk/tree/0.1.7) (2016-10-22)
 [Full Changelog](https://github.com/polonel/trudesk/compare/0.1.6...0.1.7)
 
@@ -30,4 +38,7 @@
 ## [0.1.3](https://github.com/polonel/trudesk/tree/0.1.3) (2015-10-28)
 [Full Changelog](https://github.com/polonel/trudesk/compare/0.1.2...0.1.3)
 
-## [0.1.2](https://github.com/polonel/trudesk/tree/0.1.2) (2015-08-24)
+## [0.1.2](https://github.com/polonel/trudesk/tree/0.1.2) (2015-08-24)
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright 2014-2016 Chris Brame
+Copyright 2014-2017 Chris Brame
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

README.md

@@ -41,7 +41,7 @@ if you like what you see here, and want to help support the work being done, you
 
 ### License
 
-    Copyright 2014-2016 Chris Brame
+    Copyright 2014-2017 Chris Brame
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

app.js

@@ -16,6 +16,7 @@ var async   = require('async'),
     nconf = require('nconf'),
     pkg     = require('./package.json'),
     ws = require('./src/webserver');
+    //var memory = require('./src/memory');
 
 
 global.forks = [];
@@ -64,7 +65,7 @@ if (!process.env.FORK) {
     winston.info('  888 .  888      888   888  888   888  888    .o o.  )88b  888 `88b.');
     winston.info('  "888" d888b     `V88V"V8P\' `Y8bod88P" `Y8bod8P\' 8""888P\' o888o o888o');
     winston.info('==========================================================================');
-    winston.info('TruDesk v' + pkg.version + ' Copyright (C) 2014-2016 Chris Brame');
+    winston.info('TruDesk v' + pkg.version + ' Copyright (C) 2014-2017 Chris Brame');
     winston.info('');
     winston.info('Running in: ' + global.env);
     winston.info('Time: ' + new Date());
@@ -82,14 +83,7 @@ if (process.env.HEROKU) {
     //Build Config for Heroku
     var configHeroku = {
         "url": "http://localhost:8118",
-        "port": "8118",
-        "mailer": {
-            "enable": false,
-
-            "check": {
-                "enable": false
-            }
-        }
+        "port": "8118"
     };
 
     winston.info('Creating heroku config file...');
@@ -104,7 +98,6 @@ if (process.env.HEROKU) {
 }
 
 if (nconf.get('install') || !configExists && !process.env.HEROKU) {
-    var ws = require('./src/webserver');
     ws.installServer(function() {
         return winston.info('Trudesk Install Server Running...');
     });
@@ -118,8 +111,6 @@ if (!nconf.get('setup') && !nconf.get('install') && !nconf.get('upgrade') && !nc
     setup();
 } else if (nconf.get('upgrade')) {
     //upgrade();
-} else if (nconf.get('reset')) {
-    reset();
 }
 
 function loadConfig() {
@@ -252,8 +243,8 @@ function dbCallback(err, db) {
 
                 n.on('message', function(data) {
                     if (data.cache) {
-                        var nodeCache = require('./src/cache/node-cache');
-                        global.cache = new nodeCache({
+                        var NodeCache = require('./src/cache/node-cache');
+                        global.cache = new NodeCache({
                             data: data.cache.data,
                             checkperiod: 0
                         });

docs/jaguarjs-jsdoc/conf.json

@@ -2,7 +2,7 @@
 	"tags": {
 		"allowUnknownTags" : true
 	},
-	"plugins": ["plugins/markdown"],
+	"plugins": ["node_modules/jsdoc/plugins/markdown"],
 	"templates": {
 		"cleverLinks": true,
 		"monospaceLinks": true,