Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
20 changes: 8 additions & 12 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
# 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 = 2

# We recommend you to keep these unchanged
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
indent_brace_style = K&R
curly_bracket_next_line = false
spaces_around_operators = true
max_line_length = 120
tab_width = 2
indent_style = space
indent_size = 2
continuation_indent_size = 4
insert_final_newline = true

[*.md]
Expand Down
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Auto detect text files and perform LF normalization
* text=auto
* text eol=lf

# Custom for Visual Studio
*.cs diff=csharp
Expand Down
10 changes: 8 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
c#################
#################
## Vim
#################

Expand Down Expand Up @@ -167,6 +167,11 @@ var
sdist
develop-eggs
.installed.cfg
packages/**/*.css
packages/**/ui-grid.*.js
packages/**/LICENSE.md
packages/**/.npmignore
packages/**/index.js

# Installer logs
pip-log.txt
Expand All @@ -188,7 +193,7 @@ pip-log.txt
## JetBrains
#################
.idea
ng-grid.iml
*.iml


#################
Expand All @@ -199,3 +204,4 @@ Sauce-Connect.jar
docs
bower_components
.grunt
coverage/
9 changes: 8 additions & 1 deletion .jscs.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
"disallowSpaceBeforeBinaryOperators": [
","
],
"disallowTrailingWhitespace": true,
"requireLineFeedAtFileEnd": true,
"requireSpaceBeforeBinaryOperators": [
"=",
"==",
Expand All @@ -17,14 +19,19 @@
"afterConsequent": true,
"beforeAlternate": true
},
"requireSpaceBeforeObjectValues": true,
"requireSpaceBeforeBlockStatements": true,
"requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch"],
"requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
"requireSpaceAfterLineComment": true,
"disallowSpacesInNamedFunctionExpression": {
"beforeOpeningRoundBrace": true
},
"disallowImplicitTypeConversion": ["string"],
"disallowMixedSpacesAndTabs": true,
"disallowTrailingComma": true,
"disallowYodaConditions": true,
"disallowNewlineBeforeBlockStatements": true
"disallowNewlineBeforeBlockStatements": true,
"validateLineBreaks": "LF",
"validateParameterSeparator": ", "
}
19 changes: 0 additions & 19 deletions .jscs.json.todo

This file was deleted.

16 changes: 8 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: node_js
sudo: false # defaults to sending build to container-based infrastructure on Travis

node_js:
- 4
- 10

notifications:
webhooks:
Expand All @@ -27,6 +27,9 @@ env:
- secure: PWz5cYdlrucjbJxUj9WUGo55V8+z/fDST7ihx9uLuhllqaQ+fkdTX5ccn8sv+dp9OPs0ov3Gunv/GIWKB3E6HCsHQJsyZ1Tde3IvyWwz72YeQ5/IZVolX0T1dmX9sLYJxqKjO1/D/Zfj4NkCEjFQmyIB+47tgBTV1OA9h/4TiMk=
- secure: BUUB8bjAXcUgq4GNYd0q1seAR26o8UJeIqAY1TcuV1p42d1w1mgBKz6oOEonX3NJTMI7bBNaSVYtpgxroesmVk25FMrsy5ynsY3fTAfiHbyd62IstJjtw0AcVWp+l7Z1WBe6XNhpaW8FS7wOi9jEyV/Ez/ffqgAMmMpG6BHzalk=

addons:
sauce_connect: true

branches:
only:
- master
Expand All @@ -36,31 +39,28 @@ branches:

before_install:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"

install:
- npm config set spin false

before_script:
- git fetch --tags
- chmod +x ./lib/sauce/sauce_connect_setup.sh ./lib/sauce/sauce_connect_block.sh ./travis_build.sh ./travis_print_logs.sh
- chmod +x ./lib/build/travis_build.sh ./lib/build/travis_print_logs.sh
- mkdir -p $LOGS_DIR
- ./lib/sauce/sauce_connect_setup.sh
- npm install --quiet -g grunt-cli karma-cli
- npm install
- bower install
- grunt install
- ./lib/sauce/sauce_connect_block.sh

script:
- ./travis_build.sh
- ./lib/build/travis_build.sh

after_success:
- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && grunt release

after_failure:
- ./travis_print_logs.sh
- ./lib/build/travis_print_logs.sh

after_script:
- killall -9 sc
- ./travis_print_logs.sh
- ./lib/build/travis_print_logs.sh
2 changes: 0 additions & 2 deletions Brainstorm.md

This file was deleted.

Loading