Merge branch '0.4.0'

Releasing MEAN.JS 0.4.0 version on-top of previously MEAN.JS 0.3.3 on master branch

Author: lirantal

.bowerrc

@@ -1,3 +1,3 @@
 {
-	"directory": "public/lib"
+  "directory": "public/lib"
 }

.csslintrc

@@ -1,15 +1,15 @@
 {
-	"adjoining-classes": false,
-	"box-model": false,
-	"box-sizing": false,
-	"floats": false,
-	"font-sizes": false,
-	"important": false,
-	"known-properties": false,
-	"overqualified-elements": false,
-	"qualified-headings": false,
-	"regex-selectors": false,
-	"unique-headings": false,
-	"universal-selector": false,
-	"unqualified-attributes": false
+  "adjoining-classes": false,
+  "box-model": false,
+  "box-sizing": false,
+  "floats": false,
+  "font-sizes": false,
+  "important": false,
+  "known-properties": false,
+  "overqualified-elements": false,
+  "qualified-headings": false,
+  "regex-selectors": false,
+  "unique-headings": false,
+  "universal-selector": false,
+  "unqualified-attributes": false
 }

.editorconfig

@@ -1,25 +1,43 @@
 # EditorConfig is awesome: http://EditorConfig.org
 
-# How-to with your editor: http://editorconfig.org/#download
+# Howto with your editor: http://editorconfig.org/#download
+#   Sublime: https://github.com/sindresorhus/editorconfig-sublime
 
 # top-most EditorConfig file
 root = true
 
 # Unix-style newlines with a newline ending every file
-[*]
+[**]
 end_of_line = lf
-indent_style = tab
 insert_final_newline = true
 
-[{Dockerfile,Procfile}]
-trim_trailing_whitespace = true
-
-# Standard at: https://github.com/felixge/node-style-guide
-[{*.js,*.json}]
+# Standard at: https://github.com/felixge/node-style-guide 
+[**.js, **.json]
 trim_trailing_whitespace = true
+indent_style = space
+indent_size = 2
 quote_type = single
 curly_bracket_next_line = false
 spaces_around_operators = true
 space_after_control_statements = true
-space_after_anonymous_functions = false
+space_after_anonymous_functions = true
 spaces_in_brackets = false
+
+# No Standard.  Please document a standard if different from .js
+[**.yml, **.html, **.css]
+trim_trailing_whitespace = true
+indent_style = tab
+
+# No standard.  Please document a standard if different from .js
+[**.md]
+indent_style = tab
+
+# Standard at: 
+[Makefile]
+indent_style = tab
+
+# The indentation in package.json will always need to be 2 spaces
+# https://github.com/npm/npm/issues/4718
+[package.json, bower.json]
+indent_style = space
+indent_size = 2

.gitignore

@@ -1,27 +1,45 @@
-# iOS / Apple
+# OS
 # ===========
 .DS_Store
 ehthumbs.db
 Icon?
 Thumbs.db
-config/env/local.js
 
 # Node and related ecosystem
 # ==========================
 .nodemonignore
 .sass-cache/
-npm-debug.log
 node_modules/
 public/lib/
 app/tests/coverage/
 .bower-*/
 .idea/
+coverage/
 
 # MEAN.js app and assets
 # ======================
