Skip to content

Commit

Permalink
Merge branch '24936' of https://github.com/jxio/sbc-auth into feature…
Browse files Browse the repository at this point in the history
…-remove-account-type

# Conflicts:
#	auth-web/package-lock.json
#	auth-web/package.json
  • Loading branch information
seeker25 committed Jan 3, 2025
2 parents e78abf9 + 9955ed1 commit 9f5a259
Show file tree
Hide file tree
Showing 10 changed files with 312 additions and 250 deletions.
2 changes: 1 addition & 1 deletion auth-web/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ module.exports = {
'@typescript-eslint/no-use-before-define': ['error', { 'functions': false, 'classes': true, 'variables': true }],
'no-unused-expressions': 'off',
'@typescript-eslint/no-unused-expressions': ['error', { 'allowShortCircuit': true, 'allowTernary': true }],
'vue/multi-word-component-names': ['error', { 'ignores': ['Transactions'] }],
'vue/multi-word-component-names': ['error', { 'ignores': ['Transactions', 'Product'] }],
'vue/component-name-in-template-casing': ['error', 'PascalCase'],
// Not ideal but shallowOnly option isn't working for this, so leaving it off for now.
// https://eslint.vuejs.org/rules/no-mutating-props.html
Expand Down
4 changes: 2 additions & 2 deletions auth-web/package-lock.json

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

2 changes: 1 addition & 1 deletion auth-web/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "auth-web",
"version": "2.6.128",
"version": "2.7.0",
"appName": "Auth Web",
"sbcName": "SBC Common Components",
"private": true,
Expand Down
Loading

0 comments on commit 9f5a259

Please sign in to comment.