Skip to content

Commit 4ebaf94

Browse files
committed
Merge branch 'develop'
Signed-off-by: Pedro Lamas <[email protected]>
2 parents da47c53 + bc730d3 commit 4ebaf94

File tree

163 files changed

+9485
-1107
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

163 files changed

+9485
-1107
lines changed

components.d.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ declare module 'vue' {
4141
AppNavDrawer: typeof import('./src/components/layout/AppNavDrawer.vue')['default']
4242
AppNavItem: typeof import('./src/components/ui/AppNavItem.vue')['default']
4343
AppNotificationMenu: typeof import('./src/components/layout/AppNotificationMenu.vue')['default']
44+
AppObservedColumn: typeof import('./src/components/layout/AppObservedColumn.vue')['default']
4445
AppQrCode: typeof import('./src/components/ui/AppQrCode.vue')['default']
4546
AppSaveConfigAndRestartBtn: typeof import('./src/components/layout/AppSaveConfigAndRestartBtn.vue')['default']
4647
AppSetting: typeof import('./src/components/ui/AppSetting.vue')['default']
@@ -86,6 +87,7 @@ declare module 'vue' {
8687
VCheckbox: typeof import('vuetify/lib')['VCheckbox']
8788
VChip: typeof import('vuetify/lib')['VChip']
8889
VCol: typeof import('vuetify/lib')['VCol']
90+
VColorPicker: typeof import('vuetify/lib')['VColorPicker']
8991
VCombobox: typeof import('vuetify/lib')['VCombobox']
9092
VContainer: typeof import('vuetify/lib')['VContainer']
9193
VDataTable: typeof import('vuetify/lib')['VDataTable']

package-lock.json

Lines changed: 267 additions & 249 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@
3636
"@fontsource/roboto": "^5.2.5",
3737
"@irojs/iro-core": "^1.2.1",
3838
"@jaames/iro": "^5.5.2",
39-
"axios": "^1.8.3",
40-
"consola": "^3.4.0",
39+
"axios": "^1.8.4",
40+
"consola": "^3.4.2",
4141
"dompurify": "^3.2.4",
4242
"echarts": "^5.6.0",
4343
"echarts-gl": "^2.0.9",
44-
"hls.js": "^1.5.20",
44+
"hls.js": "^1.6.0",
4545
"jwt-decode": "^4.0.0",
4646
"lodash-es": "^4.17.21",
4747
"marked": "^15.0.7",
@@ -80,33 +80,33 @@
8080
"@types/jsdom": "^21.1.7",
8181
"@types/lodash-es": "^4.17.12",
8282
"@types/md5": "^2.3.5",
83-
"@types/node": "^22.13.10",
84-
"@types/semver": "^7.5.8",
83+
"@types/node": "^22.13.16",
84+
"@types/semver": "^7.7.0",
8585
"@types/sortablejs": "^1.15.8",
8686
"@vitejs/plugin-vue2": "^2.3.3",
8787
"@vue/eslint-config-typescript": "^14.5.0",
8888
"@vue/test-utils": "^1.3.6",
8989
"@vue/tsconfig": "~0.1.3",
90-
"eslint": "^9.22.0",
90+
"eslint": "^9.23.0",
9191
"eslint-plugin-regexp": "^2.7.0",
92-
"eslint-plugin-vue": "^9.32.0",
92+
"eslint-plugin-vue": "^9.33.0",
9393
"husky": "^9.1.7",
9494
"jsdom": "^26.0.0",
9595
"mockdate": "^3.0.5",
9696
"monaco-vscode-textmate-theme-converter": "^0.1.7",
9797
"neostandard": "^0.12.1",
98-
"rollup": "^4.35.0",
98+
"rollup": "^4.38.0",
9999
"sass": "~1.32.13",
100100
"skott": "^0.35.4",
101101
"standard-version": "^9.5.0",
102102
"typescript": "^5.8.2",
103-
"typescript-eslint": "^8.26.1",
103+
"typescript-eslint": "^8.29.0",
104104
"unplugin-vue-components": "^28.4.1",
105-
"vite": "^6.2.1",
106-
"vite-plugin-checker": "^0.9.0",
105+
"vite": "^6.2.4",
106+
"vite-plugin-checker": "^0.9.1",
107107
"vite-plugin-monaco-editor-esm": "^2.0.2",
108-
"vite-plugin-pwa": "^0.21.1",
109-
"vitest": "^3.0.8",
108+
"vite-plugin-pwa": "^1.0.0",
109+
"vitest": "^3.1.1",
110110
"vue-debounce-decorator": "^1.0.1",
111111
"vue-i18n-extract": "^2.0.7",
112112
"vue-template-compiler": "^2.7.16",

public/config.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,14 @@
3131
"src": "logo_btt.svg"
3232
}
3333
},
34+
{
35+
"name": "Cocoa Press",
36+
"color": "#F27121",
37+
"isDark": true,
38+
"logo": {
39+
"src": "logo_cocoapress.svg"
40+
}
41+
},
3442
{
3543
"name": "EVA",
3644
"color": "#76FB00",

public/img/mmu/mmu_3MS.svg

Lines changed: 32 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)