-config/sslcerts/*.pem
-access.log
 public/dist/
+uploads
+modules/users/client/img/profile/uploads
+config/env/local.js
+*.pem
+
+# Ignoring MEAN.JS's gh-pages branch for documenation
+_site/
+
+# General
+# =======
+*.log
+*.csv
+*.dat
+*.out
+*.pid
+*.gz
+*.tmp
+*.bak
+*.swp
+logs/
+build/
 
 # Sublime editor
 # ==============
@@ -48,16 +66,9 @@ local.properties
 data/
 mongod
 
-# General
-# =======
-*.log
-*.csv
-*.dat
-*.out
-*.pid
-*.gz
-*.tmp
-*.bak
-*.swp
-logs/
-build/
+# Visual Studio
+# =========
+*.suo
+*.ntvs*
+*.njsproj
+*.sln

.jshintrc

@@ -1,42 +1,36 @@
 {
-	"node": true, // Enable globals available when code is running inside of the NodeJS runtime environment.
-	"browser": true, // Standard browser globals e.g. `window`, `document`.
-	"esnext": true, // Allow ES.next specific features such as `const` and `let`.
-	"bitwise": false, // Prohibit bitwise operators (&, |, ^, etc.).
-	"camelcase": false, // Permit only camelcase for `var` and `object indexes`.
-	"curly": false, // Require {} for every new block or scope.
-	"eqeqeq": true, // Require triple equals i.e. `===`.
-	"immed": true, // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
-	"latedef": true, // Prohibit variable use before definition.
-	"newcap": true, // Require capitalization of all constructor functions e.g. `new F()`.
-	"noarg": true, // Prohibit use of `arguments.caller` and `arguments.callee`.
-	"quotmark": "single", // Define quotes to string values.
-	"regexp": true, // Prohibit `.` and `[^...]` in regular expressions.
-	"undef": true, // Require all non-global variables be declared before they are used.
-	"unused": false, // Warn unused variables.
-	"strict": true, // Require `use strict` pragma in every file.
-	"trailing": true, // Prohibit trailing whitespaces.
-	"smarttabs": false, // Suppresses warnings about mixed tabs and spaces
-	"globals": { // Globals variables.
-		"jasmine": true,
-		"angular": true,
-		"ApplicationConfiguration": true
-	},
-	"predef": [ // Extra globals.
-		"define",
-		"require",
-		"exports",
-		"module",
-		"describe",
-		"before",
-		"beforeEach",
-		"after",
-		"afterEach",
-		"it",
-		"inject",
-		"expect"
-	],
-	"indent": 4, // Specify indentation spacing
-	"devel": true, // Allow development statements e.g. `console.log();`.
-	"noempty": true // Prohibit use of empty blocks.
-}
+  "node": true, // Enable globals available when code is running inside of the NodeJS runtime environment.
+  "mocha": true, // Enable globals available when code is running inside of the Mocha tests.
+  "jasmine": true, // Enable globals available when code is running inside of the Jasmine tests.
+  "browser": true, // Standard browser globals e.g. `window`, `document`.
+  "esnext": true, // Allow ES.next specific features such as `const` and `let`.
+  "bitwise": false, // Prohibit bitwise operators (&, |, ^, etc.).
+  "camelcase": false, // Permit only camelcase for `var` and `object indexes`.
+  "curly": false, // Require {} for every new block or scope.
+  "eqeqeq": true, // Require triple equals i.e. `===`.
+  "immed": true, // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
+  "latedef": true, // Prohibit variable use before definition.
+  "newcap": true, // Require capitalization of all constructor functions e.g. `new F()`.
+  "noarg": true, // Prohibit use of `arguments.caller` and `arguments.callee`.
+  "quotmark": "single", // Define quotes to string values.
+  "regexp": true, // Prohibit `.` and `[^...]` in regular expressions.
+  "undef": true, // Require all non-global variables be declared before they are used.
+  "unused": false, // Warn unused variables.
+  "strict": true, // Require `use strict` pragma in every file.
+  "trailing": true, // Prohibit trailing whitespaces.
+  "smarttabs": false, // Suppresses warnings about mixed tabs and spaces
+  "globals": { // Globals variables.
+    "angular": true,
+    "io": true,
+    "ApplicationConfiguration": true
+  },
+  "predef": [ // Extra globals.
+    "inject",
+    "by",
+    "browser",
+    "element"
+  ],
+  "indent": 4, // Specify indentation spacing
+  "devel": true, // Allow development statements e.g. `console.log();`.
+  "noempty": true // Prohibit use of empty blocks.
+}

.slugignore

@@ -1 +1 @@
-/app/tests
+/app/tests

.travis.yml

@@ -1,7 +1,7 @@
 language: node_js
 node_js:
   - "0.10"
-  - "0.11"
+  - "0.12"
 env:
   - NODE_ENV=travis
 services:

Dockerfile

@@ -1,4 +1,4 @@
-FROM dockerfile/nodejs
+FROM node:0.10
 
 MAINTAINER Matthias Luebken, [email protected]
 
@@ -20,7 +20,7 @@ RUN bower install --config.interactive=false --allow-root
 # Make everything available for start
 ADD . /home/mean
 
-# currently only works for development
+# Set development environment as default
 ENV NODE_ENV development
 
 # Port 3000 for server