Skip to content
Merged
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ testem.log
.env
.idea
.vscode
.eslintcache

/yarn-error.log

Expand Down
12 changes: 2 additions & 10 deletions .template-lintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,13 @@ module.exports = {
ignoredTags: ['label'] // Allow label tag inside a or any other interactive element
},
'link-rel-noopener': true,
'no-curly-component-invocation': true,
// TODO: Remove and fix
'require-button-type': false,
'no-partial': false,
'require-valid-alt-text': false,
'no-inline-styles': false,
'no-negated-condition': false,
'no-invalid-meta': false, // Crashing the linter https://github.com/ember-template-lint/ember-template-lint/pull/1087
'no-curly-component-invocation': false,
},
overrides: [
{
files: ['**/app/templates/account/**/*.hbs', '**/app/templates/events/**/*.hbs'],
rules: {
'no-curly-component-invocation': true,
}
},
]
}
};
2 changes: 1 addition & 1 deletion app/templates/components/ui-table/header-row-filtering.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{{#if column.useFilter}}
<div class="ui input {{if column.filterUsed 'has-feedback'}}">
{{#if column.filterWithSelect}}
{{models-select options=column.filterOptions cssPropertyName=column.cssPropertyName value=column.filterString class=(concat this.themeInstance.input 'changeFilterForColumn')}}
<ModelsSelect @options={{column.filterOptions}} @cssPropertyName={{column.cssPropertyName}} @value={{column.filterString}} @class={{concat this.themeInstance.input 'changeFilterForColumn'}} />
{{else}}
<Input @type="text" @value={{column.filterString}} class={{this.themeInstance.input}} placeholder="" />
{{/if}}
Expand Down
2 changes: 1 addition & 1 deletion config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ module.exports = function(environment) {
APP: {
apiHost : process.env.API_HOST || (environment === 'production' ? 'https://api.eventyay.com' : 'https://open-event-api-dev.herokuapp.com'),
apiNamespace : process.env.API_NAMESPACE || 'v1',
version: process.env.npm_package_version
version : process.env.npm_package_version
},

metricsAdapters: [{
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
"test": "ember test",
"exam": "ember exam --launch=chrome --random",
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*",
"lint:js": "eslint --fix app ember-cli-build.js testem.js tests config",
"lint:js": "eslint --cache --fix app ember-cli-build.js testem.js tests config",
"lint:scss": "sass-lint -c .sass-lint.yml --verbose",
"lint:hbs": "ember-template-lint ."
"lint:hbs": "ember-template-lint --fix ."
},
"pre-commit": {
"run": [
Expand Down