Merge branch 'develop' for release of v1.1.07

ottemo · Feb 18, 2016 · f3568d2 · f3568d2
2 parents 4e15ffb + 354eecf
commit f3568d2
Show file tree

Hide file tree

Showing 379 changed files with 8,912 additions and 1,869 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,21 +1,14 @@
-# EditorConfig helps developers define and maintain consistent
-# coding styles between different editors and IDEs
 # editorconfig.org
 
 root = true
 
-
 [*]
-
-# Change these settings to your own preference
-indent_style = space
-indent_size = 4
-
-# We recommend you to keep these unchanged
-end_of_line = lf
 charset = utf-8
-trim_trailing_whitespace = true
+end_of_line = lf
+indent_size = 2
+indent_style = space
 insert_final_newline = true
+trim_trailing_whitespace = true
 
 [*.md]
 trim_trailing_whitespace = false
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1,13 @@
-* text=auto
+# Enforce Unix newlines
+*.css   text eol=lf
+*.html  text eol=lf
+*.js    text eol=lf
+*.json  text eol=lf
+*.md    text eol=lf
+*.py    text eol=lf
+*.rb    text eol=lf
+*.scss  text eol=lf
+*.svg   text eol=lf
+*.yml   text eol=lf
+# Don't diff or textually merge source maps
+*.map   binary
diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,6 @@
 *.sublime-workspace
 
 app/bower_components
-app/scripts/main.js
 app/bundle.js
 app/media
 dist
@@ -20,5 +19,4 @@ tags
 .DS_Store
 
 # Ottemo Specific
-app/scripts/config.js
-dashboard.iml
+tmp/*
diff --git a/.jsbeautifyrc b/.jsbeautifyrc
@@ -9,7 +9,7 @@
     "indent_handlebars": false, // e.g. {{#foo}}, {{/foo}}
     "indent_inner_html": false, // Indent <head> and <body> sections
     "indent_scripts": "keep", // [keep|separate|normal]
-    "indent_size": 4, // Indentation size
+    "indent_size": 2, // Indentation size
     "max_preserve_newlines": 2, // Maximum number of line breaks to be preserved in one chunk (0 disables)
     "preserve_newlines": true, // Whether existing line breaks before elements should be preserved (only works before elements, not inside tags or for text)
     "unformatted": ["a", "span", "img", "code", "pre", "sub", "sup", "em", "strong", "b", "i", "u", "strike", "big", "small", "pre", "h1", "h2", "h3", "h4", "h5", "h6"], // List of tags that should not be reformatted
@@ -21,7 +21,7 @@
     "allowed_file_extensions": ["css", "scss", "sass", "less"],
     "end_with_newline": false, // End output with newline
     "indent_char": " ", // Indentation character
-    "indent_size": 4, // Indentation size
+    "indent_size": 2, // Indentation size
     "newline_between_rules": true, // Add a new line after every css rule
     "selector_separator": " ",
     "selector_separator_newline": true // Separate selectors with newline or not (e.g. "a,\nbr" or "a, br")
@@ -34,7 +34,7 @@
     "end_with_newline": true, // End output with newline
     "indent_char": " ", // Indentation character
     "indent_level": 0, // Initial indentation level
-    "indent_size": 4, // Indentation size
+    "indent_size": 2, // Indentation size
     "indent_with_tabs": false, // Indent with tabs, overrides `indent_size` and `indent_char`
     "jslint_happy": false, // If true, then jslint-stricter mode is enforced
     "keep_array_indentation": false, // Preserve array indentation
@@ -46,6 +46,6 @@
     "space_in_empty_paren": false, // Add padding spaces within empty paren, "f()" vs "f( )"
     "space_in_paren": false, // Add padding spaces within paren, ie. f( a, b )
     "unescape_strings": false, // Should printable characters in strings encoded in \xNN notation be unescaped, "example" vs "\x65\x78\x61\x6d\x70\x6c\x65"
-    "wrap_line_length": 130 // Lines should wrap at next opportunity after this number of characters (0 disables)
+    "wrap_line_length": 0 // Lines should wrap at next opportunity after this number of characters (0 disables)
   }
 }
diff --git a/.jshintrc b/.jshintrc
@@ -1,31 +1,61 @@
 {
-    "es3": true,
-    "forin": true,
-    "noempty": true,
-    "nonew": true,
-    "plusplus": true,
-    "indent": 4,
-    "maxdepth": 5,
-    "maxstatements": 25,
-    "maxcomplexity": 5,
-    "maxlen": 255,
-    "jquery": true,
-    "prototypejs": true,
-    "node": true,
-    "browser": true,
+    "bitwise": true,
     "camelcase": true,
     "curly": true,
     "eqeqeq": true,
+    "es3": false,
+    "forin": true,
+    "freeze": true,
     "immed": true,
-    "latedef": true,
+    "indent": 4,
+    "latedef": "nofunc",
+    "maxcomplexity": 8,
+    "maxdepth": 5,
+    "maxlen": 255,
+    "maxparams": 10,
+    "maxstatements": 40,
     "newcap": true,
     "noarg": true,
-    "quotmark": "true",
-    "regexp": true,
+    "noempty": true,
+    "nonbsp": true,
+    "nonew": true,
+    "plusplus": false,
+    //"quotmark": "single",
     "undef": true,
-    "unused": true,
-    "strict": false, // we don't do this currently, the errors litter our hint
+    "unused": false,
+    "strict": false,
+
+    "asi": false,
+    "boss": false,
+    "debug": false,
+    "eqnull": true,
+    "esnext": false,
+    "evil": false,
+    "expr": false,
+    "funcscope": false,
+    "globalstrict": false,
+    "iterator": false,
+    "lastsemic": false,
+    "laxbreak": false,
+    "laxcomma": false,
+    "loopfunc": true,
+    "maxerr": false,
+    "moz": false,
+    "multistr": false,
+    "notypeof": false,
+    "proto": false,
+    "scripturl": false,
+    "shadow": false,
     "sub": true,
-    "trailing": true,
-    "predef": [ "angular", "JSON", "Highcharts" ]
-}
+    "supernew": false,
+    "validthis": false,
+    "noyield": false,
+
+    "browser": true,
+    "node": true,
+
+    "jquery": true,
+    "globals": {
+        "angular": false
+    }
+}