Merge pull request #31 from polonel/develop

Develop Merge for RC

.codacy.yml

@@ -0,0 +1,7 @@
+exclude_paths:
+  - apidocs/**
+  - mobile/**
+  - apidoc_template/**
+  - docs/**
+  - src/public/js/plugins/**
+  - test/**

.gitignore

@@ -47,3 +47,5 @@ private/
 /coverage/
 /plugins/
 config.local.json
+public/css/app.min.css
+public/css/app.css

.snyk

@@ -0,0 +1,51 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.7.1
+# ignores vulnerabilities until expiry date; change duration by modifying expiry date
+ignore:
+  'npm:ms:20170412':
+    - express-session > debug > ms:
+        reason: None given
+        expires: '2017-06-16T22:52:26.703Z'
+    - morgan > debug > ms:
+        reason: None given
+        expires: '2017-06-16T22:52:26.703Z'
+    - body-parser > debug > ms:
+        reason: None given
+        expires: '2017-06-16T22:52:26.703Z'
+    - mongoose > mquery > debug > ms:
+        reason: None given
+        expires: '2017-06-16T22:52:26.703Z'
+    - pm2 > pm2-axon > debug > ms:
+        reason: None given
+        expires: '2017-06-16T22:52:26.703Z'
+    - mongoose > ms:
+        reason: None given
+        expires: '2017-06-16T22:52:26.703Z'
+    - socket.io > socket.io-adapter > debug > ms:
+        reason: None given
+        expires: '2017-06-16T22:52:26.703Z'
+    - socket.io-client > debug > ms:
+        reason: None given
+        expires: '2017-06-16T22:52:26.704Z'
+    - socket.io > socket.io-client > debug > ms:
+        reason: None given
+        expires: '2017-06-16T22:52:26.704Z'
+    - socket.io-client > engine.io-client > debug > ms:
+        reason: None given
+        expires: '2017-06-16T22:52:26.704Z'
+    - socket.io > socket.io-client > engine.io-client > debug > ms:
+        reason: None given
+        expires: '2017-06-16T22:52:26.704Z'
+  'npm:shelljs:20140723':
+    - pm2 > shelljs:
+        reason: None given
+        expires: '2017-06-16T22:52:26.705Z'
+# patches apply the minimum changes required to fix a vulnerability
+patch:
+  'npm:marked:20170112':
+    - jsdoc > marked:
+        patched: '2017-05-17T22:49:53.552Z'
+    - marked:
+        patched: '2017-05-17T22:49:53.552Z'
+    - grunt-jsdoc > jsdoc > marked:
+        patched: '2017-05-17T22:49:53.552Z'

.travis.yml

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

.yarnclean

@@ -0,0 +1,38 @@
+# test directories
+__tests__
+test
+tests
+powered-test
+
+# asset directories
+docs
+doc
+website
+
+# examples
+example
+examples
+
+# code coverage directories
+coverage
+.nyc_output
+
+# build scripts
+Makefile
+Gulpfile.js
+Gruntfile.js
+
+# configs
+.tern-project
+.gitattributes
+.editorconfig
+.*ignore
+.eslintrc
+.jshintrc
+.flowconfig
+.documentup.json
+.yarn-metadata.json
+
+# misc
+*.gz
+*.md

CHANGELOG.md

@@ -1,13 +1,45 @@
 # Change Log
 
-## [0.1.8](https://github.com/polonel/trudesk/tree/HEAD)
+## [Unreleased](https://github.com/polonel/trudesk/tree/HEAD)
 
-[Full Changelog](https://github.com/polonel/trudesk/compare/0.1.7...HEAD)
+[Full Changelog](https://github.com/polonel/trudesk/compare/0.1.9...HEAD)
+
+**Fixed bugs:**
+
+- Cannot create a group in 1.8 [\#23](https://github.com/polonel/trudesk/issues/23)
+- Crash in MailCheck [\#9](https://github.com/polonel/trudesk/issues/9)
+
+**Closed issues:**
+
+- Confirm Delete on Groups [\#16](https://github.com/polonel/trudesk/issues/16)
+
+## [0.1.9](https://github.com/polonel/trudesk/tree/0.1.9) (2017-05-01)
+[Full Changelog](https://github.com/polonel/trudesk/compare/0.1.8...0.1.9)
+
+**Implemented enhancements:**
+
+- 404 Errors getting dumped to log file [\#22](https://github.com/polonel/trudesk/issues/22)
+
+**Fixed bugs:**
+
+- 404 Errors getting dumped to log file [\#22](https://github.com/polonel/trudesk/issues/22)
+- Able to delete your own account [\#21](https://github.com/polonel/trudesk/issues/21)
+- Default Administrators Group can be deleted [\#20](https://github.com/polonel/trudesk/issues/20)
+- Install Script for New Mongodb does not show restart [\#14](https://github.com/polonel/trudesk/issues/14)
+- User role can edit/add tags on tickets [\#12](https://github.com/polonel/trudesk/issues/12)
+
+## [0.1.8](https://github.com/polonel/trudesk/tree/0.1.8) (2017-03-07)
+[Full Changelog](https://github.com/polonel/trudesk/compare/0.1.7...0.1.8)
 
 **Fixed bugs:**
 
 - \*UNSTABLE\* - Unable to run install script [\#17](https://github.com/polonel/trudesk/issues/17)
 
+**Merged pull requests:**
+
+- Bug Fixes for 0.1.8 [\#19](https://github.com/polonel/trudesk/pull/19) ([polonel](https://github.com/polonel))
+- Release 0.1.8 Merge [\#18](https://github.com/polonel/trudesk/pull/18) ([polonel](https://github.com/polonel))
+
 ## [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)
 

README.md

@@ -4,7 +4,6 @@
 
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/7b3acb53c33b4a40bb32da109bbdd1a9)](https://www.codacy.com/app/polonel/trudesk?utm_source=github.com&utm_medium=referral&utm_content=polonel/trudesk&utm_campaign=badger)
 [![Build Status](https://travis-ci.org/polonel/trudesk.svg?branch=master)](https://travis-ci.org/polonel/trudesk)
-[![Coverage Status](https://coveralls.io/repos/polonel/trudesk/badge.svg?branch=master&service=github)](https://coveralls.io/github/polonel/trudesk?branch=develop)
 
 [http://trudesk.io](http://trudesk.io/)
 
@@ -23,6 +22,13 @@ Built on [Node.JS](http://nodejs.org) and [MongoDB](http://www.mongodb.org).
 3. Start the server: ```npm start```
 4. Navigate to: ```http://localhost:8118```
 
+#### Ubuntu 16.04 Install Script
+```curl -L -s http://www.trudesk.io/install/install_ubuntu.sh | sudo bash```
+
+#### Trudesk Virtual Appliance
+The Trudesk Virtual Appliance can quickly deploy to both Virtual Box as well as VMWare. Visit the appliance documentation for more information.
+[Trudesk Virtual Appliance Documentation](http://www.trudesk.io/docs/install_virtual_appliance.html)
+
 ### Documentation
 To view the online documentation: [http://www.trudesk.io/docs](http://www.trudesk.io/docs)
 

app.js

@@ -9,13 +9,14 @@
  ========================================================================
  **/
 
