diff options
author | Pytal <24800714+Pytal@users.noreply.github.com> | 2022-09-14 22:54:21 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-14 22:54:21 +0300 |
commit | bd03c7978537334822f1fc05049045d89cc56533 (patch) | |
tree | 98fdd9377b1d4879e367f9e8f9acfc72582d92a7 /apps | |
parent | af35ea308b65dd17c8641ba6a7e8306073c29ad2 (diff) | |
parent | 26535e4856617c21dad14f444bd8a4316cae5af3 (diff) |
Merge pull request #34044 from nextcloud/fix/password-confirmation
Diffstat (limited to 'apps')
14 files changed, 28 insertions, 14 deletions
diff --git a/apps/federatedfilesharing/src/components/AdminSettings.vue b/apps/federatedfilesharing/src/components/AdminSettings.vue index e3b9d4186a7..678e47012c2 100644 --- a/apps/federatedfilesharing/src/components/AdminSettings.vue +++ b/apps/federatedfilesharing/src/components/AdminSettings.vue @@ -71,7 +71,8 @@ import { loadState } from '@nextcloud/initial-state' import { showError } from '@nextcloud/dialogs' import axios from '@nextcloud/axios' import { generateOcsUrl } from '@nextcloud/router' -import confirmPassword from '@nextcloud/password-confirmation' +import { confirmPassword } from '@nextcloud/password-confirmation' +import '@nextcloud/password-confirmation/dist/style.css' export default { name: 'AdminSettings', diff --git a/apps/settings/src/components/AuthTokenSection.vue b/apps/settings/src/components/AuthTokenSection.vue index 9d060c1cc64..36eb35fcf48 100644 --- a/apps/settings/src/components/AuthTokenSection.vue +++ b/apps/settings/src/components/AuthTokenSection.vue @@ -36,7 +36,8 @@ <script> import axios from '@nextcloud/axios' -import confirmPassword from '@nextcloud/password-confirmation' +import { confirmPassword } from '@nextcloud/password-confirmation' +import '@nextcloud/password-confirmation/dist/style.css' import { generateUrl } from '@nextcloud/router' import AuthTokenList from './AuthTokenList' diff --git a/apps/settings/src/components/AuthTokenSetupDialogue.vue b/apps/settings/src/components/AuthTokenSetupDialogue.vue index 5a706b153b9..3eae5b389b9 100644 --- a/apps/settings/src/components/AuthTokenSetupDialogue.vue +++ b/apps/settings/src/components/AuthTokenSetupDialogue.vue @@ -81,7 +81,8 @@ <script> import QR from '@chenfengyuan/vue-qrcode' -import confirmPassword from '@nextcloud/password-confirmation' +import { confirmPassword } from '@nextcloud/password-confirmation' +import '@nextcloud/password-confirmation/dist/style.css' import { getRootUrl } from '@nextcloud/router' import NcButton from '@nextcloud/vue/dist/Components/NcButton' diff --git a/apps/settings/src/components/BasicSettings/BackgroundJob.vue b/apps/settings/src/components/BasicSettings/BackgroundJob.vue index 678251e5f15..f4c2e2d149e 100644 --- a/apps/settings/src/components/BasicSettings/BackgroundJob.vue +++ b/apps/settings/src/components/BasicSettings/BackgroundJob.vue @@ -92,7 +92,8 @@ import NcNoteCard from '@nextcloud/vue/dist/Components/NcNoteCard.js' import moment from '@nextcloud/moment' import axios from '@nextcloud/axios' import { generateOcsUrl } from '@nextcloud/router' -import confirmPassword from '@nextcloud/password-confirmation' +import { confirmPassword } from '@nextcloud/password-confirmation' +import '@nextcloud/password-confirmation/dist/style.css' const lastCron = loadState('settings', 'lastCron') const cronMaxAge = loadState('settings', 'cronMaxAge', '') diff --git a/apps/settings/src/components/Encryption.vue b/apps/settings/src/components/Encryption.vue index 834f9b1c79b..cec060b32d8 100644 --- a/apps/settings/src/components/Encryption.vue +++ b/apps/settings/src/components/Encryption.vue @@ -84,7 +84,8 @@ import { loadState } from '@nextcloud/initial-state' import { getLoggerBuilder } from '@nextcloud/logger' import { generateOcsUrl } from '@nextcloud/router' -import confirmPassword from '@nextcloud/password-confirmation' +import { confirmPassword } from '@nextcloud/password-confirmation' +import '@nextcloud/password-confirmation/dist/style.css' import { showError } from '@nextcloud/dialogs' const logger = getLoggerBuilder() diff --git a/apps/settings/src/components/WebAuthn/AddDevice.vue b/apps/settings/src/components/WebAuthn/AddDevice.vue index 463f5d9029a..3fec2d84351 100644 --- a/apps/settings/src/components/WebAuthn/AddDevice.vue +++ b/apps/settings/src/components/WebAuthn/AddDevice.vue @@ -61,7 +61,8 @@ </template> <script> -import confirmPassword from '@nextcloud/password-confirmation' +import { confirmPassword } from '@nextcloud/password-confirmation' +import '@nextcloud/password-confirmation/dist/style.css' import logger from '../../logger' import { diff --git a/apps/settings/src/components/WebAuthn/Section.vue b/apps/settings/src/components/WebAuthn/Section.vue index 56832e4eea3..db6cc1dafc3 100644 --- a/apps/settings/src/components/WebAuthn/Section.vue +++ b/apps/settings/src/components/WebAuthn/Section.vue @@ -48,7 +48,8 @@ </template> <script> -import confirmPassword from '@nextcloud/password-confirmation' +import { confirmPassword } from '@nextcloud/password-confirmation' +import '@nextcloud/password-confirmation/dist/style.css' import sortBy from 'lodash/fp/sortBy' import AddDevice from './AddDevice' diff --git a/apps/settings/src/service/PersonalInfo/EmailService.js b/apps/settings/src/service/PersonalInfo/EmailService.js index 017c0518f60..90301715521 100644 --- a/apps/settings/src/service/PersonalInfo/EmailService.js +++ b/apps/settings/src/service/PersonalInfo/EmailService.js @@ -23,7 +23,8 @@ import axios from '@nextcloud/axios' import { getCurrentUser } from '@nextcloud/auth' import { generateOcsUrl } from '@nextcloud/router' -import confirmPassword from '@nextcloud/password-confirmation' +import { confirmPassword } from '@nextcloud/password-confirmation' +import '@nextcloud/password-confirmation/dist/style.css' import { ACCOUNT_PROPERTY_ENUM, SCOPE_SUFFIX } from '../../constants/AccountPropertyConstants' diff --git a/apps/settings/src/service/PersonalInfo/PersonalInfoService.js b/apps/settings/src/service/PersonalInfo/PersonalInfoService.js index da86414da00..f39d29011ba 100644 --- a/apps/settings/src/service/PersonalInfo/PersonalInfoService.js +++ b/apps/settings/src/service/PersonalInfo/PersonalInfoService.js @@ -23,7 +23,8 @@ import axios from '@nextcloud/axios' import { getCurrentUser } from '@nextcloud/auth' import { generateOcsUrl } from '@nextcloud/router' -import confirmPassword from '@nextcloud/password-confirmation' +import { confirmPassword } from '@nextcloud/password-confirmation' +import '@nextcloud/password-confirmation/dist/style.css' import { SCOPE_SUFFIX } from '../../constants/AccountPropertyConstants' diff --git a/apps/settings/src/service/ProfileService.js b/apps/settings/src/service/ProfileService.js index f84135dd9d2..1df52983c90 100644 --- a/apps/settings/src/service/ProfileService.js +++ b/apps/settings/src/service/ProfileService.js @@ -23,7 +23,8 @@ import axios from '@nextcloud/axios' import { getCurrentUser } from '@nextcloud/auth' import { generateOcsUrl } from '@nextcloud/router' -import confirmPassword from '@nextcloud/password-confirmation' +import { confirmPassword } from '@nextcloud/password-confirmation' +import '@nextcloud/password-confirmation/dist/style.css' /** * Save the visibility of the profile parameter diff --git a/apps/settings/src/store/api.js b/apps/settings/src/store/api.js index c7136bccab8..23965b6d2e4 100644 --- a/apps/settings/src/store/api.js +++ b/apps/settings/src/store/api.js @@ -25,7 +25,8 @@ */ import axios from '@nextcloud/axios' -import confirmPassword from '@nextcloud/password-confirmation' +import { confirmPassword } from '@nextcloud/password-confirmation' +import '@nextcloud/password-confirmation/dist/style.css' const sanitize = function(url) { return url.replace(/\/$/, '') // Remove last url slash diff --git a/apps/sharebymail/src/components/AdminSettings.vue b/apps/sharebymail/src/components/AdminSettings.vue index 861afa4add1..8a681110216 100644 --- a/apps/sharebymail/src/components/AdminSettings.vue +++ b/apps/sharebymail/src/components/AdminSettings.vue @@ -44,7 +44,8 @@ import { loadState } from '@nextcloud/initial-state' import { showError } from '@nextcloud/dialogs' import axios from '@nextcloud/axios' import { generateOcsUrl } from '@nextcloud/router' -import confirmPassword from '@nextcloud/password-confirmation' +import { confirmPassword } from '@nextcloud/password-confirmation' +import '@nextcloud/password-confirmation/dist/style.css' export default { name: 'AdminSettings', diff --git a/apps/twofactor_backupcodes/src/views/PersonalSettings.vue b/apps/twofactor_backupcodes/src/views/PersonalSettings.vue index 96b02064134..d72b5392557 100644 --- a/apps/twofactor_backupcodes/src/views/PersonalSettings.vue +++ b/apps/twofactor_backupcodes/src/views/PersonalSettings.vue @@ -44,7 +44,8 @@ </template> <script> -import confirmPassword from '@nextcloud/password-confirmation' +import { confirmPassword } from '@nextcloud/password-confirmation' +import '@nextcloud/password-confirmation/dist/style.css' import { print } from '../service/PrintService' export default { diff --git a/apps/workflowengine/src/store.js b/apps/workflowengine/src/store.js index 00701e9e14c..1de22622c5a 100644 --- a/apps/workflowengine/src/store.js +++ b/apps/workflowengine/src/store.js @@ -28,7 +28,8 @@ import Vue from 'vue' import Vuex, { Store } from 'vuex' import axios from '@nextcloud/axios' import { getApiUrl } from './helpers/api' -import confirmPassword from '@nextcloud/password-confirmation' +import { confirmPassword } from '@nextcloud/password-confirmation' +import '@nextcloud/password-confirmation/dist/style.css' import { loadState } from '@nextcloud/initial-state' Vue.use(Vuex) |