Skip to content

Commit

Permalink
Merge branch 'devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
SachaG committed Dec 27, 2017
2 parents 06b681d + fc3a5d5 commit 867495b
Show file tree
Hide file tree
Showing 138 changed files with 3,035 additions and 648 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ indent_brace_style = 1TBS
indent_size = 2
indent_style = space
insert_final_newline = true
max_line_length = 80
max_line_length = 120
quote_type = auto
spaces_around_operators = true
trim_trailing_whitespace = true
Expand Down
7 changes: 6 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,15 @@
"meteor": true,
"node": true
},
"ecmaFeatures": {
"modules": true,
"jsx": true
},
"plugins": [
"babel",
"meteor",
"react"
"react",
"prettier"
],
"settings": {
"import/resolver": "meteor"
Expand Down
7 changes: 7 additions & 0 deletions .meteor/.id
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This file contains a token that is unique to your project.
# Check it into your repository along with the rest of this directory.
# It can be used for purposes such as:
# - ensuring you don't accidentally deploy one app on top of another
# - providing package authors with aggregated statistics

1txv9r51kxht481ysl8bb
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@1.5.2.2
METEOR@1.6
15 changes: 15 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "chrome",
"request": "launch",
"name": "Launch Chrome against localhost",
"url": "http://localhost:8080",
"webRoot": "${workspaceFolder}"
}
]
}
Loading

0 comments on commit 867495b

Please sign in to comment.