Merge remote-tracking branch 'origin/develop' into customizable-post-actions
This commit is contained in:
commit
e1c6149941
12 changed files with 745 additions and 456 deletions
|
@ -1,7 +1,7 @@
|
||||||
# This file is a template, and might need editing before it works on your project.
|
# This file is a template, and might need editing before it works on your project.
|
||||||
# Official framework image. Look for the different tagged releases at:
|
# Official framework image. Look for the different tagged releases at:
|
||||||
# https://hub.docker.com/r/library/node/tags/
|
# https://hub.docker.com/r/library/node/tags/
|
||||||
image: node:16
|
image: node:18
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
- check-changelog
|
- check-changelog
|
||||||
|
|
14
package.json
14
package.json
|
@ -18,10 +18,10 @@
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/runtime": "7.26.0",
|
"@babel/runtime": "7.26.0",
|
||||||
"@chenfengyuan/vue-qrcode": "2.0.0",
|
"@chenfengyuan/vue-qrcode": "2.0.0",
|
||||||
"@fortawesome/fontawesome-svg-core": "6.4.0",
|
"@fortawesome/fontawesome-svg-core": "6.7.2",
|
||||||
"@fortawesome/free-regular-svg-icons": "6.4.0",
|
"@fortawesome/free-regular-svg-icons": "6.7.2",
|
||||||
"@fortawesome/free-solid-svg-icons": "6.4.0",
|
"@fortawesome/free-solid-svg-icons": "6.7.2",
|
||||||
"@fortawesome/vue-fontawesome": "3.0.3",
|
"@fortawesome/vue-fontawesome": "3.0.8",
|
||||||
"@kazvmoe-infra/pinch-zoom-element": "1.2.0",
|
"@kazvmoe-infra/pinch-zoom-element": "1.2.0",
|
||||||
"@kazvmoe-infra/unicode-emoji-json": "0.4.0",
|
"@kazvmoe-infra/unicode-emoji-json": "0.4.0",
|
||||||
"@ruffle-rs/ruffle": "0.1.0-nightly.2025.1.13",
|
"@ruffle-rs/ruffle": "0.1.0-nightly.2025.1.13",
|
||||||
|
@ -74,9 +74,9 @@
|
||||||
"css-minimizer-webpack-plugin": "4.2.2",
|
"css-minimizer-webpack-plugin": "4.2.2",
|
||||||
"custom-event-polyfill": "1.0.7",
|
"custom-event-polyfill": "1.0.7",
|
||||||
"eslint": "8.57.1",
|
"eslint": "8.57.1",
|
||||||
"eslint-config-standard": "17.0.0",
|
"eslint-config-standard": "17.1.0",
|
||||||
"eslint-formatter-friendly": "7.0.0",
|
"eslint-formatter-friendly": "7.0.0",
|
||||||
"eslint-plugin-import": "2.27.5",
|
"eslint-plugin-import": "2.31.0",
|
||||||
"eslint-plugin-n": "15.6.1",
|
"eslint-plugin-n": "15.6.1",
|
||||||
"eslint-plugin-promise": "6.1.1",
|
"eslint-plugin-promise": "6.1.1",
|
||||||
"eslint-plugin-vue": "9.9.0",
|
"eslint-plugin-vue": "9.9.0",
|
||||||
|
@ -96,7 +96,7 @@
|
||||||
"karma-sinon-chai": "2.0.2",
|
"karma-sinon-chai": "2.0.2",
|
||||||
"karma-sourcemap-loader": "0.3.8",
|
"karma-sourcemap-loader": "0.3.8",
|
||||||
"karma-spec-reporter": "0.0.36",
|
"karma-spec-reporter": "0.0.36",
|
||||||
"karma-webpack": "5.0.0",
|
"karma-webpack": "5.0.1",
|
||||||
"lodash": "4.17.21",
|
"lodash": "4.17.21",
|
||||||
"mini-css-extract-plugin": "2.7.6",
|
"mini-css-extract-plugin": "2.7.6",
|
||||||
"mocha": "10.2.0",
|
"mocha": "10.2.0",
|
||||||
|
|
|
@ -34,7 +34,10 @@
|
||||||
</i>
|
</i>
|
||||||
</p>
|
</p>
|
||||||
<p v-if="draft.status">{{ draft.status }}</p>
|
<p v-if="draft.status">{{ draft.status }}</p>
|
||||||
<p v-else class="faint">{{ $t('drafts.empty') }}</p>
|
<p
|
||||||
|
v-else
|
||||||
|
class="faint"
|
||||||
|
>{{ $t('drafts.empty') }}</p>
|
||||||
</span>
|
</span>
|
||||||
<gallery
|
<gallery
|
||||||
v-if="draft.files?.length !== 0"
|
v-if="draft.files?.length !== 0"
|
||||||
|
|
|
@ -10,8 +10,8 @@
|
||||||
{{ ' ' }}
|
{{ ' ' }}
|
||||||
<Checkbox
|
<Checkbox
|
||||||
v-if="typeof fallback !== 'undefined'"
|
v-if="typeof fallback !== 'undefined'"
|
||||||
class="font-checkbox"
|
|
||||||
:id="name + '-o'"
|
:id="name + '-o'"
|
||||||
|
class="font-checkbox"
|
||||||
:model-value="present"
|
:model-value="present"
|
||||||
@change="$emit('update:modelValue', typeof modelValue === 'undefined' ? fallback : undefined)"
|
@change="$emit('update:modelValue', typeof modelValue === 'undefined' ? fallback : undefined)"
|
||||||
>
|
>
|
||||||
|
|
|
@ -80,7 +80,7 @@ const mediaUpload = {
|
||||||
|
|
||||||
canvas.toBlob((blob) => {
|
canvas.toBlob((blob) => {
|
||||||
resolve(new File([blob], newFileName, {
|
resolve(new File([blob], newFileName, {
|
||||||
type: type,
|
type,
|
||||||
lastModified: Date.now()
|
lastModified: Date.now()
|
||||||
}))
|
}))
|
||||||
}, type, 0.85)
|
}, type, 0.85)
|
||||||
|
|
|
@ -29,9 +29,9 @@
|
||||||
<button
|
<button
|
||||||
v-if="apply"
|
v-if="apply"
|
||||||
class="btn button-default palette-apply-button"
|
class="btn button-default palette-apply-button"
|
||||||
@click="applyPalette"
|
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
:class="{ disabled }"
|
:class="{ disabled }"
|
||||||
|
@click="applyPalette"
|
||||||
>
|
>
|
||||||
{{ $t('settings.style.themes3.palette.apply') }}
|
{{ $t('settings.style.themes3.palette.apply') }}
|
||||||
</button>
|
</button>
|
||||||
|
|
|
@ -12,9 +12,9 @@
|
||||||
<button
|
<button
|
||||||
class="button-default theme-preview"
|
class="button-default theme-preview"
|
||||||
data-theme-key="stock"
|
data-theme-key="stock"
|
||||||
@click="resetTheming"
|
|
||||||
:class="{ toggled: isStyleActive('stock'), disabled: switchInProgress }"
|
:class="{ toggled: isStyleActive('stock'), disabled: switchInProgress }"
|
||||||
:disabled="switchInProgress"
|
:disabled="switchInProgress"
|
||||||
|
@click="resetTheming"
|
||||||
>
|
>
|
||||||
<!-- eslint-disable vue/no-v-text-v-html-on-component -->
|
<!-- eslint-disable vue/no-v-text-v-html-on-component -->
|
||||||
<!-- eslint-disable vue/no-v-html -->
|
<!-- eslint-disable vue/no-v-html -->
|
||||||
|
@ -58,8 +58,8 @@
|
||||||
:data-theme-key="style.key"
|
:data-theme-key="style.key"
|
||||||
class="button-default theme-preview"
|
class="button-default theme-preview"
|
||||||
:class="{ toggled: isThemeActive(style.key), disabled: switchInProgress }"
|
:class="{ toggled: isThemeActive(style.key), disabled: switchInProgress }"
|
||||||
@click="style.version === 'v2' ? setTheme(style.key) : setStyle(style.key)"
|
|
||||||
:disabled="switchInProgress"
|
:disabled="switchInProgress"
|
||||||
|
@click="style.version === 'v2' ? setTheme(style.key) : setStyle(style.key)"
|
||||||
>
|
>
|
||||||
<!-- eslint-disable vue/no-v-text-v-html-on-component -->
|
<!-- eslint-disable vue/no-v-text-v-html-on-component -->
|
||||||
<!-- eslint-disable vue/no-v-html -->
|
<!-- eslint-disable vue/no-v-html -->
|
||||||
|
@ -81,9 +81,9 @@
|
||||||
<div class="import-file-container">
|
<div class="import-file-container">
|
||||||
<button
|
<button
|
||||||
class="btn button-default"
|
class="btn button-default"
|
||||||
@click="importFile"
|
|
||||||
:class="{ disabled: switchInProgress }"
|
:class="{ disabled: switchInProgress }"
|
||||||
:disabled="switchInProgress"
|
:disabled="switchInProgress"
|
||||||
|
@click="importFile"
|
||||||
>
|
>
|
||||||
<FAIcon icon="folder-open" />
|
<FAIcon icon="folder-open" />
|
||||||
{{ $t('settings.style.themes3.editor.load_style') }}
|
{{ $t('settings.style.themes3.editor.load_style') }}
|
||||||
|
@ -157,8 +157,8 @@
|
||||||
class="userPalette"
|
class="userPalette"
|
||||||
:compact="true"
|
:compact="true"
|
||||||
:apply="true"
|
:apply="true"
|
||||||
@applyPalette="data => setPaletteCustom(data)"
|
|
||||||
:disabled="switchInProgress"
|
:disabled="switchInProgress"
|
||||||
|
@applyPalette="data => setPaletteCustom(data)"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
<template v-else-if="customThemeVersion === 'v2'">
|
<template v-else-if="customThemeVersion === 'v2'">
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
const VideoAttachment = {
|
const VideoAttachment = {
|
||||||
props: ['attachment', 'controls'],
|
props: ['attachment', 'controls'],
|
||||||
data () {
|
data () {
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
const DIRECTION_LEFT = [-1, 0]
|
const DIRECTION_LEFT = [-1, 0]
|
||||||
const DIRECTION_RIGHT = [1, 0]
|
const DIRECTION_RIGHT = [1, 0]
|
||||||
const DIRECTION_UP = [0, -1]
|
const DIRECTION_UP = [0, -1]
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
// promiseInterval - replacement for setInterval for promises, starts counting
|
// promiseInterval - replacement for setInterval for promises, starts counting
|
||||||
// the interval only after a promise is done instead of immediately.
|
// the interval only after a promise is done instead of immediately.
|
||||||
// - promiseCall is a function that returns a promise, it's called the first
|
// - promiseCall is a function that returns a promise, it's called the first
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
export const windowWidth = () =>
|
export const windowWidth = () =>
|
||||||
window.innerWidth ||
|
window.innerWidth ||
|
||||||
document.documentElement.clientWidth ||
|
document.documentElement.clientWidth ||
|
||||||
|
|
Loading…
Add table
Reference in a new issue