-var async   = require('async'),
-    path    = require('path'),
-    fs      = require('fs'),
-    winston = require('winston'),
-    nconf = require('nconf'),
-    pkg     = require('./package.json'),
-    ws = require('./src/webserver');
+var _           = require('underscore'),
+    async       = require('async'),
+    path        = require('path'),
+    fs          = require('fs'),
+    winston     = require('winston'),
+    nconf       = require('nconf'),
+    pkg         = require('./package.json'),
+    ws          = require('./src/webserver');
     //`var memory = require('./src/memory');
 
 
@@ -178,28 +179,32 @@ function dbCallback(err, db) {
         async.series([
             function(next) {
                 require('./src/socketserver')(ws);
-                next();
-            },
-            function(next) {
-                //Start Mailer
-                var mailQueue = require('./src/mailer');
-                mailQueue.queue();
-                next();
+                return next();
             },
             function(next) {
                 //Start Check Mail
-                var mailerEnabled = nconf.get('mailer:enable');
-                if (mailerEnabled) {
-                    var mailCheck = require('./src/mailer/mailCheck');
-                    mailCheck.init();
-                }
+                var settingSchema = require('./src/models/setting');
+                settingSchema.getSettings(function(err, settings) {
+                   if (err) {
+                       winston.warn(err);
+                       return next();
+                   }
+
+                    var mailerCheckEnabled = _.find(settings, function(x) { return x.name === 'mailer:check:enable' });
+                    mailerCheckEnabled = (mailerCheckEnabled === undefined) ? {value: false} : mailerCheckEnabled;
+                    if (mailerCheckEnabled.value) {
+                        var mailCheck = require('./src/mailer/mailCheck');
+                        winston.debug('Starting MailCheck...');
+                        mailCheck.init(settings);
+                    }
 
-                next();
+                    return next();
+                });
             },
             function(next) {
                 //Start Task Runners
                 require('./src/taskrunner');
-                next();
+                return next();
             },
             function(next) {
                 //var pm2 = require('pm2');

gruntfile.js

@@ -17,12 +17,12 @@ module.exports = function(grunt) {
         },
 
         watch: {
-            sass: {
-                files: [
-                    'src/sass/**/*.sass'
-                ],
-                tasks: ['sass', 'cssmin']
-            },
+            // sass: {
+            //     files: [
+            //         'src/sass/**/*.sass'
+            //     ],
+            //     tasks: ['sass', 'cssmin']
+            // },
             web: {
                 files: [
                     '*.js',
@@ -52,10 +52,11 @@ module.exports = function(grunt) {
                     stream: true
                 },
                 tasks: [
+                    // {
+                    //     grunt: true,
+                    //     args: ['watch:sass']
+                    // },
                     {
-                        grunt: true,
-                        args: ['watch:sass']
-                    }, {
                         grunt: true,
                         args: ['watch:web']
                     }, {
@@ -105,20 +106,12 @@ module.exports = function(grunt) {
             minify: {
                 expand: true,
                 cwd: 'public/css/',
-                src: ['*.css', '!*.min.css'],
+                src: ['*.css', '!app.min.css', '!*.min.css'],
                 dest: 'public/css/',
                 ext: '.min.css'
             }
         },
 
-        sass: {
-            dist: {
-                files: {
-                    'public/css/app.css': 'src/sass/app.sass'
-                }
-            }
-        },
-
         apidoc: {
             trudesk: {
                 src: 'src/controllers/api/',
@@ -188,12 +181,11 @@ module.exports = function(grunt) {
         }
     });
 
-    grunt.registerTask('buildcss', ['sass', 'cssmin']);
+    grunt.registerTask('buildcss', ['cssmin']);
     grunt.registerTask('builddocs', ['jsdoc', 'apidoc']);
     grunt.registerTask('watchdocs', ['parallel:docs']);
     grunt.registerTask('server', 'launch webserver and watch tasks', ['parallel:web']);
     grunt.registerTask('build', ['builddocs', 'uglify:uikit', 'shell:webpackDist', 'buildcss']);
     grunt.registerTask('devbuild', ['shell:webpackDev']);
-    grunt.registerTask('changelog', ['conventionalChangelog']);
     grunt.registerTask('default', ['server']);
 };

mobile/config.xml

@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='utf-8'?>
+<widget id="io.trudesk.app" version="0.1.10" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+    <feature name="Camera">
+        <param name="browser-package" value="Camera" />
+    </feature>
+    <feature name="Device">
+        <param name="browser-package" value="Device" />
+    </feature>
+    <name>Trudesk</name>
+    <description>
+        Trudesk: Help Desk Solution
+    </description>
+    <author email="[email protected]" href="http://www.trudesk.io/">
+      Chris Brame
+    </author>
+    <content src="index.html" />
+    <access origin="*" />
+    <preference name="webviewbounce" value="false" />
+    <preference name="UIWebViewBounce" value="false" />
+    <preference name="DisallowOverscroll" value="true" />
+    <preference name="android-minSdkVersion" value="21" />
+    <preference name="BackupWebStorage" value="none" />
+    <preference name="SplashScreen" value="screen" />
+    <preference name="SplashScreenDelay" value="3000" />
+    <preference name="SplashShowOnlyFirstTime" value="false" />
+</widget>