Merge branch 'dev'

Author: cmbirk

.editorconfig

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

.env.example.php

@@ -0,0 +1,36 @@
+<?php
+
+return [
+    'APP_DEBUG'         => getenv('APP_DEBUG') ?: false,
+    'DB_DRIVER'         => 'mysql',
+    'DB_HOST'           => 'localhost',
+    'DB_DATABASE'       => 'madison',
+    'DB_USERNAME'       => 'homestead',
+    'DB_PASSWORD'       => 'secret',
+
+    'MAIL_DRIVER'       => 'smtp',
+    'MAIL_HOST'         => 'mailtrap.io',
+    'MAIL_PORT'         => '2525',
+    'MAIL_USERNAME'     => 'null',
+    'MAIL_PASSWORD'     => 'null',
+    'MAIL_FROM_ADDRESS' => 'user@mail.com',
+    'MAIL_FROM_NAME'    => 'user',
+
+    'ADMIN_EMAIL'       => 'admin@example.com',
+    'ADMIN_PASSWORD'    => 'secret',
+
+    'FB_CLIENT_ID'      => '',
+    'FB_CLIENT_SECRET'  => '',
+    'TW_CLIENT_ID'      => '',
+    'TW_CLIENT_SECRET'  => '',
+    'LI_CLIENT_ID'      => '',
+    'LI_CLIENT_SECRET'  => '',
+
+    //This is the uservoice javascript file hash in the UV uv.src embed code
+    //Used as such: uv.src = '//widget.uservoice.com/' + uservoiceHash + '.js';
+    'USERVOICE'         => '',
+
+    //Your Google Analytics account (eg. 'UA-00000000-0')
+    'GA'                => '',
+
+];

.gitignore

@@ -1,48 +1,31 @@
-VagrantConfig.json
+# Laravel
 bootstrap/compiled.php
-public/.sass-cache
+vendor/
+
+# Configuration
+app/config/local
+.env.*.php
+.env.php
+!.env.example.php
+
+# Assets
+node_modules
+.sass-cache
+public/.sas-cache
 public/sass/.sass-cache
 public/private/*
 public/bower_components/
-app/config/creds.php
-app/config/oauth_creds.php
-app/config/smtp.php
-app/config/remote.php
-app/config/socials.php
-app/config/local/
-composer.lock
-notified.yml
-/vendor/*
-node_modules/
+public/img/doc*
+
+# Vagrant
+VagrantConfig.json
+.vagrant/
+public/.htaccess
+
+# OS
 shared
+.settings/
 .DS_Store
 .buildpath
 .project
-.settings/
-.sass-cache
-.env*
 .tmp
-
-public/js/angular/directives-ck.js
-
-public/js/angular/controllers-ck.js
-
-public/js/angular/app-ck.js
-
-public/js/madison-ck.js
-
-public/sass/config.rb
-
-public/sass/ie.css
-
-public/sass/print.css
-
-public/sass/screen.css
-
-public/sass/style.css
-
-.vagrant/machines/default/virtualbox/id
-
-.vagrant/machines/default/virtualbox/action_set_name
-
-.vagrant/machines/default/virtualbox/action_provision

.jscsrc

@@ -0,0 +1,3 @@
+{
+    "preset": "jquery"
+}

.styleci.yml

@@ -0,0 +1,4 @@
+preset: psr2
+
+disabled:
+    - short_array_syntax