Skip to content

Commit

Permalink
Merge pull request #1750 from nextcloud/automated/noid/stable25-fix-n…
Browse files Browse the repository at this point in the history
…pm-audit
  • Loading branch information
skjnldsv authored Jun 25, 2023
2 parents e88c247 + b7b746c commit 94776a3
Show file tree
Hide file tree
Showing 8 changed files with 3,873 additions and 2,456 deletions.
4 changes: 2 additions & 2 deletions js/viewer-main.js

Large diffs are not rendered by default.

22 changes: 22 additions & 0 deletions js/viewer-main.js.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,28 @@ object-assign
*
*/

/**
* @copyright Copyright (c) 2021 John Molakvoæ <[email protected]>
*
* @author John Molakvoæ <[email protected]>
*
* @license AGPL-3.0-or-later
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

/**
* @license React
* react-dom.production.min.js
Expand Down
2 changes: 1 addition & 1 deletion js/viewer-main.js.map

Large diffs are not rendered by default.

6,291 changes: 3,841 additions & 2,450 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion src/mixins/PreviewUrl.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

/**
* @copyright Copyright (c) 2019 John Molakvoæ <[email protected]>
*
Expand Down
1 change: 0 additions & 1 deletion src/utils/canDownload.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

/**
* @copyright Copyright (c) 2020 John Molakvoæ <[email protected]>
*
Expand Down
2 changes: 1 addition & 1 deletion src/views/Viewer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink.js'
import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
import isFullscreen from '@nextcloud/vue/dist/Mixins/isFullscreen.js'
import isMobile from '@nextcloud/vue/dist/Mixins/isMobile'
import isMobile from '@nextcloud/vue/dist/Mixins/isMobile.js'
import { extractFilePaths, sortCompare } from '../utils/fileUtils.js'
import { getRootPath, getUserRoot } from '../utils/davUtils.js'
Expand Down
6 changes: 6 additions & 0 deletions stylelint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,11 @@ const stylelintConfig = require('@nextcloud/stylelint-config')

// Disable nested scss import
stylelintConfig.rules['no-invalid-position-at-import-rule'] = null
stylelintConfig.rules['selector-pseudo-element-no-unknown'] = [
true,
{
ignorePseudoElements: ['v-deep'],
},
]

module.exports = stylelintConfig

0 comments on commit 94776a3

Please sign in to comment.