Skip to content

Commit

Permalink
Merge v2 to master
Browse files Browse the repository at this point in the history
  • Loading branch information
nolimits4web committed Dec 3, 2017
1 parent 1764d6b commit f104770
Show file tree
Hide file tree
Showing 1,486 changed files with 265,974 additions and 126,284 deletions.
16 changes: 1 addition & 15 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,7 @@ root = true
[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_size = 2
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[*.json]
indent_size = 2

[*.md]
indent_size = 2

[*.html]
indent_size = 2
trim_trailing_whitespace = false

[*.jade]
indent_size = 2
trim_trailing_whitespace = false
10 changes: 10 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
build
.git
.github
custom
dist
kitchen-sink
node_modules
src/framework7.js
src/modules/demo-module.js
src/components/swiper/swiper-class
35 changes: 35 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
module.exports = {
'extends': 'airbnb-base',
'plugins': [
"import"
],
'globals': {
"window": true,
"document": true,
"XMLHttpRequest": true,
"Blob": true,
"Document": true,
"FormData": true,
},
rules: {
'max-len': ['error', 1000, 2, {
ignoreUrls: true,
ignoreComments: false,
ignoreRegExpLiterals: true,
ignoreStrings: true,
ignoreTemplateLiterals: true,
}],
'object-curly-newline': ['error', {
ObjectExpression: { minProperties: 9, multiline: true, consistent: true },
ObjectPattern: { minProperties: 9, multiline: true, consistent: true }
}],
'comma-dangle': ['error', {
arrays: 'always-multiline',
objects: 'always-multiline',
imports: 'always-multiline',
exports: 'always-multiline',
functions: 'never',
}],
'prefer-destructuring': ['off'],
},
};
6 changes: 3 additions & 3 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

Framework7 loves to welcome your contributions. There are several ways to help out:

* Create an [issue](https://github.com/nolimits4web/Framework7/issues) on GitHub, if you have found a bug
* Create an [issue](https://github.com/framework7io/Framework7/issues) on GitHub, if you have found a bug
* Write test cases or provide examples for open bug issues
* Write patches for open bug/feature issues, preferably with test cases included
* Contribute to the [documentation](https://github.com/nolimits4web/Framework7-Website)
* Contribute to the [documentation](https://github.com/framework7io/Framework7-Website)

There are a few guidelines that we need contributors to follow so that we have a
chance of keeping on top of things.
Expand All @@ -14,7 +14,7 @@ chance of keeping on top of things.
## Getting Started

* Make sure you have a [GitHub account](https://github.com/signup/free).
* Submit an [issue](https://github.com/nolimits4web/Framework7/issues), assuming one does not already exist.
* Submit an [issue](https://github.com/framework7io/Framework7/issues), assuming one does not already exist.
* Clearly describe the issue including steps to reproduce when it is a bug.
* Make sure you fill in the earliest version that you know has the issue.
* Include live link or JSFiddle/Codepen link with the issue if you want it to be discovered and resolved asap. We have few ready templates for you: iOS [JSFiddle](https://jsfiddle.net/s2n1p730/)/[Codepen](https://codepen.io/nolimits4web/pen/WRRWwN), Material [JSFiddle](https://jsfiddle.net/0ogxxcvt/)/[Codepen](https://codepen.io/nolimits4web/pen/pEPPPK)
Expand Down
6 changes: 6 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!--
Do you want to ask a question? Are you looking for support? The Framework7 forum (http://forum.framework7.io) and Stack Overflow (http://stackoverflow.com/questions/tagged/framework7) are the best places for getting support
-->

This is a (multiple allowed):
* [x] bug
* [ ] enhancement
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ custom
npm-debug.log
.idea
.vscode
nbproject
dist/css/framework7.css
scripts/build-config-custom.js
scripts/build-config-*.js
37 changes: 0 additions & 37 deletions .jshintrc

This file was deleted.

6 changes: 5 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
.github
build
custom
kitchen-sink
kitchen-sink-ios
kitchen-sink-material
node_modules
npm-debug.log
npm-debug.log
scripts
src
gulpfile.js
Loading

0 comments on commit f104770

Please sign in to comment.