Merge branch 'develop'

.gitignore

@@ -33,3 +33,12 @@ node_modules
 config.json
 import.csv
 src/mailer/templates/promo/
+*.pem
+public/uploads/tickets/
+public/uploads/users/
+coverage.html
+*.bk
+apidocs
+docs
+public/js/*
+public/css/app.css.map

.travis.yml

@@ -0,0 +1,19 @@
+sudo: false
+language: node_js
+node_js:
+  - "0.10"
+  - "0.12"
+services:
+  - mongodb
+
+before_install:
+  - npm install -g grunt
+  - npm install -g grunt-cli
+  - gem install sass
+
+script:
+  - npm test
+  - npm run build
+
+after_success:
+  - ./node_modules/.bin/mocha --recursive --require blanket -R mocha-lcov-reporter | ./node_modules/coveralls/bin/coveralls.js

README.md

@@ -1,7 +1,54 @@
-TruDesk
-=======
+[![Trudesk](http://trudesk.io/TD_Black.png)](http://trudesk.io/)
+
+<br/><br/>
+
+[![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/)
 
-TruDesk is an open source help desk solution.
+TruDesk is an open source help desk solution stil in active development. 
+
+Built on [Node.JS](http://nodejs.org) and [MongoDB](http://www.mongodb.org).
+
+###Requirements
++ Node.JS v0.10 or later
++ MongoDB 2.6 or later
+
+###Install & Run
+1. Clone the repo using: ```git clone http://www.github.com/polonel/trudesk```
+2. Install dependencies: ```npm install```
+3. Run the install script: ```./trudesk setup```
+4. Start the server: ```npm start```
+5. Navigate to: ```http://localhost:8118```
+
+###Documentation
+To build the documentation run ```grunt builddocs```.
+
+The documentation after build is located in:
+- ```{repo folder}/docs``` 
+- ```{repo folder}/apidocs```
+
+###Help
+if you like what you see here, and want to help support the work being done, you could:
+
++ Contribute code, issues and pull requests
++ Spread the word about trudesk
++ [![alt tag](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=USPWFP6P6RTKC) Or you can buy me a cup of cofee or even dinner :)
+
+
+
+###License
+Copyright 2015 Chris Brame
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
 
-*More information soon!*
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

apidoc.json

@@ -0,0 +1,6 @@
+{
+  "name": "Trudesk",
+  "version": "0.1.0",
+  "description": "Trudesk - Help Desk Solution",
+  "title": "Trudesk - API Documentation"
+}

app.js

@@ -1,4 +1,4 @@
-/**
+/*
       .                              .o8                     oooo
    .o8                             "888                     `888
  .o888oo oooo d8b oooo  oooo   .oooo888   .ooooo.   .oooo.o  888  oooo
@@ -7,9 +7,6 @@
    888 .  888      888   888  888   888  888    .o o.  )88b  888 `88b.
    "888" d888b     `V88V"V8P' `Y8bod88P" `Y8bod8P' 8""888P' o888o o888o
  ========================================================================
- Created:    02/10/2015
- Author:     Chris Brame
-
  **/
 
 var async   = require('async'),
@@ -68,9 +65,34 @@ if (nconf.get('config')) {
 }
 configExists = fs.existsSync(configFile);
 
+if (process.env.HEROKU) {
+    //Build Config for Heroku
+    var configHeroku = {
+        "url": "http://localhost:8118",
+        "port": "8118",
+        "mailer": {
+            "enable": false,
+
+            "check": {
+                "enable": false
+            }
+        }
+    };
+
+    winston.info('Creating heroku config file...');
+    var config = JSON.stringify(configHeroku, null, 4);
+
+    if (configExists)
+        fs.unlinkSync(configFile);
+
+    fs.writeFileSync(configFile, config);
+
+    start();
+}
+
 if (!nconf.get('setup') && !nconf.get('install') && !nconf.get('upgrade') && !nconf.get('reset') && configExists) {
     start();
-} else if (nconf.get('setup') || nconf.get('install') || !configExists) {
+} else if (nconf.get('setup') || nconf.get('install') || !configExists && !process.env.HEROKU) {
     setup();
 } else if (nconf.get('upgrade')) {
     //upgrade();
@@ -154,8 +176,12 @@ function dbCallback(err, db) {
             },
             function(next) {
                 //Start Check Mail
-                var mailCheck = require('./src/mailer/mailCheck');
-                mailCheck.init();
+                var mailerEnabled = nconf.get('mailer:enable');
+                if (mailerEnabled) {
+                    var mailCheck = require('./src/mailer/mailCheck');
+                    mailCheck.init();
+                }
+
                 next();
             },
             function(next) {
@@ -167,4 +193,4 @@ function dbCallback(err, db) {
             winston.info("TruDesk Ready");
         });
     });
-}
+}