Skip to content

Commit

Permalink
Merge branch 'release/2.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
jansiegel committed Apr 11, 2018
2 parents de3f46e + 0be5b53 commit 7476f64
Show file tree
Hide file tree
Showing 130 changed files with 23,213 additions and 23,422 deletions.
1 change: 1 addition & 0 deletions .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@
"regenerator-runtime/runtime",
"./common",
"./jasmine",
"./asciiTable",
"./MemoryLeakTest",
"../MemoryLeakTest"
]
Expand Down
15 changes: 8 additions & 7 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,14 @@
"no-undef": 0,
"no-underscore-dangle": 0,
"no-unused-vars": 1,
"no-restricted-globals": ["error", "Handsontable"],
"no-restricted-globals": [
2,
"Handsontable",
{
"name": "console",
"message": "Using the `console` object is not allowed within Handsontable. Please use one of the helpers from the `console.js` file instead."
}
],
"no-use-before-define": 0,
"no-var": 0,
"no-void": 0,
Expand Down Expand Up @@ -100,12 +107,6 @@
"allowParens": true
}
],
"no-console": [
2,
{
"allow": ["error", "warn", "info"]
}
],
"indent": [
2,
2,
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

### Demo
<!--- Provide a link to a live example on JSFiddle or Codepen or fill the following demo with your settings -->
https://jsfiddle.net/handsoncode/3gas9z6q/
https://jsfiddle.net/handsoncode/8ffpsqt6/

### Your environment
* Handsontable version:
Expand Down
3 changes: 2 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
<!--- Why is this change required? What problem does it solve? -->

### How has this been tested?
<!--- Please describe in detail how you tested your changes. -->
<!--- Please describe in detail how you tested your changes (doesn't apply to translations). -->

### Types of changes
<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature or improvement (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
- [ ] Additional language file or change to the existing one (translations)

### Related issue(s):
1.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ If you are looking for an extended version, try out [Handsontable Pro](//github.

**We are looking for Contributors who would like to help us with translations. [Learn more](https://github.com/handsontable/handsontable/issues/4696)**
<br/>
Most wanted languages: French, Chinese, Italian, Spanish, Swedish and Russian.
Most wanted languages: French, Chinese, Italian, Spanish and Swedish.

---

Expand Down
175 changes: 60 additions & 115 deletions dist/handsontable.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 7476f64

Please sign in to comment.