-
Notifications
You must be signed in to change notification settings - Fork 55
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1723 from SEED-platform/develop
Release 2.4.0
- Loading branch information
Showing
197 changed files
with
22,796 additions
and
16,261 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| { | ||
| "directory" : "seed/static/vendors/bower_components" | ||
| "directory" : "seed/static/vendors/bower_components", | ||
| "registry": "https://registry.bower.io" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,73 +1,73 @@ | ||
| { | ||
| "extends": "eslint:recommended", | ||
| "env": { | ||
| "browser": true, | ||
| "jasmine": true, | ||
| "jquery": true | ||
| }, | ||
| "globals": { | ||
| "_": true, | ||
| "$filter": true, | ||
| "$route": true, | ||
| "angular": true, | ||
| "angularDragula": true, | ||
| "BE": true, | ||
| "dimple": true, | ||
| "inject": true, | ||
| "module": true, | ||
| "moment": true, | ||
| "protractor": true, | ||
| "qq": true, | ||
| "Spinner": true | ||
| }, | ||
| "plugins": ["angular", "lodash", "protractor"], | ||
| "rules": { | ||
| // Possible errors | ||
| "no-console": "warn", | ||
| // Best practices | ||
| "block-scoped-var": "warn", | ||
| "dot-notation": "warn", | ||
| "no-multi-spaces": "warn", | ||
| // Variables | ||
| "no-unused-vars": "warn", | ||
| // Stylistic Issues | ||
| "array-bracket-spacing": "warn", | ||
| "brace-style": "warn", | ||
| // "camelcase": "warn", | ||
| "comma-dangle": ["error", "never"], | ||
| "comma-spacing": "warn", | ||
| // "consistent-this": ["error", "that"], | ||
| "eol-last": "error", | ||
| "indent": ["error", 2, {"SwitchCase": 1}], | ||
| "key-spacing": "warn", | ||
| "no-mixed-spaces-and-tabs": "warn", | ||
| "no-trailing-spaces": "warn", | ||
| "quote-props": ["error", "as-needed", {"keywords": true}], | ||
| "quotes": ["warn", "single"], | ||
| "semi": ["error", "always"], | ||
| "space-before-blocks": "warn", | ||
| "space-before-function-paren": "warn", | ||
| "space-infix-ops": "warn", | ||
| // Angular plugin | ||
| "angular/log": "off", // Comment for production | ||
| "angular/no-service-method": "off", | ||
| // Lodash plugin | ||
| "lodash/callback-binding": "error", | ||
| "lodash/collection-return": "error", | ||
| "lodash/matches-prop-shorthand": ["warn", "always"], | ||
| "lodash/matches-shorthand": ["warn", "always"], | ||
| "lodash/no-double-unwrap": "error", | ||
| "lodash/no-extra-args": "error", | ||
| "lodash/prefer-constant": "warn", | ||
| "lodash/prefer-filter": ["warn", 3], | ||
| "lodash/prefer-get": ["warn", 2], | ||
| "lodash/prefer-is-nil": "warn", | ||
| "lodash/prefer-lodash-typecheck": "warn", | ||
| "lodash/prefer-matches": ["warn", 2], | ||
| "lodash/prefer-startswith": "warn", | ||
| "lodash/prefer-times": "warn", | ||
| "lodash/preferred-alias": "warn", | ||
| "lodash/prop-shorthand": ["warn", "always"], | ||
| "lodash/unwrap": "error" | ||
| } | ||
| } | ||
| { | ||
| "extends": "eslint:recommended", | ||
| "env": { | ||
| "browser": true, | ||
| "jasmine": true, | ||
| "jquery": true | ||
| }, | ||
| "globals": { | ||
| "_": true, | ||
| "$filter": true, | ||
| "$route": true, | ||
| "angular": true, | ||
| "angularDragula": true, | ||
| "BE": true, | ||
| "dimple": true, | ||
| "inject": true, | ||
| "module": true, | ||
| "moment": true, | ||
| "protractor": true, | ||
| "qq": true, | ||
| "Spinner": true | ||
| }, | ||
| "plugins": ["angular", "lodash", "protractor"], | ||
| "rules": { | ||
| // Possible errors | ||
| "no-console": "warn", | ||
| // Best practices | ||
| "block-scoped-var": "warn", | ||
| "dot-notation": "warn", | ||
| "no-multi-spaces": "warn", | ||
| // Variables | ||
| "no-unused-vars": "warn", | ||
| // Stylistic Issues | ||
| "array-bracket-spacing": "warn", | ||
| "brace-style": "warn", | ||
| // "camelcase": "warn", | ||
| "comma-dangle": ["error", "never"], | ||
| "comma-spacing": "warn", | ||
| // "consistent-this": ["error", "that"], | ||
| "eol-last": "error", | ||
| "indent": ["error", 2, {"SwitchCase": 1}], | ||
| "key-spacing": "warn", | ||
| "no-mixed-spaces-and-tabs": "warn", | ||
| "no-trailing-spaces": "warn", | ||
| "quote-props": ["error", "as-needed", {"keywords": true}], | ||
| "quotes": ["warn", "single"], | ||
| "semi": ["error", "always"], | ||
| "space-before-blocks": "warn", | ||
| "space-before-function-paren": "warn", | ||
| "space-infix-ops": "warn", | ||
| // Angular plugin | ||
| "angular/log": "off", // Comment for production | ||
| "angular/no-service-method": "off", | ||
| // Lodash plugin | ||
| "lodash/callback-binding": "error", | ||
| "lodash/collection-return": "error", | ||
| "lodash/matches-prop-shorthand": ["warn", "always"], | ||
| "lodash/matches-shorthand": ["warn", "always"], | ||
| "lodash/no-double-unwrap": "error", | ||
| "lodash/no-extra-args": "error", | ||
| "lodash/prefer-constant": "warn", | ||
| "lodash/prefer-filter": ["warn", 3], | ||
| "lodash/prefer-get": ["warn", 2], | ||
| "lodash/prefer-is-nil": "warn", | ||
| "lodash/prefer-lodash-typecheck": "warn", | ||
| "lodash/prefer-matches": ["warn", 2], | ||
| "lodash/prefer-startswith": "warn", | ||
| "lodash/prefer-times": "warn", | ||
| "lodash/preferred-alias": "warn", | ||
| "lodash/prop-shorthand": ["warn", "always"], | ||
| "lodash/unwrap": "error" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| # Set the default behavior, in case people don't have core.autocrlf set. | ||
| * text=auto | ||
|
|
||
| # Explicitly declare text files you want to always be normalized and converted | ||
| # to native line endings on checkout. | ||
| #*.c text | ||
| #*.h text | ||
|
|
||
| # Declare files that will always have CRLF line endings on checkout. | ||
| #*.sln text eol=crlf | ||
|
|
||
| # Declare files that will always have LF line endings on checkout. | ||
| *.sh text eol=lf | ||
| *.py text eol=lf | ||
|
|
||
| # Denote all files that are truly binary and should not be modified. | ||
| *.png binary | ||
| *.jpg binary |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -48,7 +48,7 @@ bower_components/ | |
|
|
||
| package-lock.json | ||
| dump.rdb | ||
| log | ||
| log/*.log | ||
| *.log | ||
| .tox | ||
| Vagrantfile | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,8 @@ | ||
| #!/usr/bin/env bash | ||
| # installs npm dependencies, bower dependencies, and builds fine-uploader | ||
| # installs npm and bower dependencies | ||
| # assumes npm is installed | ||
|
|
||
| echo "Installing npm dependencies from packages.json" | ||
| npm install | ||
| echo -e "\n\n\nInstalling bower dependencies from bower.json" | ||
| $(npm bin)/bower install --config.interactive=false --allow-root | ||
|
|
||
| if [ ! -f seed/static/vendors/bower_components/fine-uploader/_build/s3.fineuploader.js ]; | ||
| then | ||
| grunt=$(npm bin)/grunt | ||
| cd seed/static/vendors/bower_components/fine-uploader/ | ||
| echo -e "\n\n\nBuilding fineuploader" | ||
| # Fix uglification error | ||
| sed -i -e 's/compress: true/compress: \{\}/g' Gruntfile.coffee | ||
| npm install | ||
| $grunt build | ||
| rm -rf node_modules | ||
| cd ../../../../../ | ||
| else | ||
| echo -e "\n\n\nFineuploader already built" | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.