Merge branch 'release-0.8.0'

.editorconfig

@@ -0,0 +1,15 @@
+root = true
+
+[*.js]
+indent_style = tab
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*]
+insert_final_newline = true
+
+[{package.json,*.yml}]
+indent_style = space
+indent_size = 2

.eslintrc.json

@@ -1,17 +1,21 @@
 {
-  "extends": "airbnb",
-  "rules": {
-    "comma-dangle": 0,
-    "max-len": 0,
-    "no-console": 0,
-    "no-param-reassign": 0,
-    "no-shadow": 0,
-    "consistent-return": 0,
-    "func-names": 0
-  },
-  "env": {
-    "browser": true,
-    "node": true,
-    "jquery": true
-  }
+	"extends": "airbnb",
+	"rules": {
+		"comma-dangle": 0,
+		"max-len": 0,
+		"no-console": 0,
+		"no-param-reassign": 0,
+		"no-shadow": 0,
+		"consistent-return": 0,
+		"func-names": 0,
+		"indent": ["error", "tab", { "SwitchCase": 1 }],
+		"strict": 0,
+		"guard-for-in": "warn",
+		"no-restricted-syntax": ["warn", "ForInStatement"]
+	},
+	"env": {
+		"browser": true,
+		"node": true,
+		"jquery": true
+	}
 }

.gitignore

@@ -12,6 +12,7 @@ webconfig.js
 webserver/public/lib/js/webconfig.js
 pidfile
 log.txt
+config.hjson
 
 # IDE files
 .idea

.travis.yml

@@ -1,10 +1,9 @@
 language: node_js
 
 node_js:
+- '6'
 - '5'
-- '5.1'
 - '4'
-- '4.1'
 
 env:
   - CXX=g++-4.8

README.md

@@ -1,4 +1,4 @@
-# mqp-server [![Version npm](https://img.shields.io/npm/v/mqp-server.svg?style=flat-square)](https://www.npmjs.com/package/mqp-server) [![npm Downloads](https://img.shields.io/npm/dm/mqp-server.svg?style=flat-square)](https://www.npmjs.com/package/mqp-server) [![Build Status](https://img.shields.io/travis/musiqpad/mqp-server/master.svg?style=flat-square)](https://travis-ci.org/musiqpad/mqp-server)
+# mqp-server [![Version npm](https://img.shields.io/npm/v/mqp-server.svg?style=flat-square)](https://www.npmjs.com/package/mqp-server) [![npm Downloads](https://img.shields.io/npm/dm/mqp-server.svg?style=flat-square)](https://www.npmjs.com/package/mqp-server) [![Build Status](https://img.shields.io/travis/musiqpad/mqp-server/master.svg?style=flat-square)](https://travis-ci.org/musiqpad/mqp-server) [![devDependency Status](https://david-dm.org/musiqpad/mqp-server/dev-status.svg?style=flat-square)](https://david-dm.org/musiqpad/mqp-server#info=devDependencies)
 
 [![NPM](https://nodei.co/npm/mqp-server.png)](https://npmjs.org/package/mqp-server)
 
@@ -17,9 +17,10 @@ The base for creating a self-hosted pad.
 2. Download the [latest stable version](https://github.com/musiqpad/mqp-server/releases/latest)
 3. Unzip it in the location you want to install
 4. Open a terminal and `npm install --production` it
-5. Copy the `serverconfig.example.js` to create the file `serverconfig.js`
-6. Start the server by running `npm start`
-7. If everything went well, there should be no error messages.
+5. Start the server by running `npm start`
+6. If everything went well, there should be no error messages!
+
+To change the settings, edit the config.hjson file!
 
 If you want to start musiqpad using an application manager like forever, start the app.js file. To see server logs, run `npm run log` You can also download the latest pre-release [here](https://github.com/musiqpad/mqp-server/releases) (rc = release candidate, exp = experimental)
 
@@ -57,7 +58,8 @@ Params:
             debug: false,
             stream: false
         }
-    }
+    },
+    config: fs.readFileSync('config.hjson'), // example config: config.example.hjson
 }
 ```