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
2 changes: 0 additions & 2 deletions apps/federatedfilesharing/src/components/AdminSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ import { confirmPassword } from '@nextcloud/password-confirmation'
import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
import NcSettingsSection from '@nextcloud/vue/components/NcSettingsSection'

import '@nextcloud/password-confirmation/dist/style.css'

export default {
name: 'AdminSettings',

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwit
import NcSettingsSection from '@nextcloud/vue/components/NcSettingsSection'
import NcNoteCard from '@nextcloud/vue/components/NcNoteCard'

import '@nextcloud/password-confirmation/dist/style.css'

const lastCron = loadState('settings', 'lastCron')
const cronMaxAge = loadState('settings', 'cronMaxAge', '')
const backgroundJobsMode = loadState('settings', 'backgroundJobsMode', 'cron')
Expand Down
2 changes: 0 additions & 2 deletions apps/settings/src/components/WebAuthn/AddDevice.vue
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ import {
finishRegistration,
} from '../../service/WebAuthnRegistrationSerice.ts'

import '@nextcloud/password-confirmation/dist/style.css'

const logAndPass = (text) => (data) => {
logger.debug(text)
return data
Expand Down
2 changes: 0 additions & 2 deletions apps/settings/src/components/WebAuthn/Section.vue
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ import Device from './Device.vue'
import logger from '../../logger.ts'
import { removeRegistration } from '../../service/WebAuthnRegistrationSerice.js'

import '@nextcloud/password-confirmation/dist/style.css'

const sortByName = sortBy('name')

export default {
Expand Down
2 changes: 0 additions & 2 deletions apps/settings/src/main-personal-security.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import Vue from 'vue'

import AuthTokenSection from './components/AuthTokenSection.vue'

import '@nextcloud/password-confirmation/dist/style.css'

// eslint-disable-next-line camelcase
__webpack_nonce__ = getCSPNonce()

Expand Down
2 changes: 0 additions & 2 deletions apps/settings/src/service/PersonalInfo/EmailService.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import axios from '@nextcloud/axios'

import { ACCOUNT_PROPERTY_ENUM, SCOPE_SUFFIX } from '../../constants/AccountPropertyConstants.ts'

import '@nextcloud/password-confirmation/dist/style.css'

/**
* Save the primary email of the user
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import axios from '@nextcloud/axios'

import { SCOPE_SUFFIX } from '../../constants/AccountPropertyConstants.ts'

import '@nextcloud/password-confirmation/dist/style.css'

/**
* Save the primary account property value for the user
*
Expand Down
1 change: 0 additions & 1 deletion apps/settings/src/service/ProfileService.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import axios from '@nextcloud/axios'
import { getCurrentUser } from '@nextcloud/auth'
import { generateOcsUrl } from '@nextcloud/router'
import { confirmPassword } from '@nextcloud/password-confirmation'
import '@nextcloud/password-confirmation/dist/style.css'

/**
* Save the visibility of the profile parameter
Expand Down
1 change: 0 additions & 1 deletion apps/settings/src/store/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

import axios from '@nextcloud/axios'
import { confirmPassword } from '@nextcloud/password-confirmation'
import '@nextcloud/password-confirmation/dist/style.css'

const sanitize = function(url) {
return url.replace(/\/$/, '') // Remove last url slash
Expand Down
2 changes: 0 additions & 2 deletions apps/settings/src/store/authtoken.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ import { defineStore } from 'pinia'
import axios from '@nextcloud/axios'
import logger from '../logger'

import '@nextcloud/password-confirmation/dist/style.css'

const BASE_URL = generateUrl('/settings/personal/authtokens')

const confirm = () => {
Expand Down
2 changes: 0 additions & 2 deletions apps/sharebymail/src/components/AdminSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ import axios from '@nextcloud/axios'
import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
import NcSettingsSection from '@nextcloud/vue/components/NcSettingsSection'

import '@nextcloud/password-confirmation/dist/style.css'

export default {
name: 'AdminSettings',
components: {
Expand Down
2 changes: 0 additions & 2 deletions apps/twofactor_backupcodes/src/views/PersonalSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ import { print } from '../service/PrintService.js'
import NcButton from '@nextcloud/vue/components/NcButton'
import NcLoadingIcon from '@nextcloud/vue/components/NcLoadingIcon'

import '@nextcloud/password-confirmation/dist/style.css'

export default {
name: 'PersonalSettings',
components: {
Expand Down
2 changes: 0 additions & 2 deletions apps/workflowengine/src/store.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import { confirmPassword } from '@nextcloud/password-confirmation'
import { loadState } from '@nextcloud/initial-state'
import { getApiUrl } from './helpers/api.js'

import '@nextcloud/password-confirmation/dist/style.css'

Vue.use(Vuex)

const store = new Store({
Expand Down
4 changes: 4 additions & 0 deletions build/WebpackSPDXPlugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,10 @@ class WebpackSPDXPlugin {
const match = source.match(/asset\/inline\|data:image\/svg\+xml,(.+)/)
if (match) {
const content = decodeURI(match[1])
// REUSE-IgnoreStart
const [, license] = content.match(/SPDX-License-Identifier:\s*([^\s]+)/) ?? []
const [, author] = content.match(/SPDX-FileCopyrightText:\s*([^-]+)/) ?? []
// REUSE-IgnoreEnd
if (author && license) {
authors.add(author)
licenses.add(license)
Expand All @@ -216,12 +218,14 @@ class WebpackSPDXPlugin {
output = ''
}

// REUSE-IgnoreStart
for (const author of [...authors].sort()) {
output = `SPDX-FileCopyrightText: ${author}\n${output}`
}
for (const license of [...licenses].sort()) {
output = `SPDX-License-Identifier: ${license}\n${output}`
}
// REUSE-IgnoreEnd

compilation.emitAsset(
asset.split('?', 2)[0] + '.license',
Expand Down
2 changes: 1 addition & 1 deletion core/css/server.css

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

2 changes: 1 addition & 1 deletion core/css/server.css.map

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion core/css/server.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@
@use 'mobile';
@use 'tooltip';
// If you include .css, it will be imported as url
@use '../../node_modules/@nextcloud/dialogs/dist/style';
@use '../../node_modules/@nextcloud/dialogs/dist/style' as *;
@use '../../node_modules/@nextcloud/password-confirmation/dist/style' as *;
@use 'public';
1 change: 0 additions & 1 deletion core/src/OC/password-confirmation.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
*/

import { confirmPassword, isPasswordConfirmationRequired } from '@nextcloud/password-confirmation'
import '@nextcloud/password-confirmation/dist/style.css'

/**
* @namespace OC.PasswordConfirmation
Expand Down
Loading
Loading